Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/py-qt5 py-qt5: make dbus option actually do something



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b81e5975d627
branches:  trunk
changeset: 436410:b81e5975d627
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Aug 02 00:25:20 2020 +0000

description:
py-qt5: make dbus option actually do something

diffstat:

 x11/py-qt5/Makefile |  12 +++++++-----
 x11/py-qt5/PLIST    |   4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diffs (48 lines):

diff -r 2236535d65cf -r b81e5975d627 x11/py-qt5/Makefile
--- a/x11/py-qt5/Makefile       Sat Aug 01 23:44:06 2020 +0000
+++ b/x11/py-qt5/Makefile       Sun Aug 02 00:25:20 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2020/06/11 14:50:33 adam Exp $
+# $NetBSD: Makefile,v 1.59 2020/08/02 00:25:20 tnn Exp $
 
 DISTNAME=      PyQt5-5.15.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/PyQt5/qt5/}
@@ -77,14 +77,16 @@
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=   dbus
+PLIST_VARS+=           dbus
 .if !empty(PKG_OPTIONS:Mdbus)
-PLIST.dbus=    yes
+PLIST.dbus=            yes
+.include "../../sysutils/dbus-python-common/buildlink3.mk"
+.include "../../sysutils/py-dbus/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --no-python-dbus
 .endif
 
 .include "../../lang/python/extension.mk"
-.include "../../sysutils/dbus-python-common/buildlink3.mk"
-.include "../../sysutils/py-dbus/buildlink3.mk"
 BUILDLINK_API_DEPENDS.py-sip+= ${PYPKGPREFIX}-sip>=4.19.23
 .include "../../x11/py-sip/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
diff -r 2236535d65cf -r b81e5975d627 x11/py-qt5/PLIST
--- a/x11/py-qt5/PLIST  Sat Aug 01 23:44:06 2020 +0000
+++ b/x11/py-qt5/PLIST  Sun Aug 02 00:25:20 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2020/06/11 14:50:33 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2020/08/02 00:25:20 tnn Exp $
 bin/pylupdate5-${PYVERSSUFFIX}
 bin/pyrcc5-${PYVERSSUFFIX}
 bin/pyuic5-${PYVERSSUFFIX}
@@ -107,7 +107,7 @@
 ${PYSITELIB}/PyQt5/uic/widget-plugins/qtquickwidgets.py
 ${PYSITELIB}/PyQt5/uic/widget-plugins/qtwebenginewidgets.py
 ${PYSITELIB}/PyQt5/uic/widget-plugins/qtwebkit.py
-${PYSITELIB}/dbus/mainloop/pyqt5.so
+${PLIST.dbus}${PYSITELIB}/dbus/mainloop/pyqt5.so
 qt5/plugins/PyQt5-${PYVERSSUFFIX}/libpyqt5qmlplugin.so
 qt5/plugins/designer${PYVERSSUFFIX}/libpyqt5.so
 qt5/qsci${PYVERSSUFFIX}/api/python/PyQt5.api



Home | Main Index | Thread Index | Old Index