From 96490c91d55436645d54fa8bb119f5404d00a050 Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Tue, 14 Feb 2017 07:33:33 +0300
Subject: [PATCH] pyqt5 : Update to prerelease 5.8

---
 mingw-w64-pyqt5/001-mingw-python.patch | 10 ++++-----
 mingw-w64-pyqt5/PKGBUILD               | 29 +++++++++++++++-----------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/mingw-w64-pyqt5/001-mingw-python.patch b/mingw-w64-pyqt5/001-mingw-python.patch
index 0e674fb4cc..922ebc58cd 100644
--- a/mingw-w64-pyqt5/001-mingw-python.patch
+++ b/mingw-w64-pyqt5/001-mingw-python.patch
@@ -1,5 +1,5 @@
---- 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
+--- PyQt5_gpl-5.6.orig/configure.py	2016-04-24 11:55:08.000000000 +0100
++++ PyQt5_gpl-5.6/configure.py	2016-07-19 14:09:00.230550900 +0100
 @@ -25,6 +25,7 @@
  import shutil
  import stat
@@ -54,15 +54,15 @@
  
          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))
-@@ -720,7 +733,7 @@
+@@ -731,7 +744,7 @@
          py_major = self.py_version >> 16
          py_minor = (self.py_version >> 8) & 0x0ff
  
 -        if sys.platform == 'win32':
 +        if sys.platform == 'win32' and not _POSIX_BUILD:
-             debug_suffix = get_win32_debug_suffix(debug)
-             pylib_lib = 'python%d%d%s' % (py_major, py_minor, debug_suffix)
+             debug_suffix = self.get_win32_debug_suffix()
  
+             # See if we are using the limited API.
 @@ -803,6 +816,9 @@
  
          self.designer_plugin_dir = qt_config.QT_INSTALL_PLUGINS + '/designer'
diff --git a/mingw-w64-pyqt5/PKGBUILD b/mingw-w64-pyqt5/PKGBUILD
index 72d8756ab5..1833209f30 100644
--- a/mingw-w64-pyqt5/PKGBUILD
+++ b/mingw-w64-pyqt5/PKGBUILD
@@ -3,7 +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.6
+pkgver=5.8pre
+_pre_ver=5.8.dev1702091323
 pkgrel=1
 pkgdesc="Qt5 bindings for Python (mingw-w64)"
 arch=('any')
@@ -12,24 +13,26 @@ url="http://www.riverbankcomputing.co.uk/software/pyqt"
 makedepends=("${MINGW_PACKAGE_PREFIX}-python2-sip"
              "${MINGW_PACKAGE_PREFIX}-python3-sip"
              "${MINGW_PACKAGE_PREFIX}-qt5"
+             "${MINGW_PACKAGE_PREFIX}-qtwebkit"
              "${MINGW_PACKAGE_PREFIX}-make")
 options=('strip' 'staticlibs')
-source=("https://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-${pkgver}/PyQt5_gpl-${pkgver}.tar.gz"
+source=(#"https://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-${pkgver}/PyQt5_gpl-${pkgver}.tar.gz"
+        https://www.riverbankcomputing.com/static/Downloads/PyQt5/PyQt5_gpl-${_pre_ver}.tar.gz
         001-mingw-python.patch)
-sha256sums=('2e481a6c4c41b96ed3b33449e5f9599987c63a5c8db93313bd57a6acbf20f0e1'
-            'be96cb5401a88e6f9a4545ec5b241689656d54ee1460b453cf514e100542a5f0')
+sha256sums=('d1a5dee27d41c23dc8b16c08055b269739a15584f394f8c294e41a943324654b'
+            '7ab51a7ef2aef12805e50316f5ffa84f6f22a5fb38f00dd5efa7f757b9a818bd')
 
 prepare() {
- cd "${srcdir}"/PyQt5_gpl-${pkgver}
+ cd "${srcdir}"/PyQt5_gpl-${_pre_ver}
 
   #Apply patches
-  patch -p2 -i "${srcdir}"/001-mingw-python.patch
+  patch -p1 -i "${srcdir}"/001-mingw-python.patch
 }
 
 build() {
   for builddir in python{2,3}-${MINGW_CHOST}; do
     [[ -d $builddir ]] && rm -rf ${builddir}
-    cp -r PyQt5_gpl-${pkgver} ${builddir}
+    cp -r PyQt5_gpl-${_pre_ver} ${builddir}
     pushd ${builddir} > /dev/null
     [[ "${builddir%-${MINGW_CHOST}}" == "python2" ]] && {
       local _sipdir=Py2-Qt5
@@ -49,11 +52,11 @@ build() {
 
 package_pyqt5-common(){
   pkgdesc="Common PyQt files shared between python3-pyqt5 and python2-pyqt5"
-  depends=("${MINGW_PACKAGE_PREFIX}-qt5")
+  depends=("${MINGW_PACKAGE_PREFIX}-qt5" "${MINGW_PACKAGE_PREFIX}-qtwebkit")
 
   cd python2-${MINGW_CHOST}
-  make -C pyrcc DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-  make -C pylupdate DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+  #make -C pyrcc DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+  #make -C pylupdate DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 
   install -Dm644 PyQt5.api "${pkgdir}${MINGW_PREFIX}"/share/qt5/qsci/api/python/PyQt5.api
 }
@@ -69,7 +72,7 @@ package_python3-pyqt5(){
   make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 
   # Provided by pyqt-common
-  rm "${pkgdir}${MINGW_PREFIX}"/bin/{pylupdate5,pyrcc5}.exe
+  #rm "${pkgdir}${MINGW_PREFIX}"/bin/{pylupdate5,pyrcc5}.exe
   rm "${pkgdir}${MINGW_PREFIX}"/share/qt5/qsci/api/python/PyQt5.api
   rm -rf "${pkgdir}${MINGW_PREFIX}"/lib/python3.5/site-packages/PyQt5/uic/port_v2
 }
@@ -86,8 +89,10 @@ package_python2-pyqt5(){
 
   # Fix conflicts with python-pyqt5
   mv "${pkgdir}${MINGW_PREFIX}"/bin/{,python2-}pyuic5.bat
+  mv "${pkgdir}${MINGW_PREFIX}"/bin/{,python2-}pylupdate5.bat
+  mv "${pkgdir}${MINGW_PREFIX}"/bin/{,python2-}pyrcc5.bat
 
-  rm "${pkgdir}${MINGW_PREFIX}"/bin/{pylupdate5,pyrcc5}.exe
+  #rm "${pkgdir}${MINGW_PREFIX}"/bin/{pylupdate5,pyrcc5}.exe
   rm "${pkgdir}${MINGW_PREFIX}"/share/qt5/plugins/designer/pyqt5.dll
   rm "${pkgdir}${MINGW_PREFIX}"/share/qt5/plugins/PyQt5/pyqt5qmlplugin.dll
   rm "${pkgdir}${MINGW_PREFIX}"/share/qt5/qsci/api/python/PyQt5.api