diff --git a/qgis.spec b/qgis.spec index 3fc455a..6dcca00 100644 --- a/qgis.spec +++ b/qgis.spec @@ -19,7 +19,7 @@ Name: qgis Version: 2.18.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -40,8 +40,15 @@ Source4: %{name}-server-README.fedora Source5: %{name}-mime.xml # Fix builds on 64-bit machines # https://hub.qgis.org/issues/15602 +# 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 @@ -186,6 +193,7 @@ 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 {} \+ @@ -408,10 +416,16 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Fri Apr 7 2017 Daniele Viganò - 2.18.5-2 +- Build for F26 + * Mon Mar 27 2017 Daniele Viganò - 2.18.5-1 - New upstream release -* Thu Mar 02 2017 Daniele Viganò - 2.18.4-1 +* Wed Mar 01 2017 Sandro Mani - 2.18.4-2 +- Add patch to fix FTBFS + +* Wed Mar 01 2017 Daniele Viganò - 2.18.4-1 - New upstream release * Wed Feb 01 2017 Daniele Viganò - 2.18.3-1 diff --git a/qgis_sip-ftbfs.patch b/qgis_sip-ftbfs.patch new file mode 100644 index 0000000..01fefa8 --- /dev/null +++ b/qgis_sip-ftbfs.patch @@ -0,0 +1,202 @@ +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 +