kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

py-qt4: make "dbus" optional

Browse source
This commit is contained in:
tnn 2020-08-01 07:18:35 +00:00
parent 641f7931a4
commit 7573831460
5 changed files with 52 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
x11/py-qt4/Makefile
View file

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.91 2020/07/10 20:02:23 rhialto Exp $
# $NetBSD: Makefile,v 1.92 2020/08/01 07:18:35 tnn Exp $
DISTNAME= PyQt4_gpl_${PYQT_SYS}-4.12.3
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/PyQt4_gpl_${PYQT_SYS}/qt4/}
PKGREVISION= 3
PKGREVISION= 4
CATEGORIES= x11 python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pyqt/}
@ -53,6 +53,7 @@ SUBST_MESSAGE.PIC= Adding -fPIC to CXXFLAGS.
#SUBST_SED.pyversfx= -e "s|@PYVERSSUFFIX@|${PYVERSSUFFIX}|g"
.include "../../mk/bsd.prefs.mk"
.include "options.mk"
.if ${OPSYS} == "Darwin"
PYQT_SYS= mac
@ -93,12 +94,9 @@ post-install:
${PY_COMPILE_ALL} ${DESTDIR}${PREFIX}/${PYSITELIB}/PyQt4
.include "../../x11/py-sip/buildlink3.mk"
.include "../../sysutils/dbus/buildlink3.mk"
.include "../../sysutils/py-dbus/buildlink3.mk"
# needs the QtXmlPatterns fix
BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.6.1nb3
.include "../../x11/qt4-libs/buildlink3.mk"
.include "../../x11/qt4-qdbus/buildlink3.mk"
BUILDLINK_API_DEPENDS.qt4-tools+= qt4-tools>=4.4.0nb1
BUILDLINK_DEPMETHOD.qt4-tools= full
.include "../../x11/qt4-tools/buildlink3.mk"

36
x11/py-qt4/PLIST
View file

@ -1,10 +1,10 @@
@comment $NetBSD: PLIST,v 1.3 2018/01/17 19:18:47 markd Exp $
@comment $NetBSD: PLIST,v 1.4 2020/08/01 07:18:35 tnn Exp $
bin/pylupdate4
bin/pyrcc4
bin/pyuic4
${PYSITELIB}/PyQt4/Qt.so
${PYSITELIB}/PyQt4/QtCore.so
${PYSITELIB}/PyQt4/QtDBus.so
${PLIST.dbus}${PYSITELIB}/PyQt4/QtDBus.so
${PYSITELIB}/PyQt4/QtDeclarative.so
${PYSITELIB}/PyQt4/QtDesigner.so
${PYSITELIB}/PyQt4/QtGui.so
@ -98,7 +98,7 @@ ${PYSITELIB}/PyQt4/uic/widget-plugins/qtdeclarative.py
${PYSITELIB}/PyQt4/uic/widget-plugins/qtdeclarative.pyc
${PYSITELIB}/PyQt4/uic/widget-plugins/qtwebkit.py
${PYSITELIB}/PyQt4/uic/widget-plugins/qtwebkit.pyc
${PYSITELIB}/dbus/mainloop/qt.so
${PLIST.dbus}${PYSITELIB}/dbus/mainloop/qt.so
qt4/plugins/designer/libpyqt4.la
qt4/qsci/api/python/PyQt4.api
share/sip${PYVERSSUFFIX}/Qt/Qtmod.sip
@ -200,21 +200,21 @@ share/sip${PYVERSSUFFIX}/QtCore/qvector.sip
share/sip${PYVERSSUFFIX}/QtCore/qwaitcondition.sip
share/sip${PYVERSSUFFIX}/QtCore/qwineventnotifier.sip
share/sip${PYVERSSUFFIX}/QtCore/qxmlstream.sip
share/sip${PYVERSSUFFIX}/QtDBus/QtDBusmod.sip
share/sip${PYVERSSUFFIX}/QtDBus/qdbusabstractadaptor.sip
share/sip${PYVERSSUFFIX}/QtDBus/qdbusabstractinterface.sip
share/sip${PYVERSSUFFIX}/QtDBus/qdbusargument.sip
share/sip${PYVERSSUFFIX}/QtDBus/qdbusconnection.sip
share/sip${PYVERSSUFFIX}/QtDBus/qdbusconnectioninterface.sip
share/sip${PYVERSSUFFIX}/QtDBus/qdbuserror.sip
share/sip${PYVERSSUFFIX}/QtDBus/qdbusextratypes.sip
share/sip${PYVERSSUFFIX}/QtDBus/qdbusinterface.sip
share/sip${PYVERSSUFFIX}/QtDBus/qdbusmessage.sip
share/sip${PYVERSSUFFIX}/QtDBus/qdbuspendingcall.sip
share/sip${PYVERSSUFFIX}/QtDBus/qdbusservicewatcher.sip
share/sip${PYVERSSUFFIX}/QtDBus/qdbusunixfiledescriptor.sip
share/sip${PYVERSSUFFIX}/QtDBus/qpydbuspendingreply.sip
share/sip${PYVERSSUFFIX}/QtDBus/qpydbusreply.sip
${PLIST.dbus}share/sip${PYVERSSUFFIX}/QtDBus/QtDBusmod.sip
${PLIST.dbus}share/sip${PYVERSSUFFIX}/QtDBus/qdbusabstractadaptor.sip
${PLIST.dbus}share/sip${PYVERSSUFFIX}/QtDBus/qdbusabstractinterface.sip
${PLIST.dbus}share/sip${PYVERSSUFFIX}/QtDBus/qdbusargument.sip
${PLIST.dbus}share/sip${PYVERSSUFFIX}/QtDBus/qdbusconnection.sip
${PLIST.dbus}share/sip${PYVERSSUFFIX}/QtDBus/qdbusconnectioninterface.sip
${PLIST.dbus}share/sip${PYVERSSUFFIX}/QtDBus/qdbuserror.sip
${PLIST.dbus}share/sip${PYVERSSUFFIX}/QtDBus/qdbusextratypes.sip
${PLIST.dbus}share/sip${PYVERSSUFFIX}/QtDBus/qdbusinterface.sip
${PLIST.dbus}share/sip${PYVERSSUFFIX}/QtDBus/qdbusmessage.sip
${PLIST.dbus}share/sip${PYVERSSUFFIX}/QtDBus/qdbuspendingcall.sip
${PLIST.dbus}share/sip${PYVERSSUFFIX}/QtDBus/qdbusservicewatcher.sip
${PLIST.dbus}share/sip${PYVERSSUFFIX}/QtDBus/qdbusunixfiledescriptor.sip
${PLIST.dbus}share/sip${PYVERSSUFFIX}/QtDBus/qpydbuspendingreply.sip
${PLIST.dbus}share/sip${PYVERSSUFFIX}/QtDBus/qpydbusreply.sip
share/sip${PYVERSSUFFIX}/QtDeclarative/QtDeclarativemod.sip
share/sip${PYVERSSUFFIX}/QtDeclarative/qdeclarativecomponent.sip
share/sip${PYVERSSUFFIX}/QtDeclarative/qdeclarativecontext.sip

