Fix compilation with newest pyqt. Per bug #352493

Package-Manager: portage-2.2.0_alpha15/cvs/Linux x86_64

4 files changed, 59 insertions, 7 deletions

diff --git a/sci-geosciences/qgis/ChangeLog b/sci-geosciences/qgis/ChangeLog
index 1635c1d3a7c0..0f68155f4253 100644
--- a/sci-geosciences/qgis/ChangeLog
+++ b/sci-geosciences/qgis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/qgis
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.16 2010/12/21 14:37:08 scarabeus Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.17 2011/01/23 17:15:18 scarabeus Exp $
+
+  23 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org> qgis-1.5.0.ebuild,
+  +files/qgis-1.5.0-qset.patch:
+  Fix compilation with newest pyqt. Per bug #352493
 
   21 Dec 2010; Tomáš Chvátal <scarabeus@gentoo.org> qgis-1.5.0.ebuild,
   +files/qgis-1.5.0-sip.patch:
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 300a98e03f4e..07fa63904d08 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,9 +1,10 @@
 AUX qgis-1.4.0-gcc45.patch 536 RMD160 78966492091d7b9a249fce13d892881d82d25d5a SHA1 6ea4ea20d346a4f4df7bb043f779afebd831a606 SHA256 909d0699d8c203ff3198261d46de770ed3b6da3b9d77be7315c895539564b922
+AUX qgis-1.5.0-qset.patch 1278 RMD160 c52429cbbee4737731dbbe3bc68a5e39e194d050 SHA1 2cf1e98b8c14d62d097aee18a8bdeb12efa7028a SHA256 2e6736744ab05f453a05d03bfbbe06d8115e77ed1d3664a9357e83a433adeaf2
 AUX qgis-1.5.0-sip.patch 2754 RMD160 c17e7ef79894e94406a9bf26f928026e5df2a3d9 SHA1 41d123b2415d863d8358ca88cc933f6788aea984 SHA256 2be600d2f303f442f6d42eeaa5149ada49aad5d279b5f50bdd6262620ead82ee
 DIST qgis_1.4.0.tar.gz 17285943 RMD160 47486732c8fe37aa6864d09c7420be22de5ea802 SHA1 105f353f36e9625d1eb15f1a315882f214dbe026 SHA256 bbe07eedec4bda95cca994002941b91fd0e50d5cdee2bf79be0c4f7b930cc7da
 DIST qgis_1.5.0.tar.gz 17360308 RMD160 bd371640740c4f6d589d5bb9f2677a0de46d4895 SHA1 f17b1a1175bdfad6f8a005470bfbb70eaeaf806a SHA256 f99748e3948b97894703dc81c2a3eba1f2796651e581957cc2c61c9b9dbab470
 DIST qgis_sample_data.tar.gz 13601736 RMD160 048f6f984a8f2a03b0700896acfd6d345d53f1d0 SHA1 024aac8ac32c41ee9fe507599d197644c78f87a1 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a
 EBUILD qgis-1.4.0.ebuild 2576 RMD160 50e73148c4888d745d395c7b048c42d31cfcc48d SHA1 e8b40ed3c76c1d7544dff465af8c301e5f02a156 SHA256 35ed320ec0ca0cccbd5841dee6f4cac66d0790bc819b41f75c43e3db0e110065
