Update pyqt to 5.6

2016-07-19 14:50:41 +01:00
parent 30851cd302
commit 39190a91d1
3 changed files with 36 additions and 35 deletions
--- a/mingw-w64-pyqt5/001-mingw-python.patch
+++ b/mingw-w64-pyqt5/001-mingw-python.patch
@@ -1,24 +1,23 @@
-diff -uNr PyQt-gpl-5.3.1-orig/configure.py PyQt-gpl-5.3.1/configure.py
--- PyQt-gpl-5.3.1-orig/configure.py	2014-07-30 10:44:24.722615580 +0200
-+++ PyQt-gpl-5.3.1/configure.py	2014-07-30 10:44:53.386614318 +0200
-@@ -24,6 +24,7 @@
+--- src/PyQt5_gpl-5.6.orig/configure.py	2016-04-24 11:55:08.000000000 +0100
+++ src/PyQt5_gpl-5.6/configure.py	2016-07-19 14:09:00.230550900 +0100
+@@ -25,6 +25,7 @@
 import shutil
 import stat
 import sys
 +from sysconfig import _POSIX_BUILD
 
- try:
-     import sysconfig
-@@ -382,7 +383,7 @@
-             self.inc_dir = sysconfig.get_python_inc(plat_specific=1)
-             self.module_dir = sysconfig.get_python_lib(plat_specific=1)
+ 
+ # Initialise the constants.
+@@ -400,7 +401,7 @@
+         self.venv_inc_dir = sysconfig.get_python_inc(prefix=sys.prefix)
+         self.module_dir = sysconfig.get_python_lib(plat_specific=1)
 
 -        if sys.platform == 'win32':
 +        if sys.platform == 'win32' and not _POSIX_BUILD:
             self.bin_dir = sys.exec_prefix
             self.data_dir = sys.prefix
             self.lib_dir = sys.prefix + '\\libs'
-@@ -391,6 +392,13 @@
+@@ -409,6 +410,13 @@
             self.data_dir = sys.prefix + '/share'
             self.lib_dir = sys.prefix + '/lib'
 
@@ -32,7 +31,7 @@ diff -uNr PyQt-gpl-5.3.1-orig/configure.py PyQt-gpl-5.3.1/configure.py
         # The name of the interpreter used by the pyuic5 wrapper.
         if sys.platform == 'darwin':
             # The installation of MacOS's python is a mess that changes from
-@@ -461,7 +469,9 @@
+@@ -481,7 +489,9 @@
 
         # The qmake spec we want to use.
         if self.py_platform == 'win32':
@@ -43,7 +42,7 @@ diff -uNr PyQt-gpl-5.3.1-orig/configure.py PyQt-gpl-5.3.1/configure.py
                 self.qmake_spec = 'win32-msvc2015'
             elif self.py_version >= 0x030300:
                 self.qmake_spec = 'win32-msvc2010'
-@@ -668,7 +678,10 @@
+@@ -702,7 +712,10 @@
 
         # Create the output file, first making sure it doesn't exist.
         remove_file(out_file)
@@ -55,7 +54,7 @@ diff -uNr PyQt-gpl-5.3.1-orig/configure.py PyQt-gpl-5.3.1/configure.py
 
         if not os.access(out_file, os.F_OK):
             error("%s failed to create %s. Make sure your Qt installation is correct." % (cmd, out_file))
-@@ -686,7 +699,7 @@
+@@ -720,7 +733,7 @@
         py_major = self.py_version >> 16
         py_minor = (self.py_version >> 8) & 0x0ff
 
@@ -64,7 +63,7 @@ diff -uNr PyQt-gpl-5.3.1-orig/configure.py PyQt-gpl-5.3.1/configure.py
             debug_suffix = get_win32_debug_suffix(debug)
             pylib_lib = 'python%d%d%s' % (py_major, py_minor, debug_suffix)
 
-@@ -762,6 +775,9 @@
+@@ -803,6 +816,9 @@
 
         self.designer_plugin_dir = qt_config.QT_INSTALL_PLUGINS + '/designer'
         self.qml_plugin_dir = qt_config.QT_INSTALL_PLUGINS + '/PyQt5'
@@ -74,7 +73,7 @@ diff -uNr PyQt-gpl-5.3.1-orig/configure.py PyQt-gpl-5.3.1/configure.py
 
         if self.sysroot == '':
             self.sysroot = qt_config.QT_SYSROOT
-@@ -770,7 +786,8 @@
+@@ -811,7 +827,8 @@
         # in the default location.
         self.qsci_api_dir = os.path.join(qt_config.QT_INSTALL_DATA, 'qsci')
         self.qsci_api = os.path.isdir(self.qsci_api_dir)
