<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ee645316d0b2f412afc3bf8eddca0825f95eaf31">https://github.com/macports/macports-ports/commit/ee645316d0b2f412afc3bf8eddca0825f95eaf31</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ee645316d0b2f412afc3bf8eddca0825f95eaf31
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Dec 18 12:32:56 2016 -0700

<span style='display:block; white-space:pre;color:#404040;'>    py-pyqt5: find dbus in a way that still allows universal build
</span>---
 python/py-pyqt5/Portfile                       | 12 ++++--------
 python/py-pyqt5/files/patch-dbus_includes.diff | 11 +++++++++++
 2 files changed, 15 insertions(+), 8 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyqt5/Portfile b/python/py-pyqt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 773f879..d0ce770 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyqt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyqt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,14 +76,10 @@ if {${name} ne ${subport}} {
</span>                         --disable=QtWebEngineCore \
                         --disable=QtWebEngineWidgets
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # using --dbus means the compiler will find dbus-python.h but not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # the DBus headers themselves. Correct dbus.pro :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        set dbus1incpath [strsed [exec pkg-config --cflags-only-I dbus-1] "g/-I//"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|INCLUDEPATH += .$|INCLUDEPATH += . ${dbus1incpath}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        ${worksrcpath}/dbus/dbus.pro
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        system -W ${worksrcpath}/dbus "${qt_qmake_cmd} dbus.pro"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # using --dbus means the compiler will find dbus-python.h but not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # the DBus headers themselves
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # do not clear include directories just because --dbus is given
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append patch-dbus_includes.diff
</span> 
     build.cmd           make
     build.target        all
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyqt5/files/patch-dbus_includes.diff b/python/py-pyqt5/files/patch-dbus_includes.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..aea645d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyqt5/files/patch-dbus_includes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.py.orig      2016-04-24 03:55:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.py   2016-12-18 09:15:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2140,7 +2140,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         dlist = target_config.dbus_inc_dirs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    target_config.dbus_inc_dirs = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    #target_config.dbus_inc_dirs = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     for d in dlist:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         if os.access(os.path.join(d, 'dbus', 'dbus-python.h'), os.F_OK):
</span></pre><pre style='margin:0'>

</pre>