[qgis/f14/master] backport sip patch from f15 branch

[Rex Dieter]

commit 2ba33a2e48cd92b524a4f38f066c34290acb8c04
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 17 13:50:07 2011 -0500

    backport sip patch from f15 branch

 qgis-1.6.0-sip.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
 qgis.spec            |    4 ++++
 2 files changed, 46 insertions(+), 0 deletions(-)
---
diff --git a/qgis-1.6.0-sip.patch b/qgis-1.6.0-sip.patch
new file mode 100644
index 0000000..a8264f4
--- /dev/null
+++ b/qgis-1.6.0-sip.patch
@@ -0,0 +1,42 @@
+--- qgis-1.6.0/python/core/conversions.sip	2010-10-03 11:11:28.000000000 +0200
++++ qgis-1.6.0_sip/python/core/conversions.sip	2011-02-02 15:15:46.725572147 +0100
+@@ -15,6 +15,7 @@
+ */
+ 
+ %Feature QSETINT_CONVERSION
++%Feature QSETTYPE_CONVERSION
+ 
+ %ModuleHeaderCode
+ // From Python 2.5, some functions use Py_ssize_t instead of int
+@@ -320,7 +321,7 @@
+ };
+ %End
+ 
+-
++%If (QSETTYPE_CONVERSION)
+ template <TYPE>
+ %MappedType QSet<TYPE>
+ {
+@@ -394,8 +395,7 @@
+ %End
+ 
+ };
+-
+-
++%End
+ 
+ template<TYPE>
+ %MappedType QMap<int, QMap<int, TYPE> >
+--- qgis-1.6.0/python/CMakeLists.txt	2010-10-04 22:05:12.000000000 +0200
++++ qgis-1.6.0_sip/python/CMakeLists.txt	2011-02-02 15:15:46.725572147 +0100
+@@ -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 --git a/qgis.spec b/qgis.spec
index cc0c039..6862977 100644
--- a/qgis.spec
+++ b/qgis.spec
@@ -17,6 +17,8 @@ Source1:        %{name}.desktop
 # Fix detection problem for GRASS libraries
 # Proposed changes for next version: https://trac.osgeo.org/qgis/ticket/2863
 Patch0: qgis-1.5.0-grass.patch
+# Fix problem with SIP 4.12, see https://trac.osgeo.org/qgis/changeset/14988
+Patch1: qgis-1.6.0-sip.patch
 
 BuildRequires:  cmake
 BuildRequires:  flex bison
@@ -95,6 +97,7 @@ Python integration and plugins for QGIS.
 %setup -q
 
 %patch0 -p1 -b .grass
+%patch1 -p1 -b .sip
 
 # Encode man-file to utf-8
 iconv -f iso8859-1 -t utf-8 qgis_help.1 > qgis_help.1.conv && mv qgis_help.1.conv qgis_help.1
@@ -225,6 +228,7 @@ rm -rf %{buildroot}
 %changelog
 * Thu Mar 17 2011 Rex Dieter <rdieter at fedoraproject.org> - 1.6.0-3.1
 - rebuild (sip)
+- backport sip patch from f15 branch
 
 * Thu Jan 27 2011 Bruno Wolff III >bruno at wolff.to> - 1.6.0-3
 - Rebuild for qt soname bump