diff --git a/qgis-1.5.0-sip411.patch b/qgis-1.5.0-sip411.patch new file mode 100644 index 0000000..4422dfd --- /dev/null +++ b/qgis-1.5.0-sip411.patch @@ -0,0 +1,64 @@ +--- qgis-1.5.0/python/core/conversions.sip 2010-04-20 14:25:42.000000000 +0200 ++++ qgis-1.5.0-sip411/python/core/conversions.sip 2010-09-11 23:37:45.828329803 +0200 +@@ -263,61 +263,6 @@ + }; + + +- +- +-%MappedType QSet +-{ +-%TypeHeaderCode +-#include +-#if (SIP_VERSION >= 0x040900) +-#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString)) +-#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant)) +-#endif +-%End +- +-%ConvertFromTypeCode +- // Create the list. +- PyObject *l; +- +- if ((l = PyList_New(sipCpp->size())) == NULL) +- return NULL; +- +- // Set the list elements. +- QSet::iterator it = sipCpp->begin(); +- for (int i = 0; it != sipCpp->end(); ++it, ++i) +- { +- PyObject *tobj; +- +- if ((tobj = PyInt_FromLong(*it)) == NULL) +- { +- Py_DECREF(l); +- return NULL; +- } +- PyList_SET_ITEM(l, i, tobj); +- } +- +- return l; +-%End +- +-%ConvertToTypeCode +- // Check the type if that is all that is required. +- if (sipIsErr == NULL) +- return PyList_Check(sipPy); +- +- QSet *qset = new QSet; +- +- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) +- { +- qset->insert(PyInt_AsLong(PyList_GET_ITEM(sipPy, i))); +- } +- +- *sipCppPtr = qset; +- return sipGetState(sipTransferObj); +-%End +- +-}; +- +- + template + %MappedType QSet + { diff --git a/qgis.spec b/qgis.spec index 8f149ea..bd7d44f 100644 --- a/qgis.spec +++ b/qgis.spec @@ -4,7 +4,7 @@ Name: qgis Version: 1.5.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -17,6 +17,7 @@ Source1: %{name}.desktop # Proposed changes for next version: https://trac.osgeo.org/qgis/ticket/2863 Patch0: qgis-1.5.0-grass.patch Patch1: qgis-1.5.0-qwt.patch +Patch2: qgis-1.5.0-sip411.patch BuildRequires: cmake BuildRequires: flex bison @@ -88,6 +89,7 @@ Python integration and plugins for QGIS. %patch0 -p1 -b .grass %patch1 -p1 -b .qwt +%patch2 -p1 -b .sip411 # 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 @@ -222,12 +224,15 @@ rm -rf %{buildroot} %{python_sitearch}/%{name} %changelog +* Mon Sep 13 2010 Volker Fröhlich - 1.5.05 +- Added workaround patch for SIP 4.11, see http://trac.osgeo.org/qgis/ticket/2985 + * Thu Sep 09 2010 Rex Dieter 1.5.0-4 - rebuild (sip) - BR: qt4-devel -* Fri Jul 30 2010 Volker Fröhlich - 1.5.0-3 -- Added dependency for gdal-python to fulfill standard plugin's requirements +* Fri Jul 30 2010 Volker Fröhlich - 1.5.03 +- Added dependency for gdal-python to fulfill standard plugins' requirements * Tue Jul 27 2010 Rex Dieter - 1.5.0-2.py27 - one more time for python27, with feeling