[Git][debian-gis-team/qgis][experimental] 2 commits: Add patch to add dependency on qgis_gui target to fix parallel build.

[Bas Couwenberg]

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


Commits:
18469582 by Bas Couwenberg at 2018-02-26T19:06:46+01:00
Add patch to add dependency on qgis_gui target to fix parallel build.

- - - - -
1b59f9fc by Bas Couwenberg at 2018-02-26T19:07:09+01:00
Set distribution to experimental.

- - - - -


3 changed files:

- debian/changelog
- debian/patches/series
- + debian/patches/wms-provider-dependencies.patch


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qgis (2.18.17+dfsg-1~exp3) experimental; 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 19:06:48 +0100
+
 qgis (2.18.17+dfsg-1~exp2) experimental; urgency=medium
 
   * Fix qgis.qch install in arch-indep target.


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


=====================================
debian/patches/wms-provider-dependencies.patch
=====================================
--- /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



View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/71c41e759da482e7558c4a2190cc90954a734075...1b59f9fcc553cd60c6943e9c0b27f9f9d322ad91

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/71c41e759da482e7558c4a2190cc90954a734075...1b59f9fcc553cd60c6943e9c0b27f9f9d322ad91
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/20180226/ec9f6b71/attachment-0001.html>