[Git][debian-gis-team/qgis][master] 3 commits: Fix sed expression for make-dfsg (4.3-1).
Bas Couwenberg
gitlab at salsa.debian.org
Wed Jun 17 08:41:03 BST 2020
Bas Couwenberg pushed to branch master at Debian GIS Project / qgis
Commits:
813de228 by Bas Couwenberg at 2020-06-17T06:21:32+02:00
Fix sed expression for make-dfsg (4.3-1).
- - - - -
5b2abc15 by Bas Couwenberg at 2020-06-17T06:24:05+02:00
Add upstream patch to fix FTBFS with SIP 4.19.23. (closes: #962641)
- - - - -
1596142f by Bas Couwenberg at 2020-06-17T06:33:18+02:00
Set distribution to unstable.
- - - - -
4 changed files:
- debian/changelog
- + debian/patches/pr37250.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,9 +1,13 @@
-qgis (3.10.6+dfsg-1~exp2) UNRELEASED; urgency=medium
+qgis (3.10.6+dfsg-1) unstable; urgency=medium
* Don't use embedded copy of qt3extras headers when the system has them.
(closes: #960954)
+ * Fix sed expression for make-dfsg (4.3-1).
+ * Add upstream patch to fix FTBFS with SIP 4.19.23.
+ (closes: #962641)
+ * Move from experimental to unstable.
- -- Bas Couwenberg <sebastic at debian.org> Mon, 18 May 2020 20:33:59 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 17 Jun 2020 06:24:10 +0200
qgis (3.10.6+dfsg-1~exp1) experimental; urgency=medium
=====================================
debian/patches/pr37250.patch
=====================================
@@ -0,0 +1,253 @@
+Description: Fix compilation with QT 5.15
+Author: Blottiere Paul <blottiere.paul at gmail.com>
+Origin: https://github.com/qgis/QGIS/pull/37250
+Bug: https://github.com/qgis/QGIS/issues/37072
+Bug-Debian: https://bugs.debian.org/962641
+
+--- a/python/CMakeLists.txt
++++ b/python/CMakeLists.txt
+@@ -192,6 +192,11 @@ ENDIF((${SIP_VERSION_STR} VERSION_EQUAL
+ IF((${SIP_VERSION_STR} VERSION_EQUAL 4.18) OR (${SIP_VERSION_STR} VERSION_GREATER 4.18))
+ SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -y ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_core.pyi)
+ ENDIF((${SIP_VERSION_STR} VERSION_EQUAL 4.18) OR (${SIP_VERSION_STR} VERSION_GREATER 4.18))
++
++IF((${PYQT5_VERSION_STR} VERSION_EQUAL 5.15) OR (${PYQT5_VERSION_STR} VERSION_GREATER 5.15))
++ SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} VECTOR_MAPPED_TYPE)
++ENDIF((${PYQT5_VERSION_STR} VERSION_EQUAL 5.15) OR (${PYQT5_VERSION_STR} VERSION_GREATER 5.15))
++
+ GENERATE_SIP_PYTHON_MODULE_CODE(qgis._core core/core.sip "${sip_files_core}" cpp_files)
+ BUILD_SIP_PYTHON_MODULE(qgis._core core/core.sip ${cpp_files} "" qgis_core)
+ SET(SIP_CORE_CPP_FILES ${cpp_files})
+--- a/python/core/conversions.sip
++++ b/python/core/conversions.sip
+@@ -1435,6 +1435,7 @@ template <TYPE>
+ %End
+ };
+
++%If (VECTOR_MAPPED_TYPE)
+ template <TYPE>
+ %MappedType QVector< TYPE* >
+ {
+@@ -1507,6 +1508,7 @@ template <TYPE>
+ return sipGetState(sipTransferObj);
+ %End
+ };
++%End
+
+ %MappedType QMap<qint64, QgsFeature*>
+ {
+--- a/python/core/core.sip.in
++++ b/python/core/core.sip.in
+@@ -99,6 +99,7 @@ done:
+ %Import QtWidgets/QtWidgetsmod.sip
+
+ %Feature ANDROID
++%Feature VECTOR_MAPPED_TYPE
+
+ %Include conversions.sip
+ %Include qgsexception.sip
+--- a/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerror.sip.in
++++ b/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerror.sip.in
+@@ -199,6 +199,8 @@ its ``value`` Type for additional inform
+ %End
+
+
++ private:
++ const QgsGeometryCheckError &operator=( const QgsGeometryCheckError & );
+ };
+
+
+--- a/python/analysis/auto_generated/vector/geometry_checker/qgssinglegeometrycheck.sip.in
++++ b/python/analysis/auto_generated/vector/geometry_checker/qgssinglegeometrycheck.sip.in
+@@ -109,6 +109,8 @@ The underlying single error.
+ %End
+
+
++ private:
++ const QgsGeometryCheckErrorSingle &operator=( const QgsGeometryCheckErrorSingle & );
+ };
+
+ class QgsSingleGeometryCheck : QgsGeometryCheck
+--- a/src/analysis/vector/geometry_checker/qgsgeometrycheckerror.h
++++ b/src/analysis/vector/geometry_checker/qgsgeometrycheckerror.h
+@@ -234,6 +234,11 @@ class ANALYSIS_EXPORT QgsGeometryCheckEr
+ Status mStatus;
+ QString mResolutionMessage;
+
++ private:
++
++#ifdef SIP_RUN
++ const QgsGeometryCheckError &operator=( const QgsGeometryCheckError & );
++#endif
+ };
+
+ Q_DECLARE_METATYPE( QgsGeometryCheckError * )
+--- a/src/analysis/vector/geometry_checker/qgssinglegeometrycheck.h
++++ b/src/analysis/vector/geometry_checker/qgssinglegeometrycheck.h
+@@ -129,6 +129,10 @@ class ANALYSIS_EXPORT QgsGeometryCheckEr
+ bool handleChanges( const QgsGeometryCheck::Changes &changes ) override SIP_SKIP;
+
+ private:
++#ifdef SIP_RUN
++ const QgsGeometryCheckErrorSingle &operator=( const QgsGeometryCheckErrorSingle & );
++#endif
++
+ QgsSingleGeometryCheckError *mError = nullptr;
+ };
+
+--- a/python/core/auto_generated/symbology/qgsrulebasedrenderer.sip.in
++++ b/python/core/auto_generated/symbology/qgsrulebasedrenderer.sip.in
+@@ -46,6 +46,9 @@ Feature to render
+ %End
+
+ QgsSymbol *symbol;
++
++ private:
++ RenderJob &operator=( const RenderJob & );
+ };
+
+ struct RenderLevel
+--- a/src/core/symbology/qgsrulebasedrenderer.h
++++ b/src/core/symbology/qgsrulebasedrenderer.h
+@@ -67,7 +67,7 @@ class CORE_EXPORT QgsRuleBasedRenderer :
+ {
+ RenderJob( QgsRuleBasedRenderer::FeatureToRender &_ftr, QgsSymbol *_s )
+ : ftr( _ftr )
+- , symbol( _s )
++ , symbol( _s )
+ {}
+
+ //! Feature to render
+@@ -75,6 +75,11 @@ class CORE_EXPORT QgsRuleBasedRenderer :
+
+ //! Symbol to render feature with (not owned by this object).
+ QgsSymbol *symbol = nullptr;
++
++ private:
++#ifdef SIP_RUN
++ RenderJob &operator=( const RenderJob & );
++#endif
+ };
+
+ /**
+--- a/python/core/auto_generated/qgsrenderedfeaturehandlerinterface.sip.in
++++ b/python/core/auto_generated/qgsrenderedfeaturehandlerinterface.sip.in
+@@ -48,6 +48,9 @@ Constructor for RenderedFeatureContext.
+ %Docstring
+ The render context which was used while rendering feature.
+ %End
++
++ private:
++ RenderedFeatureContext &operator=( const RenderedFeatureContext & );
+ };
+
+ virtual void handleRenderedFeature( const QgsFeature &feature, const QgsGeometry &renderedBounds, const QgsRenderedFeatureHandlerInterface::RenderedFeatureContext &context ) = 0;
+--- a/src/core/qgsrenderedfeaturehandlerinterface.h
++++ b/src/core/qgsrenderedfeaturehandlerinterface.h
+@@ -63,6 +63,11 @@ class CORE_EXPORT QgsRenderedFeatureHand
+ * The render context which was used while rendering feature.
+ */
+ const QgsRenderContext &renderContext;
++
++ private:
++#ifdef SIP_RUN
++ RenderedFeatureContext &operator=( const RenderedFeatureContext & );
++#endif
+ };
+
+ /**
+--- a/python/core/auto_generated/effects/qgspainteffect.sip.in
++++ b/python/core/auto_generated/effects/qgspainteffect.sip.in
+@@ -448,6 +448,8 @@ Sets the effect to be painted
+
+
+
++ private:
++ const QgsEffectPainter &operator=( const QgsEffectPainter & );
+ };
+
+
+--- a/src/core/effects/qgspainteffect.h
++++ b/src/core/effects/qgspainteffect.h
+@@ -431,6 +431,10 @@ class CORE_EXPORT QgsEffectPainter
+ ///@endcond
+
+ private:
++#ifdef SIP_RUN
++ const QgsEffectPainter &operator=( const QgsEffectPainter & );
++#endif
++
+ QgsRenderContext &mRenderContext;
+ QPainter *mPainter = nullptr;
+ QgsPaintEffect *mEffect = nullptr;
+--- a/python/core/auto_generated/qgsreadwritelocker.sip.in
++++ b/python/core/auto_generated/qgsreadwritelocker.sip.in
+@@ -58,6 +58,8 @@ Equivalent to doing ``changeMode( QgsRea
+
+ ~QgsReadWriteLocker();
+
++ private:
++ QgsReadWriteLocker &operator=( const QgsReadWriteLocker & );
+ };
+
+ /************************************************************************
+--- a/src/core/qgsreadwritelocker.h
++++ b/src/core/qgsreadwritelocker.h
+@@ -71,6 +71,10 @@ class CORE_EXPORT QgsReadWriteLocker
+ ~QgsReadWriteLocker();
+
+ private:
++#ifdef SIP_RUN
++ QgsReadWriteLocker &operator=( const QgsReadWriteLocker & );
++#endif
++
+ QReadWriteLock &mLock;
+ Mode mMode = Unlocked;
+ };
+--- a/python/core/auto_generated/qgsreadwritecontext.sip.in
++++ b/python/core/auto_generated/qgsreadwritecontext.sip.in
+@@ -153,6 +153,8 @@ This would happen when it gets out of sc
+ Creates a popper
+ %End
+ ~QgsReadWriteContextCategoryPopper();
++ private:
++ QgsReadWriteContextCategoryPopper &operator=( const QgsReadWriteContextCategoryPopper & );
+ };
+
+ /************************************************************************
+--- a/src/core/qgsreadwritecontext.h
++++ b/src/core/qgsreadwritecontext.h
+@@ -162,6 +162,10 @@ class CORE_EXPORT QgsReadWriteContextCat
+ QgsReadWriteContextCategoryPopper( QgsReadWriteContext &context ) : mContext( context ) {}
+ ~QgsReadWriteContextCategoryPopper() {mContext.leaveCategory();}
+ private:
++#ifdef SIP_RUN
++ QgsReadWriteContextCategoryPopper &operator=( const QgsReadWriteContextCategoryPopper & );
++#endif
++
+ QgsReadWriteContext &mContext;
+ };
+
+--- a/python/server/auto_generated/qgsrequesthandler.sip.in
++++ b/python/server/auto_generated/qgsrequesthandler.sip.in
+@@ -164,6 +164,8 @@ Returns the requested format string
+ Returns ``True`` if the HTTP headers were already sent to the client
+ %End
+
++ private:
++ QgsRequestHandler &operator=( const QgsRequestHandler & );
+ };
+
+ /************************************************************************
+--- a/src/server/qgsrequesthandler.h
++++ b/src/server/qgsrequesthandler.h
+@@ -142,6 +142,9 @@ class SERVER_EXPORT QgsRequestHandler
+ bool headersSent() const;
+
+ private:
++#ifdef SIP_RUN
++ QgsRequestHandler &operator=( const QgsRequestHandler & );
++#endif
+
+ void setupParameters();
+
=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@ developersmap-use-debian-package.patch
exclude-elvensword-resources.patch
grass78.patch
spelling-errors.patch
+pr37250.patch
=====================================
debian/rules
=====================================
@@ -98,9 +98,9 @@ CMAKE_OPTS := \
-DQT_PLUGINS_DIR=$(QT_PLUGINS_DIR)
ifeq ($(PYTHON_GE_38),1)
- CMAKE_OPTS += -DPYTHON_LIBRARY=$(shell python3-config --ldflags --embed | sed -e 's\#-L\(.*\) -L/usr/lib -l\([^ ]*\) .*$$\#\1/lib\2.so\#')
+ CMAKE_OPTS += -DPYTHON_LIBRARY=$(shell python3-config --ldflags --embed | sed -e 's at -L\(.*\) -L/usr/lib -l\([^ ]*\) .*$$@\1/lib\2.so@')
else
- CMAKE_OPTS += -DPYTHON_LIBRARY=$(shell python3-config --ldflags | sed -e 's\#-L\(.*\) -L/usr/lib -l\([^ ]*\) .*$$\#\1/lib\2.so\#')
+ CMAKE_OPTS += -DPYTHON_LIBRARY=$(shell python3-config --ldflags | sed -e 's at -L\(.*\) -L/usr/lib -l\([^ ]*\) .*$$@\1/lib\2.so@')
endif
ifneq ($(SHA),)
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/-/compare/a770ad171590058bfc7284916c422fded3771d41...1596142f39e4850888a25a4780cdab07c757043d
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/-/compare/a770ad171590058bfc7284916c422fded3771d41...1596142f39e4850888a25a4780cdab07c757043d
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200617/ec5bc63b/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list