diff --git a/srcpkgs/python-PyQt5-connectivity b/srcpkgs/python-PyQt5-connectivity new file mode 120000 index 00000000000..7e24798936c --- /dev/null +++ b/srcpkgs/python-PyQt5-connectivity @@ -0,0 +1 @@ +python-PyQt5 \ No newline at end of file diff --git a/srcpkgs/python-PyQt5-webchannel b/srcpkgs/python-PyQt5-webchannel new file mode 120000 index 00000000000..7e24798936c --- /dev/null +++ b/srcpkgs/python-PyQt5-webchannel @@ -0,0 +1 @@ +python-PyQt5 \ No newline at end of file diff --git a/srcpkgs/python-PyQt5-webengine b/srcpkgs/python-PyQt5-webengine new file mode 120000 index 00000000000..7e24798936c --- /dev/null +++ b/srcpkgs/python-PyQt5-webengine @@ -0,0 +1 @@ +python-PyQt5 \ No newline at end of file diff --git a/srcpkgs/python-PyQt5/patches/PyQt5-5.3.2-add-dep-to-QtWebKitWidgets.patch b/srcpkgs/python-PyQt5/patches/PyQt5-5.3.2-add-dep-to-QtWebKitWidgets.patch deleted file mode 100644 index 346faf09747..00000000000 --- a/srcpkgs/python-PyQt5/patches/PyQt5-5.3.2-add-dep-to-QtWebKitWidgets.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- configure.py.orig 2014-07-04 11:09:11.000000000 +0200 -+++ configure.py 2014-09-09 03:13:52.351527684 +0200 -@@ -86,7 +86,7 @@ MODULE_METADATA = { - 'QtSvg': ModuleMetadata(qmake_QT=['svg']), - 'QtTest': ModuleMetadata(qmake_QT=['testlib', 'widgets']), - 'QtWebKit': ModuleMetadata(qmake_QT=['webkit', 'network']), -- 'QtWebKitWidgets': ModuleMetadata(qmake_QT=['webkitwidgets']), -+ 'QtWebKitWidgets': ModuleMetadata(qmake_QT=['webkitwidgets', 'printsupport']), - 'QtWebSockets': ModuleMetadata(qmake_QT=['websockets']), - 'QtWidgets': ModuleMetadata(qmake_QT=['widgets']), - 'QtWinExtras': ModuleMetadata(qmake_QT=['winextras', 'widgets']), - diff --git a/srcpkgs/python-PyQt5/template b/srcpkgs/python-PyQt5/template index e22c35523ff..018a0c531d7 100644 --- a/srcpkgs/python-PyQt5/template +++ b/srcpkgs/python-PyQt5/template @@ -1,22 +1,23 @@ # Template file for 'python-PyQt5' pkgname=python-PyQt5 -version=5.3.2 +version=5.4 revision=1 wrksrc="PyQt-gpl-${version}" hostmakedepends="pkg-config" makedepends="python-devel python3.4-devel python-sip-devel python3.4-sip-devel - qt5-tools-devel qt5-declarative-devel qt5-enginio-devel qt5-location-devel - qt5-multimedia-devel qt5-sensors-devel qt5-serialport-devel qt5-svg-devel - qt5-webkit-devel qt5-websockets-devel qt5-x11extras-devel qt5-xmlpatterns-devel - python-dbus-devel" + qt5-tools-devel qt5-connectivity-devel qt5-declarative-devel qt5-enginio-devel + qt5-location-devel qt5-multimedia-devel qt5-sensors-devel qt5-serialport-devel + qt5-svg-devel qt5-webchannel-devel qt5-webengine-devel qt5-webkit-devel + qt5-websockets-devel qt5-x11extras-devel qt5-xmlpatterns-devel python-dbus-devel" depends="python-sip" +pycompile_module="PyQt5" short_desc="Python2 bindings for the Qt5 toolkit" _short_desc="${short_desc/Python2/Python3.4}" maintainer="Alessio Sergi " homepage="http://www.riverbankcomputing.co.uk/software/pyqt/intro" license="GPL-3" distfiles="${SOURCEFORGE_SITE}/pyqt/PyQt-gpl-${version}.tar.gz" -checksum=bdc06613caa718977fcee43ce3bc4e959ea1efd02d86268d8c478b48c259448e +checksum=760264f5faa68ae22900d27ac114f3a7fffbb9b3ec12e7a62a0a45c887517731 _pysitedir="usr/lib/python2.7/site-packages" _py34sitedir="usr/lib/python3.4/site-packages" @@ -92,6 +93,13 @@ python-PyQt5-dbus_package() { vmove ${_pysitedir}/dbus/mainloop/pyqt5.so } } +python-PyQt5-connectivity_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - connectivity module" + pkg_install() { + vmove ${_pysitedir}/PyQt5/QtBluetooth.so + } +} python-PyQt5-enginio_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - enginio module" @@ -167,6 +175,20 @@ python-PyQt5-tools_package() { vmove ${_pysitedir}/PyQt5/QtHelp.so } } +python-PyQt5-webchannel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - webchannel module" + pkg_install() { + vmove ${_pysitedir}/PyQt5/QtWebChannel.so + } +} +python-PyQt5-webengine_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - webengine module" + pkg_install() { + vmove ${_pysitedir}/PyQt5/QtWebEngineWidgets.so + } +} python-PyQt5-webkit_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - webkit module" @@ -198,6 +220,8 @@ python-PyQt5-xmlpatterns_package() { } python3.4-PyQt5_package() { depends="python3.4-sip" + pycompile_version="3.4" + pycompile_module="PyQt5" short_desc="${_short_desc}" pkg_install() { vmove usr/bin/python3-pyuic5 @@ -211,6 +235,13 @@ python3.4-PyQt5-dbus_package() { vmove ${_py34sitedir}/dbus/mainloop/pyqt5.so } } +python3.4-PyQt5-connectivity_package() { + depends="python3.4-PyQt5>=${version}_${revision}" + short_desc="${_short_desc} - connectivity module" + pkg_install() { + vmove ${_py34sitedir}/PyQt5/QtBluetooth.so + } +} python3.4-PyQt5-enginio_package() { depends="python3.4-PyQt5>=${version}_${revision}" short_desc="${_short_desc} - enginio module" @@ -288,6 +319,20 @@ python3.4-PyQt5-tools_package() { vmove usr/lib/qt5/plugins/designer/libpyqt5.so } } +python3.4-PyQt5-webchannel_package() { + depends="python3.4-PyQt5>=${version}_${revision}" + short_desc="${_short_desc} - webchannel module" + pkg_install() { + vmove ${_py34sitedir}/PyQt5/QtWebChannel.so + } +} +python3.4-PyQt5-webengine_package() { + depends="python3.4-PyQt5>=${version}_${revision}" + short_desc="${_short_desc} - webengine module" + pkg_install() { + vmove ${_py34sitedir}/PyQt5/QtWebEngineWidgets.so + } +} python3.4-PyQt5-webkit_package() { depends="python3.4-PyQt5>=${version}_${revision}" short_desc="${_short_desc} - webkit module" diff --git a/srcpkgs/python3.4-PyQt5-connectivity b/srcpkgs/python3.4-PyQt5-connectivity new file mode 120000 index 00000000000..7e24798936c --- /dev/null +++ b/srcpkgs/python3.4-PyQt5-connectivity @@ -0,0 +1 @@ +python-PyQt5 \ No newline at end of file diff --git a/srcpkgs/python3.4-PyQt5-webchannel b/srcpkgs/python3.4-PyQt5-webchannel new file mode 120000 index 00000000000..7e24798936c --- /dev/null +++ b/srcpkgs/python3.4-PyQt5-webchannel @@ -0,0 +1 @@ +python-PyQt5 \ No newline at end of file diff --git a/srcpkgs/python3.4-PyQt5-webengine b/srcpkgs/python3.4-PyQt5-webengine new file mode 120000 index 00000000000..7e24798936c --- /dev/null +++ b/srcpkgs/python3.4-PyQt5-webengine @@ -0,0 +1 @@ +python-PyQt5 \ No newline at end of file