@@ -84,7 +83,7 @@ diff -uNr PyQt-gpl-5.3.1-orig/configure.py PyQt-gpl-5.3.1/configure.py
         # Save the default qmake spec. and finalise the value we want to use.
         self.default_qmake_spec = qt_config.QMAKE_SPEC
 
-@@ -913,6 +930,15 @@
+@@ -959,6 +976,15 @@
         if opts.vendlibdir is not None:
             self.vend_lib_dir = opts.vendlibdir
 
@@ -100,12 +99,14 @@ diff -uNr PyQt-gpl-5.3.1-orig/configure.py PyQt-gpl-5.3.1/configure.py
         # Handle any conflicts.
         if not self.qt_shared:
             if not self.static:
-@@ -1069,7 +1095,7 @@
-                     "wrapper is FILE [default: %s]" %
-                             target_config.pyuic_interpreter)
- 
-    if sys.platform != 'win32':
-+    if sys.platform != 'win32' or _POSIX_BUILD:
-         g.add_option("--qmake", "-q", dest='qmake', type='string',
-                 default=None, action='callback', callback=store_abspath_exe,
-                 metavar="FILE",
+@@ -1950,7 +1976,9 @@
+     # Guess the name of make and set the default target and platform specific
+     # name of the executable.
+     if target_config.py_platform == 'win32':
+-        if target_config.qmake_spec == 'win32-g++':
+        if _POSIX_BUILD:
+          make = 'make'
+        elif target_config.qmake_spec == 'win32-g++':
+             make = 'mingw32-make'
+         else:
+             make = 'nmake'
--- a/mingw-w64-pyqt5/PKGBUILD
+++ b/mingw-w64-pyqt5/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=pyqt5
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-common" "${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=5.5.1
-pkgrel=2
+pkgver=5.6
+pkgrel=1
 pkgdesc="Qt5 bindings for Python (mingw-w64)"
 arch=('any')
 license=('GPL')
@@ -13,22 +13,22 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python2-sip"
             "${MINGW_PACKAGE_PREFIX}-python3-sip"
             "${MINGW_PACKAGE_PREFIX}-qt5")
 options=('strip' 'staticlibs')
-source=("https://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-${pkgver}/PyQt-gpl-${pkgver}.tar.gz"
+source=("https://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-${pkgver}/PyQt5_gpl-${pkgver}.tar.gz"
        001-mingw-python.patch)
-sha256sums=('0a70ef94fbffcf674b0dde024aae2a2a7a3f5a8c42806109ff7df2c941bd8386'
-            '8d01e4381f3f941f3a63e85d8b2ab09d456f2fa12cf83df4f855d7a30a7d05ff')
+sha256sums=('2e481a6c4c41b96ed3b33449e5f9599987c63a5c8db93313bd57a6acbf20f0e1'
+            '17c8f7fd63bcf2dc1f4edb8473ab0f0dcdf24d6c695071139d6bd1d1b158aada')

 prepare() {
- cd "${srcdir}"/PyQt-gpl-${pkgver}
+ cd "${srcdir}"/PyQt5_gpl-${pkgver}

  #Apply patches
-  patch -p1 -i "${srcdir}"/001-mingw-python.patch
+  patch -p2 -i "${srcdir}"/001-mingw-python.patch
 }

 build() {
  for builddir in python{2,3}-${MINGW_CHOST}; do
    [[ -d $builddir ]] && rm -rf ${builddir}
-    cp -r PyQt-gpl-${pkgver} ${builddir}
+    cp -r PyQt5_gpl-${pkgver} ${builddir}
    pushd ${builddir} > /dev/null
    [[ "${builddir%-${MINGW_CHOST}}" == "python2" ]] && {
      local _sipdir=Py2-Qt5
--- a/mingw-w64-sip/PKGBUILD
+++ b/mingw-w64-sip/PKGBUILD
@@ -4,7 +4,7 @@
 _realname=sip
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=4.17
+pkgver=4.18
 pkgrel=1
 pkgdesc="Tool to create Python bindings for C and C++ libraries (mingw-w64)"
 arch=('any')
@@ -15,7 +15,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
             "${MINGW_PACKAGE_PREFIX}-python3")
 source=("https://downloads.sourceforge.net/project/pyqt/${_realname}/${_realname}-${pkgver}/${_realname}-${pkgver}.tar.gz"
        "0001-mingw-python.patch")
-sha256sums=('603026822adf8673fca6e0ea20b02c3c4a2dccb309647656f7269adc8de89060'
+sha256sums=('f1dc5c81c07a9ad97edcd4a0af964a41e420024ba7ca165afd2b351efd249cb6'
            'eab49324d351582f3f7d5da772a009fdf54d2a8366ed28bba2318a7b384a980c')

 prepare() {