SVN commit 11442 by tcberner:
Finally bring in PyQt5 (v.5.5) while doing that, also update PyQt4 (v.4.11.4).
The PyQt5 ports are based on madpilots review request [1].
There are some architecture changes with this commit:
1) devel/qscintilla2 -> devel/qscintilla2-qt4
2) devel/qscintilla2-designerplugin ->
devel/qscintilla2-qt4-designerplugin
3) devel/py-qt[45]/bsd.pyqt.mk -> Mk/Uses/pyqt.mk
To 1,2) -- as there is now also a qscintilla2 port for qt5, it made sense to add
a suffix to the port name. Also the shared library intalled by the ports is
* libqscintilla2-qt4.so
* libqscintilla2-qt5.so
The qt-feature files have been patched, so hopefully, ports looking for
qscintilla2
should find the correct so-lib.
3) I was not a fan of having two bsd.pyqt.mk in devel/py-qt4 and devel/py-qt5,
both
sharing mostly the same content. Enter pyqt.mk.
Usage:
The port specifies USES=pyqt:[45] and can then set the required py-qt
components via USE_PYQT=foo bar.
The pyqt:ARG specifies which pyqt version the port wants.
There is still cleanup to do, but everything should work [tm].
TODO:
* Go through the port tree and correct the LIB_DEPENDS of ports
depending on
libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
to
libqscintilla2-qt4.so:${PORTSDIR}/devel/qscintilla2-qt4
and change them to USES=pyqt [2]
* Cleanup...
* Testing...
Tested:
poudriere -t on 93@32, 10.2@64, current@64
[1] https://reviews.freebsd.org/D2910
[2] for example for audio/picard the following patch should do the trick:
Index: Makefile
===================================================================
--- Makefile (revision 396780)
+++ Makefile (working copy)
@@ -15,14 +15,11 @@
LICENSE_FILE= ${WRKSRC}/COPYING.txt
RUN_DEPENDS=
${PYTHON_PKGNAMEPREFIX}discid>=0:${PORTSDIR}/audio/py-discid \
-
${PYTHON_PKGNAMEPREFIX}mutagen>=0:${PORTSDIR}/audio/py-mutagen \
-
${PYTHON_PKGNAMEPREFIX}qt4-core>=0:${PORTSDIR}/devel/py-qt4-core \
-
${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-
${PYTHON_PKGNAMEPREFIX}qt4-network>=0:${PORTSDIR}/net/py-qt4-network \
-
${PYTHON_PKGNAMEPREFIX}qt4-xml>=0:${PORTSDIR}/textproc/py-qt4-xml
+
${PYTHON_PKGNAMEPREFIX}mutagen>=0:${PORTSDIR}/audio/py-mutagen
-USES= gettext python:2 desktop-file-utils
+USES= gettext python:2 desktop-file-utils pyqt:4
USE_PYTHON= distutils
+USE_PYQT= core_run gui_run network_run xml_run
INSTALLS_ICONS= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-release-${PORTVERSION}
A Mk (directory)
A Mk/Uses (directory)
A Mk/Uses/pyqt.mk
A comms (directory)
A comms/py-qt5-serialport (directory)
AM comms/py-qt5-serialport/Makefile
A comms/py-qt5-serialport/pkg-descr
A comms/py-qt5-serialport/pkg-plist
M +6 -6 databases/py-qt4-sql/Makefile
M +14 -14 databases/py-qt4-sql/pkg-plist
A databases/py-qt5-sql (directory)
AM databases/py-qt5-sql/Makefile
A databases/py-qt5-sql/pkg-descr
A databases/py-qt5-sql/pkg-plist
M +6 -7 devel/py-qt4-assistant/Makefile
M +2 -2 devel/py-qt4-assistant/pkg-plist
M +8 -7 devel/py-qt4-core/Makefile
M +98 -98 devel/py-qt4-core/pkg-plist
M +10 -8 devel/py-qt4-dbus/Makefile
M +15 -15 devel/py-qt4-dbus/pkg-plist
M +6 -8 devel/py-qt4-dbussupport/Makefile
M +7 -7 devel/py-qt4-declarative/Makefile
M +19 -19 devel/py-qt4-declarative/pkg-plist
M +7 -8 devel/py-qt4-designer/Makefile
M +25 -25 devel/py-qt4-designer/pkg-plist
M +7 -6 devel/py-qt4-designerplugin/Makefile
M +7 -6 devel/py-qt4-help/Makefile
M +8 -8 devel/py-qt4-help/pkg-plist
M +7 -11 devel/py-qt4-qscintilla2/Makefile
M +52 -52 devel/py-qt4-qscintilla2/pkg-plist
M +7 -6 devel/py-qt4-script/Makefile
M +10 -10 devel/py-qt4-script/pkg-plist
M +7 -6 devel/py-qt4-scripttools/Makefile
M +2 -2 devel/py-qt4-scripttools/pkg-plist
M +7 -6 devel/py-qt4-test/Makefile
M +5 -5 devel/py-qt4-test/pkg-plist
M +10 -9 devel/py-qt4/Makefile
D devel/py-qt4/bsd.pyqt.mk
M +2 -2 devel/py-qt4/distinfo
A devel/py-qt5 (directory)
A devel/py-qt5-core (directory)
AM devel/py-qt5-core/Makefile
A devel/py-qt5-core/files (directory)
AM devel/py-qt5-core/files/Qt.py
AM devel/py-qt5-core/files/patch-configure.py
A devel/py-qt5-core/pkg-descr
A devel/py-qt5-core/pkg-plist
A devel/py-qt5-dbus (directory)
AM devel/py-qt5-dbus/Makefile
A devel/py-qt5-dbus/pkg-descr
A devel/py-qt5-dbus/pkg-plist
A devel/py-qt5-designer (directory)
AM devel/py-qt5-designer/Makefile
A devel/py-qt5-designer/pkg-descr
A devel/py-qt5-designer/pkg-plist
A devel/py-qt5-qscintilla2 (directory)
M +13 -19 devel/py-qt5-qscintilla2/Makefile
M +54 -54 devel/py-qt5-qscintilla2/pkg-plist
A devel/py-qt5-test (directory)
AM devel/py-qt5-test/Makefile
A devel/py-qt5-test/pkg-descr
A devel/py-qt5-test/pkg-plist
AM devel/py-qt5/Makefile
A devel/py-qt5/distinfo
A devel/py-qt5/pkg-descr
M +2 -2 devel/py-sip/Makefile
M +2 -2 devel/py-sip/distinfo
D devel/qscintilla2 (directory)
D devel/qscintilla2-designerplugin (directory)
A devel/qscintilla2-qt4 (directory)
A devel/qscintilla2-qt4-designerplugin (directory)
M +1 -2 devel/qscintilla2-qt4-designerplugin/Makefile
M +14 -3 devel/qscintilla2-qt4/Makefile
M +4 -4 devel/qscintilla2-qt4/pkg-plist
A devel/qscintilla2-qt5 (directory)
M +17 -9 devel/qscintilla2-qt5/Makefile
A devel/qscintilla2-qt5/files (directory)
A devel/qscintilla2-qt5/files/patch-Qt4Qt5_qscintilla.pro
M +1 -1 devel/qscintilla2-qt5/pkg-descr
M +17 -17 devel/qscintilla2-qt5/pkg-plist
M +7 -6 graphics/py-qt4-svg/Makefile
M +5 -5 graphics/py-qt4-svg/pkg-plist
A graphics/py-qt5-svg (directory)
AM graphics/py-qt5-svg/Makefile
A graphics/py-qt5-svg/pkg-descr
A graphics/py-qt5-svg/pkg-plist
A lang (directory)
A lang/py-qt5-qml (directory)
AM lang/py-qt5-qml/Makefile
A lang/py-qt5-qml/pkg-descr
A lang/py-qt5-qml/pkg-plist
M +7 -6 misc/py-qt4-demo/Makefile
M +6 -6 misc/py-qt4-doc/Makefile
M +4 -6 misc/py-qt4-doc/pkg-plist
A misc/py-qt5-demo (directory)
AM misc/py-qt5-demo/Makefile
A misc/py-qt5-demo/files (directory)
AM
misc/py-qt5-demo/files/patch-examples__designer__plugins__plugins.py
A misc/py-qt5-demo/pkg-descr
A misc/py-qt5-demo/pkg-plist
A misc/py-qt5-doc (directory)
AM misc/py-qt5-doc/Makefile
A misc/py-qt5-doc/pkg-descr
A misc/py-qt5-doc/pkg-plist
M +7 -6 multimedia/py-qt4-multimedia/Makefile
M +10 -10 multimedia/py-qt4-multimedia/pkg-plist
M +7 -6 multimedia/py-qt4-phonon/Makefile
M +19 -19 multimedia/py-qt4-phonon/pkg-plist
A multimedia/py-qt5-multimedia (directory)
AM multimedia/py-qt5-multimedia/Makefile
A multimedia/py-qt5-multimedia/pkg-descr
A multimedia/py-qt5-multimedia/pkg-plist
M +7 -6 net/py-qt4-network/Makefile
M +35 -35 net/py-qt4-network/pkg-plist
A net/py-qt5-network (directory)
AM net/py-qt5-network/Makefile
A net/py-qt5-network/pkg-descr
A net/py-qt5-network/pkg-plist
A print (directory)
A print/py-qt5-printsupport (directory)
AM print/py-qt5-printsupport/Makefile
A print/py-qt5-printsupport/pkg-descr
A print/py-qt5-printsupport/pkg-plist
M +7 -6 textproc/py-qt4-xml/Makefile
M +4 -4 textproc/py-qt4-xml/pkg-plist
M +7 -6 textproc/py-qt4-xmlpatterns/Makefile
M +15 -15 textproc/py-qt4-xmlpatterns/pkg-plist
A textproc/py-qt5-xml (directory)
AM textproc/py-qt5-xml/Makefile
A textproc/py-qt5-xml/pkg-descr
A textproc/py-qt5-xml/pkg-plist
A textproc/py-qt5-xmlpatterns (directory)
AM textproc/py-qt5-xmlpatterns/Makefile
A textproc/py-qt5-xmlpatterns/pkg-descr
A textproc/py-qt5-xmlpatterns/pkg-plist
M +7 -6 www/py-qt4-webkit/Makefile
M +15 -15 www/py-qt4-webkit/pkg-plist
A www/py-qt5-webkit (directory)
AM www/py-qt5-webkit/Makefile
A www/py-qt5-webkit/pkg-descr
A www/py-qt5-webkit/pkg-plist
A www/py-qt5-webkitwidgets (directory)
AM www/py-qt5-webkitwidgets/Makefile
A www/py-qt5-webkitwidgets/pkg-descr
A www/py-qt5-webkitwidgets/pkg-plist
M +7 -3 x11-toolkits/py-qt4-gui/Makefile
M +205 -205 x11-toolkits/py-qt4-gui/pkg-plist
A x11-toolkits/py-qt5-gui (directory)
AM x11-toolkits/py-qt5-gui/Makefile
A x11-toolkits/py-qt5-gui/pkg-descr
A x11-toolkits/py-qt5-gui/pkg-plist
A x11-toolkits/py-qt5-widgets (directory)
AM x11-toolkits/py-qt5-widgets/Makefile
A x11-toolkits/py-qt5-widgets/pkg-descr
A x11-toolkits/py-qt5-widgets/pkg-plist
M +7 -6 x11/py-qt4-opengl/Makefile
M +7 -7 x11/py-qt4-opengl/pkg-plist
A x11/py-qt5-opengl (directory)
AM x11/py-qt5-opengl/Makefile
A x11/py-qt5-opengl/pkg-descr
A x11/py-qt5-opengl/pkg-plist
_______________________________________________
kde-freebsd mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kde-freebsd
See also http://freebsd.kde.org/ for latest information
