From 4f8a527219548ba8ba585e13368759c80631cc4e Mon Sep 17 00:00:00 2001 From: Volker Froehlich Date: Sat, 25 Mar 2017 12:18:50 +0100 Subject: [PATCH] New version 2.18.5 --- .gitignore | 1 + qgis.spec | 14 ++- qgis_sip-ftbfs.patch | 202 ------------------------------------------- sources | 2 +- 4 files changed, 7 insertions(+), 212 deletions(-) delete mode 100644 qgis_sip-ftbfs.patch diff --git a/.gitignore b/.gitignore index 3b99dc5..be5ee8f 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ qgis_1.5.0.tar.gz /qgis-2.18.1.tar.bz2 /qgis-2.18.2.tar.bz2 /qgis-2.18.4.tar.bz2 +/qgis-2.18.5.tar.bz2 diff --git a/qgis.spec b/qgis.spec index e5e7c31..6eda6c4 100644 --- a/qgis.spec +++ b/qgis.spec @@ -15,8 +15,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 2.18.4 -Release: 2%{?dist} +Version: 2.18.5 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -40,12 +40,6 @@ Source5: %{name}-mime.xml # https://github.com/qgis/QGIS/commit/718581ffb12b723f9a3c0ae01b7ec2d8aed9d4bb.patch Patch0: %{name}-lib64.patch -# Fix some SIP related FTBFS issues -# upstream fix: qgsfiledownloader.sip:33:0: src/gui/qgsfiledownloader.h:94:5: error: overriding non-deleted function 'virtual QgsFileDownloader::~QgsFileDownloader()' -# workaround (?): RuntimeError: qgis._core cannot import type 'QList' from PyQt4.QtCore -# workaround (?): RuntimeError: qgis._core cannot import type 'QList' from PyQt4.QtCore -Patch1: qgis_sip-ftbfs.patch - # Some plug-ins need Pyspatialite (bundled) # The license is not totally clear, see: # http://code.google.com/p/pyspatialite/issues/detail?id=3 @@ -190,7 +184,6 @@ Please refer to %{name}-server-README.fedora for details! %prep %setup -q %patch0 -p1 -b .lib64 -%patch1 -p1 -b .sip # Remove executable permissions from source code files find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+ @@ -413,6 +406,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Sat Mar 25 2017 Volker Froehlich - 2.18.5-1 +- New upstream release + * Wed Mar 01 2017 Sandro Mani - 2.18.4-2 - Add patch to fix FTBFS diff --git a/qgis_sip-ftbfs.patch b/qgis_sip-ftbfs.patch deleted file mode 100644 index 01fefa8..0000000 --- a/qgis_sip-ftbfs.patch +++ /dev/null @@ -1,202 +0,0 @@ -diff --git a/python/core/conversions.sip b/python/core/conversions.sip -index f07d3ab1db..948821e91e 100644 ---- a/python/core/conversions.sip -+++ b/python/core/conversions.sip -@@ -2041,3 +2041,178 @@ register_from_qvariant_convertor = (void (*)(FromQVariantConvertorFn))sipImportS - register_from_qvariant_convertor(null_from_qvariant_convertor); - %End - %End -+ -+// QList is implemented as a Python list. -+%MappedType QList /TypeHintIn="Sequence[QVariant]", TypeHintOut="List[QVariant]", TypeHintValue="[]"/ -+{ -+%TypeHeaderCode -+#include -+%End -+ -+%ConvertFromTypeCode -+ // Create the list. -+ PyObject *l; -+ -+ if ((l = PyList_New(sipCpp->size())) == NULL) -+ return NULL; -+ -+ // Set the list elements. -+ for (int i = 0; i < sipCpp->size(); ++i) -+ { -+ QVariant *t = new QVariant(sipCpp->at(i)); -+ PyObject *tobj; -+ -+ if ((tobj = sipConvertFromNewType(t, sipType_QVariant, sipTransferObj)) == NULL) -+ { -+ Py_DECREF(l); -+ delete t; -+ -+ return NULL; -+ } -+ -+ PyList_SET_ITEM(l, i, tobj); -+ } -+ -+ return l; -+%End -+ -+%ConvertToTypeCode -+ SIP_SSIZE_T len; -+ -+ // Check the type if that is all that is required. -+ if (sipIsErr == NULL) -+ { -+ if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) < 0) -+ return 0; -+ -+ for (SIP_SSIZE_T i = 0; i < len; ++i) -+ { -+ PyObject *itm = PySequence_ITEM(sipPy, i); -+ bool ok = (itm && sipCanConvertToType(itm, sipType_QVariant, SIP_NOT_NONE)); -+ -+ Py_XDECREF(itm); -+ -+ if (!ok) -+ return 0; -+ } -+ -+ return 1; -+ } -+ -+ QList *ql = new QList; -+ len = PySequence_Size(sipPy); -+ -+ for (SIP_SSIZE_T i = 0; i < len; ++i) -+ { -+ PyObject *itm = PySequence_ITEM(sipPy, i); -+ int state; -+ QVariant *t = reinterpret_cast(sipConvertToType(itm, sipType_QVariant, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); -+ -+ Py_DECREF(itm); -+ -+ if (*sipIsErr) -+ { -+ sipReleaseType(t, sipType_QVariant, state); -+ -+ delete ql; -+ return 0; -+ } -+ -+ ql->append(*t); -+ -+ sipReleaseType(t, sipType_QVariant, state); -+ } -+ -+ *sipCppPtr = ql; -+ -+ return sipGetState(sipTransferObj); -+%End -+}; -+ -+ -+// QList is implemented as a Python list. -+%MappedType QList /TypeHintIn="Sequence[QPolygonF]", TypeHintOut="List[QPolygonF]", TypeHintValue="[]"/ -+{ -+%TypeHeaderCode -+#include -+%End -+ -+%ConvertFromTypeCode -+ // Create the list. -+ PyObject *l; -+ -+ if ((l = PyList_New(sipCpp->size())) == NULL) -+ return NULL; -+ -+ // Set the list elements. -+ for (int i = 0; i < sipCpp->size(); ++i) -+ { -+ QPolygonF *t = new QPolygonF(sipCpp->at(i)); -+ PyObject *tobj; -+ -+ if ((tobj = sipConvertFromNewType(t, sipType_QPolygonF, sipTransferObj)) == NULL) -+ { -+ Py_DECREF(l); -+ delete t; -+ -+ return NULL; -+ } -+ -+ PyList_SET_ITEM(l, i, tobj); -+ } -+ -+ return l; -+%End -+ -+%ConvertToTypeCode -+ SIP_SSIZE_T len; -+ -+ // Check the type if that is all that is required. -+ if (sipIsErr == NULL) -+ { -+ if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) < 0) -+ return 0; -+ -+ for (SIP_SSIZE_T i = 0; i < len; ++i) -+ { -+ PyObject *itm = PySequence_ITEM(sipPy, i); -+ bool ok = (itm && sipCanConvertToType(itm, sipType_QPolygonF, SIP_NOT_NONE)); -+ -+ Py_XDECREF(itm); -+ -+ if (!ok) -+ return 0; -+ } -+ -+ return 1; -+ } -+ -+ QList *ql = new QList; -+ len = PySequence_Size(sipPy); -+ -+ for (SIP_SSIZE_T i = 0; i < len; ++i) -+ { -+ PyObject *itm = PySequence_ITEM(sipPy, i); -+ int state; -+ QPolygonF *t = reinterpret_cast(sipConvertToType(itm, sipType_QPolygonF, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); -+ -+ Py_DECREF(itm); -+ -+ if (*sipIsErr) -+ { -+ sipReleaseType(t, sipType_QPolygonF, state); -+ -+ delete ql; -+ return 0; -+ } -+ -+ ql->append(*t); -+ -+ sipReleaseType(t, sipType_QPolygonF, state); -+ } -+ -+ *sipCppPtr = ql; -+ -+ return sipGetState(sipTransferObj); -+%End -+}; -diff --git a/src/gui/qgsfiledownloader.h b/src/gui/qgsfiledownloader.h -index c9276f7caf..841e4b6ee1 100644 ---- a/src/gui/qgsfiledownloader.h -+++ b/src/gui/qgsfiledownloader.h -@@ -90,8 +90,10 @@ class GUI_EXPORT QgsFileDownloader : public QObject - void onSslErrors( QNetworkReply *reply, const QList &errors ); - #endif - -- private: -+ protected: - ~QgsFileDownloader(); -+ -+ private: - /** - * Abort current request and show an error if the instance has GUI - * notifications enabled. --- -2.12.0 - diff --git a/sources b/sources index 351a6e5..bf08087 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-2.18.4.tar.bz2) = 3938fbc1f87990a08411ba8f793d7900f10eaea1824a5a9d2217ca0dea1a8b0849ec91c41be50dc65f590713391bb613429bf48f9ea0ffaaba876dde35b98fc7 +SHA512 (qgis-2.18.5.tar.bz2) = dce5b1a4200579897e1ca0b9a6e7d1785b8e53b902b16d1e44139004971bad13d834658f7562b5e565bb4b9e928d709bf342c2ff7f10af0303525a58baff94b8