[qgis] 01/01: Add patch by Dmitry Shachnev to fix FTBFS with SIP 4.19.3. (closes: #872640)

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository qgis.

commit 82b4dc6a2cb7626554bbda474799bebedbe169c5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Aug 20 21:30:57 2017 +0200

    Add patch by Dmitry Shachnev to fix FTBFS with SIP 4.19.3. (closes: #872640)
---
 debian/changelog                           |  7 +++++++
 debian/patches/remove-sip-workaround.patch | 16 ++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b5fe889..c659e60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qgis (2.14.18+dfsg-1~exp2) UNRELEASED; urgency=medium
+
+  * Add patch by Dmitry Shachnev to fix FTBFS with SIP 4.19.3.
+    (closes: #872640)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 20 Aug 2017 21:30:05 +0200
+
 qgis (2.14.18+dfsg-1~exp1) experimental; urgency=medium
 
   [ Jürgen E. Fischer ]
diff --git a/debian/patches/remove-sip-workaround.patch b/debian/patches/remove-sip-workaround.patch
new file mode 100644
index 0000000..ce96339
--- /dev/null
+++ b/debian/patches/remove-sip-workaround.patch
@@ -0,0 +1,16 @@
+Description: Remove SIP workaround to fix FTBFS with sip 4.19.3.
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Bug-Debian: https://bugs.debian.org/872640
+Bug: https://issues.qgis.org/issues/17039
+Applied-Upstream: https://github.com/qgis/QGIS/commit/91171370514b558ea7f0ae34af7503ddb31d68e6
+
+--- a/python/core/qgscoordinatetransform.sip
++++ b/python/core/qgscoordinatetransform.sip
+@@ -15,7 +15,6 @@
+ class QgsCoordinateTransform : QObject
+ {
+ %TypeHeaderCode
+-extern PyObject *sipExportedExceptions__core[2];  // workaround: sipExportedExceptions__core is only defined in the first sip part
+ #include <qgscoordinatetransform.h>
+ %End
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 47d4596..b6922d3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ qtermwidget-hurd.patch
 qt4-without-qtwebkit.patch
 columns-typo.patch
 grass72.patch
+remove-sip-workaround.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git