Bas Couwenberg pushed to branch master at Debian GIS Project / qgis
Commits: 902b4a89 by Bas Couwenberg at 2019-10-23T16:47:21Z Add upstream patch to fix OpenCL related FTBFS. (closes: #942015, #943331) - - - - - babf196a by Bas Couwenberg at 2019-10-23T17:08:10Z Update symbols for amd64. - - - - - ed745887 by Bas Couwenberg at 2019-10-23T17:17:47Z Add lintian override for sphinxdoc-but-no-sphinxdoc-depends. - - - - - 86c844d0 by Bas Couwenberg at 2019-10-23T17:17:59Z Set distribution to unstable. - - - - - 7 changed files: - debian/changelog - debian/libqgis-core3.4.12.symbols - debian/libqgis-gui3.4.12.symbols - + debian/patches/0001-fix-build-adapt-6567e3e6e.patch - − debian/patches/qscintilla-2.11.patch - debian/patches/series - debian/source/lintian-overrides Changes: ===================================== debian/changelog ===================================== @@ -1,11 +1,13 @@ -qgis (3.4.12+dfsg-2) UNRELEASED; urgency=medium +qgis (3.4.12+dfsg-2) unstable; urgency=medium * Bump Standards-Version to 4.4.1, no changes. - * Add patch by Gudjon I. Gudjonsson to fix FTBFS with qscintilla 2.11.2. - (closes: #942015) * Update lintian overrides for file-references-package-build-path. + * Add upstream patch to fix OpenCL related FTBFS. + (closes: #942015, #943331) + * Update symbols for amd64. + * Add lintian override for sphinxdoc-but-no-sphinxdoc-depends. - -- Bas Couwenberg <[email protected]> Mon, 30 Sep 2019 18:48:13 +0200 + -- Bas Couwenberg <[email protected]> Wed, 23 Oct 2019 19:17:49 +0200 qgis (3.4.12+dfsg-1) unstable; urgency=medium ===================================== debian/libqgis-core3.4.12.symbols ===================================== @@ -1,4 +1,4 @@ -# SymbolsHelper-Confirmed: 3.4.12 arm64 armel armhf +# SymbolsHelper-Confirmed: 3.4.12 amd64 arm64 armel armhf libqgis_core.so.3.4.12 #PACKAGE# #MINVER# * Build-Depends-Package: libqgis-dev GEOPROJ4@Base 2.0.1 @@ -14292,8 +14292,8 @@ libqgis_core.so.3.4.12 #PACKAGE# #MINVER# (optional=templinst)_ZNSt8functionIFbPK25QgsExpressionNodeFunctionP13QgsExpressionPK20QgsExpressionContextEEaSERKS9_@Base 3.4.5 (optional=templinst)_ZNSt8functionIFvRK10QgsFeatureEEC1ERKS4_@Base 3.4.5 (optional=templinst)_ZNSt8functionIFvRK10QgsFeatureEEC2ERKS4_@Base 3.4.5 - (optional=templinst)_ZNSt8functionIFvvEEC1ERKS1_@Base 3.4.5 - (optional=templinst)_ZNSt8functionIFvvEEC2ERKS1_@Base 3.4.5 + (optional=templinst|arch=!amd64)_ZNSt8functionIFvvEEC1ERKS1_@Base 3.4.5 + (optional=templinst|arch=!amd64)_ZNSt8functionIFvvEEC2ERKS1_@Base 3.4.5 (optional=templinst|arch=armel armhf powerpc ppc64 ppc64el s390x)_ZSt4swapI11QModelIndexENSt9enable_ifIXsrSt6__and_IJSt6__not_ISt15__is_tuple_likeIT_EESt21is_move_constructibleIS5_ESt18is_move_assignableIS5_EEE5valueEvE4typeERS5_SF_@Base 3.4.5 (optional=templinst)_ZSt4swapI16QgsRendererRangeENSt9enable_ifIXsrSt6__and_IJSt6__not_ISt15__is_tuple_likeIT_EESt21is_move_constructibleIS5_ESt18is_move_assignableIS5_EEE5valueEvE4typeERS5_SF_@Base 3.4.5 (optional=templinst)_ZSt4swapI19QgsRendererCategoryENSt9enable_ifIXsrSt6__and_IJSt6__not_ISt15__is_tuple_likeIT_EESt21is_move_constructibleIS5_ESt18is_move_assignableIS5_EEE5valueEvE4typeERS5_SF_@Base 3.4.5 ===================================== debian/libqgis-gui3.4.12.symbols ===================================== @@ -1002,6 +1002,7 @@ libqgis_gui.so.3.4.12 #PACKAGE# #MINVER# _ZN15CharacterWidgetD0Ev@Base 2.18.17 _ZN15CharacterWidgetD1Ev@Base 2.18.17 _ZN15CharacterWidgetD2Ev@Base 2.18.17 + _ZN15QTreeWidgetItem7setTextEiRK7QString@Base 3.4.12 _ZN15QgsAuthCertInfo10setupErrorERK7QString@Base 2.14.0 _ZN15QgsAuthCertInfo11qt_metacallEN11QMetaObject4CallEiPPv@Base 2.14.0 _ZN15QgsAuthCertInfo11qt_metacastEPKc@Base 2.14.0 @@ -1206,7 +1207,6 @@ libqgis_gui.so.3.4.12 #PACKAGE# #MINVER# _ZN15QgsVertexMarkerD0Ev@Base 2.18.17 _ZN15QgsVertexMarkerD1Ev@Base 2.18.17 _ZN15QgsVertexMarkerD2Ev@Base 2.18.17 - (arch=!mipsel)_ZN16QTableWidgetItem10setToolTipERK7QString@Base 3.4.11 _ZN16QTableWidgetItem7setTextERK7QString@Base 3.4.5 _ZN16QgsAttributeForm10WidgetInfoD1Ev@Base 3.4.5 _ZN16QgsAttributeForm10WidgetInfoD2Ev@Base 3.4.5 ===================================== debian/patches/0001-fix-build-adapt-6567e3e6e.patch ===================================== @@ -0,0 +1,15 @@ +Description: fix build (adapt 6567e3e6e) +Author: "Juergen E. Fischer" <[email protected]> +Origin: https://github.com/qgis/QGIS/commit/75063de614a7f9cea7b579fe687e1d62b894b35f + +--- a/src/core/qgsopenclutils.h ++++ b/src/core/qgsopenclutils.h +@@ -27,7 +27,7 @@ + #define CL_TARGET_OPENCL_VERSION 120 + #else + #define CL_USE_DEPRECATED_OPENCL_1_1_APIS +-#define CL_HPP_TARGET_OPENCL_VERSION 220 ++#define CL_HPP_TARGET_OPENCL_VERSION 200 + #define CL_TARGET_OPENCL_VERSION 200 + #endif + ===================================== debian/patches/qscintilla-2.11.patch deleted ===================================== @@ -1,15 +0,0 @@ -Description: Fix FTBFS with qscintilla 2.11.2. -Author: Gudjon I. Gudjonsson <[email protected]> -Bug-Debian: https://bugs.debian.org/942015 - ---- a/src/core/qgsopenclutils.h -+++ b/src/core/qgsopenclutils.h -@@ -28,7 +28,7 @@ - #else - #define CL_USE_DEPRECATED_OPENCL_1_1_APIS - #define CL_HPP_TARGET_OPENCL_VERSION 220 --#define CL_TARGET_OPENCL_VERSION 200 -+#define CL_TARGET_OPENCL_VERSION 220 - #endif - - #include <CL/cl2.hpp> ===================================== debian/patches/series ===================================== @@ -2,4 +2,4 @@ python-env.patch developersmap-use-debian-package.patch exclude-elvensword-resources.patch grass78.patch -qscintilla-2.11.patch +0001-fix-build-adapt-6567e3e6e.patch ===================================== debian/source/lintian-overrides ===================================== @@ -1,3 +1,6 @@ # Not worth the effort testsuite-autopkgtest-missing +# False positive, sphinxdoc is not used. +sphinxdoc-but-no-sphinxdoc-depends + View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/73096154481cd58297fd2f887894a9ff3237349f...86c844d0c71eaf4033ee06a5f2ecab8c87182512 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/73096154481cd58297fd2f887894a9ff3237349f...86c844d0c71eaf4033ee06a5f2ecab8c87182512 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
