Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (3)
Mark wmsprovider-dependencies.patch as Applied-Upstream.
· e90c5a12
Bas Couwenberg
authored
Mar 28, 2018
e90c5a12
Add patch to add dependencies to wmsprovider QT4_WRAP_CPP macro. Should fix parallel build.
· 6f94ce09
Bas Couwenberg
authored
Mar 28, 2018
6f94ce09
Set distribution to unstable.
· 44731624
Bas Couwenberg
authored
Mar 28, 2018
44731624
Show whitespace changes
Inline
Side-by-side
debian/changelog
View file @
44731624
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@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
View file @
44731624
...
...
@@ -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
View file @
44731624
...
...
@@ -7,6 +7,7 @@ Description: Add dependency on ui target to wms provider.
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Author: Bas Couwenberg <sebastic@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
0 → 100644
View file @
44731624
Description: Add custom target for QT4_WRAP_CPP macro.
Should fix parallel build.
Author: Bas Couwenberg <sebastic@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