Bas Couwenberg pushed to branch master at Debian GIS Project / qgis
Commits: db89d0ac by Bas Couwenberg at 2018-03-26T22:35:48+02:00 Add patch to add dependency on ui target to fix parallel build on ppc64el. - - - - - a9c54ab2 by Bas Couwenberg at 2018-03-26T22:35:59+02:00 Set distribution to experimental. - - - - - 3 changed files: - debian/changelog - debian/patches/series - + debian/patches/wmsprovider-dependencies.patch Changes: ===================================== debian/changelog ===================================== --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +qgis (2.18.18+dfsg-1~exp2) experimental; 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:50 +0200 + qgis (2.18.18+dfsg-1~exp1) experimental; urgency=medium [ Jürgen E. Fischer ] ===================================== 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 +wmsprovider-dependencies.patch ===================================== debian/patches/wmsprovider-dependencies.patch ===================================== --- /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 View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/d650e887fa2ea772b253c87e9c334174c3a5c950...a9c54ab2ae1614e8d4fadea37add78efc18e95b9 --- View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/d650e887fa2ea772b253c87e9c334174c3a5c950...a9c54ab2ae1614e8d4fadea37add78efc18e95b9 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel