[arch-commits] Commit in pyqt5/trunk (3 files)

[Antonio Rojas]

    Date: Thursday, February 16, 2017 @ 18:23:26
  Author: arojas
Revision: 289069

Update to 5.8

Modified:
  pyqt5/trunk/PKGBUILD
  pyqt5/trunk/pyqt-qt5.8.patch
Deleted:
  pyqt5/trunk/pyqt5-fix-check-license.patch

-------------------------------+
 PKGBUILD                      |   14 +++++---------
 pyqt-qt5.8.patch              |   23 -----------------------
 pyqt5-fix-check-license.patch |   11 -----------
 3 files changed, 5 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-16 17:44:04 UTC (rev 289068)
+++ PKGBUILD	2017-02-16 18:23:26 UTC (rev 289069)
@@ -7,9 +7,9 @@
 
 pkgbase=pyqt5
 pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5')
-pkgver=5.7.1
+pkgver=5.8
 _pkgver=$pkgver
-pkgrel=3
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 license=('GPL')
@@ -17,17 +17,13 @@
              'python2-dbus' 'python-dbus' 'qt5-connectivity'
              'qt5-multimedia' 'qt5-tools' 'qt5-serialport' 'qt5-svg'
              'qt5-webengine' 'qt5-webkit' 'qt5-websockets' 'qt5-x11extras')
-source=("http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-$pkgver/PyQt5_gpl-$pkgver.tar.gz" pyqt-qt5.8.patch pyqt5-fix-check-license.patch)
-md5sums=('b3171b67c74aa63a3cd2f386660c898b'
-         '524f184f0e63aea952ba77702dff1356'
-         '1f57fb76747c5723dc4747fbbb376145')
+source=("http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-$pkgver/PyQt5_gpl-$pkgver.tar.gz")
+md5sums=('ac04c0bfc1f05f5a1c2a1edd2640235c')
 
 prepare() {
   pushd PyQt5_gpl-${_pkgver}
   # Support Qt 5.8
-    patch -p1 -i ../pyqt-qt5.8.patch
-  # Hack to make the license check pass with Qt 5.8
-    patch -p1 -i ../pyqt5-fix-check-license.patch
+  # patch -p1 -i ../pyqt-qt5.8.patch
   popd
 
   # The additional include path was removed due to this line, I don't really know why they are doing this...

Modified: pyqt-qt5.8.patch
===================================================================
--- pyqt-qt5.8.patch	2017-02-16 17:44:04 UTC (rev 289068)
+++ pyqt-qt5.8.patch	2017-02-16 18:23:26 UTC (rev 289069)
@@ -1,26 +1,3 @@
-diff -ru a/sip/QtCore/qnamespace.sip b/sip/QtCore/qnamespace.sip
---- a/sip/QtCore/qnamespace.sip	2016-12-25 18:56:11.000000000 +0100
-+++ b/sip/QtCore/qnamespace.sip	2017-01-24 12:22:19.025652899 +0100
-@@ -209,8 +209,6 @@
-         WindowContextHelpButtonHint,
-         WindowShadeButtonHint,
-         WindowStaysOnTopHint,
--        WindowOkButtonHint,
--        WindowCancelButtonHint,
-         WindowStaysOnBottomHint,
-         WindowCloseButtonHint,
-         MacWindowToolBarButtonHint,
-@@ -232,6 +230,10 @@
- %If (Qt_5_5_0 -)
-         MaximizeUsingFullscreenGeometryHint,
- %End
-+%If (- Qt_5_8_0)
-+        WindowOkButtonHint,
-+        WindowCancelButtonHint,
-+%End
-     };
- 
-     typedef QFlags<Qt::WindowType> WindowFlags;
 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

Deleted: pyqt5-fix-check-license.patch
===================================================================
--- pyqt5-fix-check-license.patch	2017-02-16 17:44:04 UTC (rev 289068)
+++ pyqt5-fix-check-license.patch	2017-02-16 18:23:26 UTC (rev 289069)
@@ -1,11 +0,0 @@
---- PyQt5_gpl-5.7.1/configure.py.orig	2017-01-23 20:42:47.791266791 +0100
-+++ PyQt5_gpl-5.7.1/configure.py	2017-01-23 20:43:02.754828184 +0100
-@@ -723,7 +723,7 @@
-         lines = f.read().split('\n')
-         f.close()
- 
--        self.qt_licensee = lines[0]
-+        self.qt_licensee = 'Open Source'
-         self.qt_shared = (lines[1] == 'shared')
-         self.pyqt_disabled_features = lines[2:-1]
-