[qgis] 02/03: Fix widget-plugin installation.

[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 16127861a70a83bddaaaad8f69a9d424d004bd75
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Mar 15 23:12:00 2016 +0100

    Fix widget-plugin installation.
---
 debian/patches/qt5-bindings.patch | 12 ++++++++++++
 debian/python-qgis-common.install |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/debian/patches/qt5-bindings.patch b/debian/patches/qt5-bindings.patch
index a58234e..2d6c56f 100644
--- a/debian/patches/qt5-bindings.patch
+++ b/debian/patches/qt5-bindings.patch
@@ -1,5 +1,6 @@
 Description: Don't require Python 3 for Qt5.
  Also support PyQt5 path for uic widget plugin.
+ Append PyQt5 to the default module path as done by PyQt5 configure.py.
 Author: Bas Couwenberg <sebastic at debian.org>
 Forwarded: https://github.com/qgis/QGIS/pull/2906
 
@@ -53,3 +54,14 @@ Forwarded: https://github.com/qgis/QGIS/pull/2906
  
    if(PYTHONINTERP_FOUND)
      FIND_FILE(_find_lib_python_py FindLibPython.py PATHS ${CMAKE_MODULE_PATH})
+--- a/cmake/FindPyQt5.py
++++ b/cmake/FindPyQt5.py
+@@ -47,7 +47,7 @@ except ImportError:
+         'pyqt_version': PyQt5.QtCore.PYQT_VERSION,
+         'pyqt_version_str': PyQt5.QtCore.PYQT_VERSION_STR,
+         'pyqt_sip_flags': PyQt5.QtCore.PYQT_CONFIGURATION['sip_flags'],
+-        'pyqt_mod_dir': cfg.default_mod_dir,
++        'pyqt_mod_dir': os.path.join(cfg.default_mod_dir, "PyQt5"),
+         'pyqt_sip_dir': sip_dir,
+         'pyqt_bin_dir': cfg.default_bin_dir,
+     }
diff --git a/debian/python-qgis-common.install b/debian/python-qgis-common.install
index 0cf9348..d2aad6c 100644
--- a/debian/python-qgis-common.install
+++ b/debian/python-qgis-common.install
@@ -1,2 +1,2 @@
 usr/share/qgis/python/*
-#usr/lib/python*/*-packages/PyQt4/uic/widget-plugins/qgis_customwidgets.py
+usr/lib/python*/*-packages/PyQt*/uic/widget-plugins/qgis_customwidgets.py

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