4
x11/py-qt4/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.38 2019/12/01 14:30:44 adam Exp $
$NetBSD: distinfo,v 1.39 2020/08/01 07:18:35 tnn Exp $
SHA1 (PyQt4_gpl_mac-4.12.3.tar.gz) = 5d4bb6eeb1a6fe6ba37b55c41d04dc2b5e5ebfba
RMD160 (PyQt4_gpl_mac-4.12.3.tar.gz) = cebd9cda0246027112674bf2bae0a295f9c711ff
@ -9,5 +9,5 @@ RMD160 (PyQt4_gpl_x11-4.12.3.tar.gz) = c146d67829542ec8dee6db24531dcb0f8b9a4411
SHA512 (PyQt4_gpl_x11-4.12.3.tar.gz) = 5b50bc7b1f1f1e93db323477745db7bf0f8783f403b6d65d4c0e0f1fc9b8d61c09afa67bea25575bdb3ad40c0bd4d956d27802fc193bc4dc31b993227ba12f22
Size (PyQt4_gpl_x11-4.12.3.tar.gz) = 11336418 bytes
SHA1 (patch-configure-ng.py) = 33774cb4365566d9978fd59745143bee6380dcb8
SHA1 (patch-configure.py) = aebd8a287f3d24b8d1d6133d689cdb9c9eda1ad9
SHA1 (patch-configure.py) = efd012ceb78c592722150cc4f7bc3a06f764d67a
SHA1 (patch-sip_QtCore_qlist.sip) = 9227b40ac8c0c37f7a1dcd7a3337686cfa8298f5

18
x11/py-qt4/options.mk Normal file
View file

@ -0,0 +1,18 @@
# $NetBSD: options.mk,v 1.1 2020/08/01 07:18:35 tnn Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.py-qt4
PKG_SUPPORTED_OPTIONS= dbus
PKG_SUGGESTED_OPTIONS+= dbus
.include "../../mk/bsd.options.mk"
PLIST_VARS+= dbus
.if !empty(PKG_OPTIONS:Mdbus)
PLIST.dbus= yes
.include "../../sysutils/dbus/buildlink3.mk"
.include "../../sysutils/py-dbus/buildlink3.mk"
.include "../../x11/qt4-qdbus/buildlink3.mk"
.else
post-extract:
rm -rf ${WRKSRC}/dbus
.endif

14
x11/py-qt4/patches/patch-configure.py
View file

@ -1,8 +1,8 @@
$NetBSD: patch-configure.py,v 1.2 2018/01/17 19:18:47 markd Exp $
$NetBSD: patch-configure.py,v 1.3 2020/08/01 07:18:35 tnn Exp $
--- configure.py.orig 2017-06-30 08:44:36.000000000 +0000
--- configure.py.orig 2018-08-31 07:36:58.000000000 +0000
+++ configure.py
@@ -341,7 +341,7 @@ class ConfigurePyQt4:
@@ -341,14 +341,14 @@ class ConfigurePyQt4:
pyqt_modules.append("QtCore")
check_module("QtGui", "qwidget.h", "new QWidget()")
@ -11,6 +11,14 @@ $NetBSD: patch-configure.py,v 1.2 2018/01/17 19:18:47 markd Exp $
check_module("QtMultimedia", "QAudioDeviceInfo",
"new QAudioDeviceInfo()")
check_module("QtNetwork", "qhostaddress.h", "new QHostAddress()")
# Qt v4.7 was current when we added support for QtDBus and we didn't
# bother properly versioning its API.
- if qt_version >= 0x040700:
+ if qt_version >= 0x040700 and os.path.isdir(os.path.join(src_dir, "dbus")):
check_module("QtDBus", "qdbusconnection.h",
"QDBusConnection::systemBus()")
@@ -367,8 +367,8 @@ class ConfigurePyQt4:
check_module("QtWebKit", "qwebpage.h", "new QWebPage()")
check_module("QtXml", "qdom.h", "new QDomDocument()")