diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-01-23 17:15:18 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-01-23 17:15:18 +0000 |
| commit | f0c90a91821ede44775cc37a541658ad46c946f0 (patch) | |
| tree | fbeaf792cd353bfc6034ef389c83298adf3c403d | |
| parent | Version bump. And remove HPPA keywording because xfce-base/thunar is not keyw... (diff) | |
| download | gentoo-2-f0c90a91821ede44775cc37a541658ad46c946f0.tar.gz gentoo-2-f0c90a91821ede44775cc37a541658ad46c946f0.tar.bz2 gentoo-2-f0c90a91821ede44775cc37a541658ad46c946f0.zip | |
Fix compilation with newest pyqt. Per bug #352493
(Portage version: 2.2.0_alpha15/cvs/Linux x86_64)
| -rw-r--r-- | sci-geosciences/qgis/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-geosciences/qgis/files/qgis-1.5.0-qset.patch | 44 | ||||
| -rw-r--r-- | sci-geosciences/qgis/qgis-1.5.0.ebuild | 9 |
3 files changed, 56 insertions, 5 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/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 |