[Git][debian-gis-team/qgis][master] 3 commits: Mark wmsprovider-dependencies.patch as Applied-Upstream.

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / qgis


Commits:
e90c5a12 by Bas Couwenberg at 2018-03-28T07:03:46+02:00
Mark wmsprovider-dependencies.patch as Applied-Upstream.

- - - - -
6f94ce09 by Bas Couwenberg at 2018-03-28T08:03:08+02:00
Add patch to add dependencies to wmsprovider QT4_WRAP_CPP macro. Should fix parallel build.

- - - - -
44731624 by Bas Couwenberg at 2018-03-28T08:05:16+02:00
Set distribution to unstable.

- - - - -


4 changed files:

- debian/changelog
- debian/patches/series
- debian/patches/wmsprovider-dependencies.patch
- + debian/patches/wmsprovider-qt4_wrap_cpp-dependencies.patch


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qgis (2.18.18+dfsg-2) unstable; 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:05:07 +0200
+
 qgis (2.18.18+dfsg-1) unstable; urgency=medium
 
   * Update symbols for other architectures.


=====================================
debian/patches/series
=====================================
--- 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


=====================================
debian/patches/wmsprovider-dependencies.patch
=====================================
--- a/debian/patches/wmsprovider-dependencies.patch
+++ b/debian/patches/wmsprovider-dependencies.patch
@@ -7,6 +7,7 @@ Description: Add dependency on ui target to wms provider.
            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Author: Bas Couwenberg <sebastic at debian.org>
 Forwarded: https://github.com/qgis/QGIS/pull/6692
+Applied-Upstream: https://github.com/qgis/QGIS/commit/0eb3cd4e9cd8d83bad667e3527f87118c0922971
 
 --- a/src/providers/wms/CMakeLists.txt
 +++ b/src/providers/wms/CMakeLists.txt


=====================================
debian/patches/wmsprovider-qt4_wrap_cpp-dependencies.patch
=====================================
--- /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



View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/97e2544acaea508283e55719f043f292f3d723fb...44731624e2e6c65cf88d55553941c1bc8dbe52a4

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/97e2544acaea508283e55719f043f292f3d723fb...44731624e2e6c65cf88d55553941c1bc8dbe52a4
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-grass-devel/attachments/20180328/939105bf/attachment-0001.html>