From 171cf09734c6187932ec2ce0627bbe332cbd1519 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Wed, 28 Dec 2016 18:47:33 +0100 Subject: [PATCH] python-PyQt5: unbreak after update to qt5-5.7.1 --- srcpkgs/python-PyQt5-enginio | 1 - .../patches/PyQt5-5.7-qt-5.6.2.patch | 11 ----- srcpkgs/python-PyQt5/template | 40 +++++-------------- srcpkgs/python3-PyQt5-enginio | 1 - srcpkgs/python3.4-PyQt5-enginio | 1 - 5 files changed, 11 insertions(+), 43 deletions(-) delete mode 120000 srcpkgs/python-PyQt5-enginio delete mode 100644 srcpkgs/python-PyQt5/patches/PyQt5-5.7-qt-5.6.2.patch delete mode 120000 srcpkgs/python3-PyQt5-enginio delete mode 120000 srcpkgs/python3.4-PyQt5-enginio diff --git a/srcpkgs/python-PyQt5-enginio b/srcpkgs/python-PyQt5-enginio deleted file mode 120000 index 7e24798936c..00000000000 --- a/srcpkgs/python-PyQt5-enginio +++ /dev/null @@ -1 +0,0 @@ -python-PyQt5 \ No newline at end of file diff --git a/srcpkgs/python-PyQt5/patches/PyQt5-5.7-qt-5.6.2.patch b/srcpkgs/python-PyQt5/patches/PyQt5-5.7-qt-5.6.2.patch deleted file mode 100644 index 444a3827743..00000000000 --- a/srcpkgs/python-PyQt5/patches/PyQt5-5.7-qt-5.6.2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- sip/QtCore/QtCoremod.sip.orig -+++ sip/QtCore/QtCoremod.sip -@@ -22,7 +22,7 @@ - - %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", version=1) - --%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_7_0} -+%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_7_0} - - %Platforms {WS_X11 WS_WIN WS_MACX} - diff --git a/srcpkgs/python-PyQt5/template b/srcpkgs/python-PyQt5/template index 640e25a65ac..16b6db49499 100644 --- a/srcpkgs/python-PyQt5/template +++ b/srcpkgs/python-PyQt5/template @@ -1,16 +1,17 @@ # Template file for 'python-PyQt5' pkgname=python-PyQt5 version=5.7 -revision=1 +revision=2 lib32disabled=yes wrksrc="PyQt5_gpl-${version}" +replaces="python-PyQt5-enginio<5.7_1" hostmakedepends="pkg-config" makedepends=" - python-devel python3-devel python-sip-devel python3-sip-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" + python-devel python3-devel python-sip-devel python3-sip-devel python-dbus-devel + qt5-tools-devel qt5-connectivity-devel qt5-declarative-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" depends="python-sip" pycompile_module="PyQt5" short_desc="Python2 bindings for the Qt5 toolkit" @@ -62,6 +63,7 @@ do_install() { } python-PyQt5-devel-tools_package() { + lib32disabled=yes short_desc+=" - development tools" alternatives=" pyqt5:pylupdate5:/usr/bin/python2-pylupdate5 @@ -77,6 +79,7 @@ python-PyQt5-devel-tools_package() { } } python3-PyQt5-devel-tools_package() { + lib32disabled=yes short_desc="${short_desc/Python2/Python3} - development tools" alternatives=" pyqt5:pylupdate5:/usr/bin/python3-pylupdate5 @@ -123,14 +126,6 @@ python-PyQt5-connectivity_package() { vmove ${py2_sitelib}/PyQt5/QtNfc.so } } -python-PyQt5-enginio_package() { - lib32disabled=yes - depends="${sourcepkg}-${version}_${revision}" - short_desc+=" - enginio module" - pkg_install() { - vmove ${py2_sitelib}/PyQt5/Enginio.so - } -} python-PyQt5-multimedia_package() { lib32disabled=yes depends="${sourcepkg}-${version}_${revision}" @@ -263,7 +258,7 @@ python3-PyQt5_package() { lib32disabled=yes depends="python3-sip" pycompile_module="PyQt5" - replaces="python3.4-PyQt5>=0" + replaces="python3.4-PyQt5>=0 python3-PyQt5-enginio<5.7_1" short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove ${py3_sitelib} @@ -288,15 +283,6 @@ python3-PyQt5-connectivity_package() { vmove ${py3_sitelib}/PyQt5/QtNfc.so } } -python3-PyQt5-enginio_package() { - lib32disabled=yes - replaces="python3.4-PyQt5-enginio>=0" - depends="python3-PyQt5-${version}_${revision}" - short_desc="${short_desc/Python2/Python3} - enginio module" - pkg_install() { - vmove ${py3_sitelib}/PyQt5/Enginio.so - } -} python3-PyQt5-multimedia_package() { lib32disabled=yes replaces="python3.4-PyQt5-multimedia>=0" @@ -446,6 +432,7 @@ python3.4-PyQt5_package() { build_style=meta short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)" depends="python3-PyQt5>=${version}_${revision}" + replaces="python3.4-PyQt5-enginio<5.7_1" } python3.4-PyQt5-connectivity_package() { build_style=meta @@ -457,11 +444,6 @@ python3.4-PyQt5-dbus_package() { short_desc="${short_desc/Python2/Python3.4} - dbus module (transitional dummy package)" depends="python3-PyQt5-dbus>=${version}_${revision}" } -python3.4-PyQt5-enginio_package() { - build_style=meta - short_desc="${short_desc/Python2/Python3.4} - enginio module (transitional dummy package)" - depends="python3-PyQt5-enginio>=${version}_${revision}" -} python3.4-PyQt5-location_package() { build_style=meta short_desc="${short_desc/Python2/Python3.4} - location module (transitional dummy package)" diff --git a/srcpkgs/python3-PyQt5-enginio b/srcpkgs/python3-PyQt5-enginio deleted file mode 120000 index 7e24798936c..00000000000 --- a/srcpkgs/python3-PyQt5-enginio +++ /dev/null @@ -1 +0,0 @@ -python-PyQt5 \ No newline at end of file diff --git a/srcpkgs/python3.4-PyQt5-enginio b/srcpkgs/python3.4-PyQt5-enginio deleted file mode 120000 index 7e24798936c..00000000000 --- a/srcpkgs/python3.4-PyQt5-enginio +++ /dev/null @@ -1 +0,0 @@ -python-PyQt5 \ No newline at end of file