[qgis] 01/02: Add patch to add dependency on qgis_gui target to fix parallel build.

[Bas Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository qgis.

commit 18469582ccaa47d88ca4480429004cda017a55ca
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Feb 26 19:00:36 2018 +0100

    Add patch to add dependency on qgis_gui target to fix parallel build.
---
 debian/changelog                               |  6 ++++++
 debian/patches/series                          |  1 +
 debian/patches/wms-provider-dependencies.patch | 19 +++++++++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7e02a48..ac991bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qgis (2.18.17+dfsg-1~exp3) UNRELEASED; urgency=medium
+
+  * Add patch to add dependency on qgis_gui target to fix parallel build.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 26 Feb 2018 18:56:53 +0100
+
 qgis (2.18.17+dfsg-1~exp2) experimental; urgency=medium
 
   * Fix qgis.qch install in arch-indep target.
diff --git a/debian/patches/series b/debian/patches/series
index b0b3fa0..0623a06 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ exclude-elvensword-resources.patch
 occurred-typo.patch
 number-typo.patch
 columns-typo.patch
+wms-provider-dependencies.patch
diff --git a/debian/patches/wms-provider-dependencies.patch b/debian/patches/wms-provider-dependencies.patch
new file mode 100644
index 0000000..35aff04
--- /dev/null
+++ b/debian/patches/wms-provider-dependencies.patch
@@ -0,0 +1,19 @@
+Description: Add dependency on qgis_gui target to fix parallel build.
+ In file included from /<<BUILDDIR>>/qgis-2.18.17+dfsg/src/providers/wms/qgswmssourceselect.cpp:26:0:
+ /<<BUILDDIR>>/qgis-2.18.17+dfsg/src/providers/wms/../../gui/qgsgenericprojectionselector.h:20:10: fatal error: ui_qgsgenericprojectionselectorbase.h: No such file or directory
+  #include <ui_qgsgenericprojectionselectorbase.h>
+           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/qgis/QGIS/pull/6471
+
+--- a/src/providers/wms/CMakeLists.txt
++++ b/src/providers/wms/CMakeLists.txt
+@@ -46,6 +46,8 @@ INCLUDE_DIRECTORIES(SYSTEM
+ ADD_LIBRARY(wmsprovider_a STATIC ${WMS_SRCS} ${WMS_MOC_SRCS})
+ ADD_LIBRARY(wmsprovider MODULE ${WMS_SRCS} ${WMS_MOC_SRCS})
+ 
++ADD_DEPENDENCIES(wmsprovider qgis_gui)
++
+ TARGET_LINK_LIBRARIES(wmsprovider
+   qgis_core
+   qgis_gui

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