Bug#872640: qgis: FTBFS with sip 4.19.3: conflicting declaration ‘PyObject* sipExportedExceptions__core [3]’

2017-08-20 Thread Dmitry Shachnev 
On Sun, Aug 20, 2017 at 09:33:01PM +0200, Sebastiaan Couwenberg wrote:
> Your patch has been applied upstream, and will be included in the next
> upload of the package (after 2.14.18+dfsg-1~exp1 passes the NEW queue).

Thank you Sebastiaan!

--
Dmitry Shachnev

Bug#872640: qgis: FTBFS with sip 4.19.3: conflicting declaration ‘PyObject* sipExportedExceptions__core [3]’

2017-08-20 Thread Sebastiaan Couwenberg 
Control: tags -1 fixed-upstream pending

Hi Dmitry,

On 08/19/2017 09:38 PM, Sebastiaan Couwenberg wrote:
> Thanks for reporting this issue, I've forwarded it upstream.
> 
> Hopefully the fix will be included in 2.14.19.
Your patch has been applied upstream, and will be included in the next
upload of the package (after 2.14.18+dfsg-1~exp1 passes the NEW queue).

Kind Regards,

Bas

-- 
 GPG Key ID: 4096R/6750F10AE88D4AF1
Fingerprint: 8182 DE41 7056 408D 6146  50D1 6750 F10A E88D 4AF1



signature.asc
Description: OpenPGP digital signature

Bug#872640: qgis: FTBFS with sip 4.19.3: conflicting declaration ‘PyObject* sipExportedExceptions__core [3]’

2017-08-19 Thread Sebastiaan Couwenberg 
Control: tags -1 upstream
Control: forwarded -1 https://issues.qgis.org/issues/17039

Hi Dimitri,

Thanks for reporting this issue, I've forwarded it upstream.

Hopefully the fix will be included in 2.14.19.

Kind Regards,

Bas

-- 
 GPG Key ID: 4096R/6750F10AE88D4AF1
Fingerprint: 8182 DE41 7056 408D 6146  50D1 6750 F10A E88D 4AF1



signature.asc
Description: OpenPGP digital signature

Bug#872640: qgis: FTBFS with sip 4.19.3: conflicting declaration ‘PyObject* sipExportedExceptions__core [3]’

2017-08-19 Thread Dmitry Shachnev 
Source: qgis
Version: 2.14.17+dfsg-1
Severity: important
Tags: patch
User: python-modules-t...@lists.alioth.debian.org
Usertags: sip4.19

Dear maintainer,

qgis fails to build with sip 4.19.3 and python-qt4 4.12.1, both of which
are available in experimental:

  /build/qgis-2.14.17+dfsg/debian/build/python/core/sip_corepart0.cpp:15288:40:
  error: conflicting declaration ‘PyObject* sipExportedExceptions__core 
[3]’
  /build/qgis-2.14.17+dfsg/python/core/qgscoordinatetransform.sip:18:18:
  note: previous declaration as ‘PyObject* sipExportedExceptions__core 
[2]’
   extern PyObject *sipExportedExceptions__core[2];  // workaround: 
sipExportedExceptions__core is only defined in the first sip part
^~~

The reason is that since sip 4.19.3, the sipExportedExceptions arrays
always have a NULL pointer as a trailing member, so size of this particular
array is 2 with sip 4.19.2 and 3 with sip 4.19.3.

https://riverbankcomputing.com/hg/sip/rev/974a4d77314b#l1.14

I am attaching a patch to remove this workaround line completely. It fixes
build with sip 4.19.3 for me and does not affect build with sip 4.18.1.
(I do not know why upstream needed this workaround.)

Unfortunately qscintilla2 built against this sip version is not available in
experimental, so you will need a self-built qscintilla2 to reproduce this
(remove debian/*.symbols as a workaround for bug #853628 to make the build
succeed).

--
Dmitry Shachnev
--- 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 
 %End
 


signature.asc
Description: PGP signature