-EBUILD qgis-1.5.0.ebuild 2478 RMD160 a853afbd0e1263b7959dde3ec3e5866e0040416f SHA1 d5f2717e7f69c5726370b6479e93175b8623fa67 SHA256 db1c0fbe2edc28a3dabe419babe505f08a80e14a6015bfbd93bd3ee6a553633b
-MISC ChangeLog 2656 RMD160 3eef6fea813084e8b22ef313636b9f833e7419a0 SHA1 23899e201831fad17b83ffde6821ba2d8fa3d553 SHA256 d3ad52fd9252754dbf7dfbaf11b6a58e327d7bd5bde95e3a593f3c3b0444b1a3
+EBUILD qgis-1.5.0.ebuild 2510 RMD160 d10ba0d29e86f4e4f2a80355587a3546794d386e SHA1 1a9946cb14e2b82c709a9d5e714f905a8ed4d0fe SHA256 70a389873ccacc54b8daa1e41c64ab98f9a1555acdb944a7d54d4e2a06f5a6a8
+MISC ChangeLog 2815 RMD160 facd9349b468be73db9f5f6f7a29aaf11f555890 SHA1 5018809f847580aefe3aee72c2f569b34b7dcfee SHA256 961cfe132e4335f551b0712b3422dd3a627416d7f0f21ea73e37b491706efa27
 MISC metadata.xml 664 RMD160 586f9cc0e1fcdf0f7610a749dfd766b468487196 SHA1 45e80ed6b803f6e8cec7b25cd32443a17efe519d SHA256 85807d824103a40c5e236cdf9fc287c0bf70b511274818a2242ac6efc203ff21
diff --git a/sci-geosciences/qgis/files/qgis-1.5.0-qset.patch b/sci-geosciences/qgis/files/qgis-1.5.0-qset.patch
new file mode 100644
index 000000000000..418b90092659
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-1.5.0-qset.patch
@@ -0,0 +1,44 @@
+diff -ur qgis-1.5.0/python/CMakeLists.txt qgis-1.5.0-patched/python/CMakeLists.txt
+--- qgis-1.5.0/python/CMakeLists.txt	2011-01-23 14:24:20.655999989 +0200
++++ qgis-1.5.0-patched/python/CMakeLists.txt	2011-01-23 14:29:03.930999748 +0200
+@@ -43,6 +43,10 @@
+   SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETINT_CONVERSION)
+ ENDIF(NOT PYQT4_VERSION_NUM LESS 263941)
+ 
++IF(NOT PYQT4_VERSION_NUM LESS 264194)   # 0x040802
++  SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETTYPE_CONVERSION)
++ENDIF(NOT PYQT4_VERSION_NUM LESS 264194)
++
+ # core module
+ FILE(GLOB sip_files_core core/*.sip)
+ set(SIP_EXTRA_FILES_DEPEND ${sip_files_core})
+diff -ur qgis-1.5.0/python/core/conversions.sip qgis-1.5.0-patched/python/core/conversions.sip
+--- qgis-1.5.0/python/core/conversions.sip	2011-01-23 14:24:20.656999987 +0200
++++ qgis-1.5.0-patched/python/core/conversions.sip	2011-01-23 14:30:08.901999769 +0200
+@@ -15,6 +15,7 @@
+ */
+ 
+ %Feature QSETINT_CONVERSION
++%Feature QSETTYPE_CONVERSION
+ 
+ %ModuleHeaderCode
+ // From Python 2.5, some functions use Py_ssize_t instead of int
+@@ -321,7 +322,7 @@
+ };
+ %End
+ 
+-
++%If (QSETTYPE_CONVERSION)
+ template <TYPE>
+ %MappedType QSet<TYPE>
+ {
+@@ -395,8 +396,7 @@
+ %End
+ 
+ };
+-
+-
++%End
+ 
+ template<TYPE>
+ %MappedType QMap<int, QMap<int, TYPE> >
diff --git a/sci-geosciences/qgis/qgis-1.5.0.ebuild b/sci-geosciences/qgis/qgis-1.5.0.ebuild
index 1ae75c554fd2..a5e020e24d14 100644
--- a/sci-geosciences/qgis/qgis-1.5.0.ebuild
+++ b/sci-geosciences/qgis/qgis-1.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.5.0.ebuild,v 1.2 2010/12/21 14:37:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.5.0.ebuild,v 1.3 2011/01/23 17:15:18 scarabeus Exp $
 
 EAPI=3
 
@@ -45,7 +45,10 @@ DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex"
 
-PATCHES=( "${FILESDIR}/${P}-sip.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-sip.patch"
+	"${FILESDIR}/${P}-qset.patch"
+)
 
 pkg_setup() {
 	python_set_active_version 2