[qgis] 01/02: Add patch to add dependencies to wmsprovider QT4_WRAP_CPP macro. Should fix parallel build.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository qgis.

commit 6f94ce098e3f450bb5ac2937f8e0e52efd912151
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Mar 28 08:03:08 2018 +0200

    Add patch to add dependencies to wmsprovider QT4_WRAP_CPP macro. Should fix parallel build.
---
 debian/changelog                                   |  7 ++++++
 debian/patches/series                              |  1 +
 .../wmsprovider-qt4_wrap_cpp-dependencies.patch    | 26 ++++++++++++++++++++++
 3 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f4835d1..b99bb74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qgis (2.18.18+dfsg-2) UNRELEASED; urgency=medium
+
+  * Add patch to add dependencies to wmsprovider QT4_WRAP_CPP macro.
+    Should fix parallel build.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 28 Mar 2018 08:02:09 +0200
+
 qgis (2.18.18+dfsg-1) unstable; urgency=medium
 
   * Update symbols for other architectures.
diff --git a/debian/patches/series b/debian/patches/series
index 0683f9d..8e63b76 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ occurred-typo.patch
 number-typo.patch
 columns-typo.patch
 wmsprovider-dependencies.patch
+wmsprovider-qt4_wrap_cpp-dependencies.patch
diff --git a/debian/patches/wmsprovider-qt4_wrap_cpp-dependencies.patch b/debian/patches/wmsprovider-qt4_wrap_cpp-dependencies.patch
new file mode 100644
index 0000000..391bacf
--- /dev/null
+++ b/debian/patches/wmsprovider-qt4_wrap_cpp-dependencies.patch
@@ -0,0 +1,26 @@
+Description: Add custom target for QT4_WRAP_CPP macro.
+ Should fix parallel build.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/src/providers/wms/CMakeLists.txt
++++ b/src/providers/wms/CMakeLists.txt
+@@ -26,6 +26,10 @@ SET (WMS_MOC_HDRS
+ 
+ QT4_WRAP_CPP (WMS_MOC_SRCS ${WMS_MOC_HDRS})
+ 
++ADD_CUSTOM_TARGET(wms_cpp ALL DEPENDS ${WMS_MOC_SRCS})
++
++ADD_DEPENDENCIES(wms_cpp qgis_gui ui)
++
+ INCLUDE_DIRECTORIES(
+   .
+   ../../core
+@@ -46,8 +50,6 @@ 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 ui)
+-
+ 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