[arch-commits] Commit in pyqt5/trunk (PKGBUILD pyqt-support-new-qt.patch)

[Antonio Rojas]

    Date: Saturday, September 8, 2018 @ 08:35:26
  Author: arojas
Revision: 334032

No longer needed with KF 5.50

Modified:
  pyqt5/trunk/PKGBUILD
Deleted:
  pyqt5/trunk/pyqt-support-new-qt.patch

---------------------------+
 PKGBUILD                  |    7 +------
 pyqt-support-new-qt.patch |   12 ------------
 2 files changed, 1 insertion(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-08 08:35:16 UTC (rev 334031)
+++ PKGBUILD	2018-09-08 08:35:26 UTC (rev 334032)
@@ -15,16 +15,11 @@
 makedepends=('python-sip-pyqt5' 'python2-sip-pyqt5' 'sip' 'python-opengl' 'python2-opengl' 'python2-enum34'
              'python2-dbus' 'python-dbus' 'qt5-connectivity' 'qt5-multimedia' 'qt5-tools' 'qt5-serialport' 'qt5-svg'
              'qt5-webengine' 'qt5-webkit' 'qt5-websockets' 'qt5-x11extras' 'qt5-networkauth')
-source=("http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-$pkgver/PyQt5_gpl-$pkgver.tar.gz" pyqt-support-new-qt.patch)
+source=("http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-$pkgver/PyQt5_gpl-$pkgver.tar.gz")
 sha512sums=('fc60246b5e1ca0d8aeef829fe20de9dd28b77e3c151532f9dbcd92c0deec12d8308cc799901aeec3f84af745e735053d2aaad2866ef64a2426cba343e08bc2c0'
             'b94b707e4265ff8e84d52214cea7b70db33aa436440c74e4918c165a7dfae8949bf3e91491d300e68c1715b26b693ba69eca114cf42ce6114dab1b99d69d417e')
 
 prepare() {
-  # Support new versions of Qt - don't remove, needs to be reapplied after every new Qt release
-  pushd PyQt5_gpl-$pkgver
-#  patch -p1 -i ../pyqt-support-new-qt.patch
-  popd
-
   cp -a PyQt5_gpl-$pkgver{,-py2}
 # Remove check for sip from py2, it doesn't work since sip doesn't install __init__.py
   sed -e 's|from PyQt5 import sip|pass|g' -i PyQt5_gpl-$pkgver-py2/configure.py

Deleted: pyqt-support-new-qt.patch
===================================================================
--- pyqt-support-new-qt.patch	2018-09-08 08:35:16 UTC (rev 334031)
+++ pyqt-support-new-qt.patch	2018-09-08 08:35:26 UTC (rev 334032)
@@ -1,12 +0,0 @@
-diff -ru a/sip/QtCore/QtCoremod.sip b/sip/QtCore/QtCoremod.sip
---- a/sip/QtCore/QtCoremod.sip	2016-12-25 18:56:11.000000000 +0100
-+++ b/sip/QtCore/QtCoremod.sip	2017-01-24 12:03:50.707514377 +0100
-@@ -22,7 +22,7 @@
- 
- %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True)
- 
--%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_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_99 Qt_5_10_0 Qt_5_10_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_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_99 Qt_5_10_0 Qt_5_10_1 Qt_5_11_0 Qt_5_11_1}
- 
- %Platforms {WS_X11 WS_WIN WS_MACX}
-