This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository qgis.
commit db89d0ac5417d2dcc93536008aeb302726669edb
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Mon Mar 26 22:35:48 2018 +0200
Add patch to add dependency on ui target to fix parallel build on ppc64el.
---
debian/changelog | 6 ++++++
debian/patches/series | 1 +
debian/patches/wmsprovider-dependencies.patch | 20 ++++++++++++++++++++
3 files changed, 27 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index a32bd48..a190e91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qgis (2.18.18+dfsg-1~exp2) UNRELEASED; urgency=medium
+
+ * Add patch to add dependency on ui target to fix parallel build on ppc64el.
+
+ -- Bas Couwenberg <sebas...@debian.org> Mon, 26 Mar 2018 22:35:13 +0200
+
qgis (2.18.18+dfsg-1~exp1) experimental; urgency=medium
[ Jürgen E. Fischer ]
diff --git a/debian/patches/series b/debian/patches/series
index b0b3fa0..0683f9d 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
+wmsprovider-dependencies.patch
diff --git a/debian/patches/wmsprovider-dependencies.patch
b/debian/patches/wmsprovider-dependencies.patch
new file mode 100644
index 0000000..e754e41
--- /dev/null
+++ b/debian/patches/wmsprovider-dependencies.patch
@@ -0,0 +1,20 @@
+Description: Add dependency on ui target to wms provider.
+ In file included from
/<<BUILDDIR>>/qgis-2.18.18+dfsg/debian/build/src/providers/wms/../../ui/ui_qgsgenericprojectionselectorbase.h:21:0,
+ from
/<<BUILDDIR>>/qgis-2.18.18+dfsg/src/providers/wms/../../gui/qgsgenericprojectionselector.h:20,
+ from
/<<BUILDDIR>>/qgis-2.18.18+dfsg/src/providers/wms/qgswmssourceselect.cpp:26:
+
/<<BUILDDIR>>/qgis-2.18.18+dfsg/src/providers/wms/../../gui/qgsprojectionselector.h:14:10:
fatal error: ui_qgsprojectionselectorbase.h: No such file or directory
+ #include <ui_qgsprojectionselectorbase.h>
+ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Author: Bas Couwenberg <sebas...@debian.org>
+
+--- a/src/providers/wms/CMakeLists.txt
++++ b/src/providers/wms/CMakeLists.txt
+@@ -46,7 +46,7 @@ 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)
++ADD_DEPENDENCIES(wmsprovider qgis_gui ui)
+
+ TARGET_LINK_LIBRARIES(wmsprovider
+ qgis_core
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/qgis.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
