[qgis] 04/05: Add upstream patch to make pyuic4-wrapper PyQt5 aware.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch qt5
in repository qgis.

commit 355422f05835eda2f899709c0e68dd4152fc987e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Mar 12 23:08:02 2016 +0100

    Add upstream patch to make pyuic4-wrapper PyQt5 aware.
---
 debian/changelog                                   |  1 +
 .../patches/make-pyuic4-wrapper-PyQt5-aware.patch  | 57 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 59 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 02ccbd8..6f10e27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qgis (2.14.0+dfsg0-4~exp1) UNRELEASED; urgency=medium
   * Switch from Qt4 to Qt5.
   * Add patch to fix globe plugin build failure with Qt5.
   * Add patch to fix QSpatiaLite provider build failure with Qt5.
+  * Add upstream patch to make pyuic4-wrapper PyQt5 aware.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 08 May 2015 23:40:06 +0200
 
diff --git a/debian/patches/make-pyuic4-wrapper-PyQt5-aware.patch b/debian/patches/make-pyuic4-wrapper-PyQt5-aware.patch
new file mode 100644
index 0000000..dd7c999
--- /dev/null
+++ b/debian/patches/make-pyuic4-wrapper-PyQt5-aware.patch
@@ -0,0 +1,57 @@
+From 264527a495b19ba4e16486d4aaeefef34352656d Mon Sep 17 00:00:00 2001
+From: Matthias Kuhn <matthias at opengis.ch>
+Date: Thu, 10 Mar 2016 18:35:47 +0100
+Origin: https://github.com/qgis/QGIS/commit/264527a495b19ba4e16486d4aaeefef34352656d
+Subject: [PyQt5] make pyuic4-wrapper PyQt5 aware
+
+---
+ cmake/PyQtMacros.cmake     | 2 +-
+ scripts/pyuic4-wrapper.bat | 2 +-
+ scripts/pyuic4-wrapper.py  | 5 ++++-
+ scripts/pyuic4-wrapper.sh  | 5 +++--
+ 4 files changed, 9 insertions(+), 5 deletions(-)
+
+--- a/cmake/PyQtMacros.cmake
++++ b/cmake/PyQtMacros.cmake
+@@ -45,7 +45,7 @@ MACRO(PYQT_WRAP_UI outfiles )
+     GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
+     SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.py)
+     ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+-      COMMAND ${PYUIC_WRAPPER} "${PYUIC_PROGRAM}" "${PYUIC_WRAPPER_PATH}" "${QGIS_OUTPUT_DIRECTORY}/python" ${infile} -o ${outfile}
++      COMMAND ${PYUIC_WRAPPER} "${PYUIC_PROGRAM}" "${PYUIC_WRAPPER_PATH}" "${QGIS_OUTPUT_DIRECTORY}/python" "${PYTHON_EXECUTABLE}" ${infile} -o ${outfile}
+       MAIN_DEPENDENCY ${infile}
+       DEPENDS pygui pycore
+     )
+--- a/scripts/pyuic4-wrapper.bat
++++ b/scripts/pyuic4-wrapper.bat
+@@ -2,4 +2,4 @@
+ set PYUIC4=%1
+ set PATH=%2;%PATH%
+ set PYTHONPATH=%3;%PYTHONPATH%
+-%PYUIC4% %4 %5 %6 %7 %8 %9
++%PYUIC4% %5 %6 %7 %8 %9
+--- a/scripts/pyuic4-wrapper.py
++++ b/scripts/pyuic4-wrapper.py
+@@ -4,4 +4,7 @@ try:
+ except:
+     pass
+ 
+-import PyQt4.uic.pyuic
++try:
++    import PyQt4.uic.pyuic
++except ImportError:
++    import PyQt5.uic.pyuic
+--- a/scripts/pyuic4-wrapper.sh
++++ b/scripts/pyuic4-wrapper.sh
+@@ -3,8 +3,9 @@
+ PYUIC4=$1
+ LD_LIBRARY_PATH=$2:$LD_LIBRARY_PATH
+ PYTHONPATH=$3:$PYTHONPATH
+-shift 3
++PYTHON=$4
++shift 4
+ 
+ export LD_LIBRARY_PATH PYTHONPATH
+ 
+-exec python $(dirname $0)/pyuic4-wrapper.py $@
++exec $PYTHON $(dirname $0)/pyuic4-wrapper.py $@
diff --git a/debian/patches/series b/debian/patches/series
index d7a00db..9afd04c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ number-typo.patch
 globe-adapt-to-osgearth-2.7.patch
 qt5-globe-plugin.patch
 qt5-qspatialite.patch
+make-pyuic4-wrapper-PyQt5-aware.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git