[qgis] 02/03: Add patch to fix globe plugin build failure with Qt5.

[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 40ab60f71c86700cddbee88ab9bd76b9a82d6db7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Mar 11 17:55:29 2016 +0100

    Add patch to fix globe plugin build failure with Qt5.
    
    Re-enable globe plugin.
---
 debian/changelog                      |  1 +
 debian/patches/qt5-globe-plugin.patch | 23 +++++++++++++++++++++++
 debian/patches/series                 |  1 +
 debian/rules                          |  2 +-
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 90fad84..5007916 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qgis (2.14.0+dfsg0-4~exp1) UNRELEASED; urgency=medium
 
   * Update branch in gbp.conf.
   * Switch from Qt4 to Qt5.
+  * Add patch to fix globe plugin build failure with Qt5.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 08 May 2015 23:40:06 +0200
 
diff --git a/debian/patches/qt5-globe-plugin.patch b/debian/patches/qt5-globe-plugin.patch
new file mode 100644
index 0000000..7d02d1b
--- /dev/null
+++ b/debian/patches/qt5-globe-plugin.patch
@@ -0,0 +1,23 @@
+Description: Add Qt5OpenGL include path for Qt5 build.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/qgis/QGIS/pull/2902
+Applied-Upstream: https://github.com/qgis/QGIS/commit/9167e1b6791a55cfbddc917ae56016e7e5c6896d
+
+--- a/src/plugins/globe/CMakeLists.txt
++++ b/src/plugins/globe/CMakeLists.txt
+@@ -55,6 +55,7 @@ QT4_ADD_RESOURCES(globe_plugin_RCC_SRCS
+ ADD_LIBRARY (globeplugin MODULE ${globe_plugin_SRCS} ${globe_plugin_MOC_SRCS} ${globe_plugin_RCC_SRCS} ${globe_plugin_UIS_H})
+ 
+ INCLUDE_DIRECTORIES(SYSTEM
++     ${Qt5OpenGL_INCLUDE_DIRS}
+      ${OSGEARTH_INCLUDE_DIR}
+      ${OSG_INCLUDE_DIR}
+      ${GEOS_INCLUDE_DIR}
+@@ -82,6 +83,7 @@ TARGET_LINK_LIBRARIES(globeplugin
+   qgis_core
+   qgis_gui
+   ${QT_QTOPENGL_LIBRARY}
++  ${Qt5OpenGL_LIBRARIES}
+   ${OSGDB_LIBRARY}
+   ${OSGGA_LIBRARY}
+   ${OSGUTIL_LIBRARY}
diff --git a/debian/patches/series b/debian/patches/series
index 91c4b65..6d09889 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ exclude-elvensword-resources.patch
 occurred-typo.patch
 number-typo.patch
 globe-adapt-to-osgearth-2.7.patch
+qt5-globe-plugin.patch
diff --git a/debian/rules b/debian/rules
index 6fb30ed..d69b866 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,7 +67,7 @@ CMAKE_OPTS := \
 	-DQGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
 	-DWITH_APIDOC=TRUE \
 	-DWITH_CUSTOM_WIDGETS=TRUE \
-	-DWITH_GLOBE=FALSE \
+	-DWITH_GLOBE=TRUE \
 	-DWITH_QWTPOLAR=FALSE \
 	-DWITH_INTERNAL_HTTPLIB2=FALSE \
 	-DWITH_INTERNAL_JINJA2=FALSE \

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