From 4f8a527219548ba8ba585e13368759c80631cc4e Mon Sep 17 00:00:00 2001 From: Volker Froehlich Date: Sat, 25 Mar 2017 12:18:50 +0100 Subject: [PATCH 01/12] 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 From d6fcd43af5ae8371bfb8c8d4627d9e75f759f1a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Sat, 8 Apr 2017 18:11:28 +0200 Subject: [PATCH 02/12] New upstream version 2.18.6 --- .gitignore | 1 + qgis.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index be5ee8f..3aea37a 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ qgis_1.5.0.tar.gz /qgis-2.18.2.tar.bz2 /qgis-2.18.4.tar.bz2 /qgis-2.18.5.tar.bz2 +/qgis-2.18.6.tar.bz2 diff --git a/qgis.spec b/qgis.spec index 6eda6c4..460a3bb 100644 --- a/qgis.spec +++ b/qgis.spec @@ -15,7 +15,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 2.18.5 +Version: 2.18.6 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -406,6 +406,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Fri Apr 07 2017 Volker Froehlich - 2.18.6-1 +- New upstream release + * Sat Mar 25 2017 Volker Froehlich - 2.18.5-1 - New upstream release diff --git a/sources b/sources index bf08087..ab9e81e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-2.18.5.tar.bz2) = dce5b1a4200579897e1ca0b9a6e7d1785b8e53b902b16d1e44139004971bad13d834658f7562b5e565bb4b9e928d709bf342c2ff7f10af0303525a58baff94b8 +SHA512 (qgis-2.18.6.tar.bz2) = 0046a7b4b573e3ecef0ad006c8cf3d22cf3f6032b7a57c445d416f903d6aa063bd9f5459b22375fb99f5f7a027cda98b861300cb1399448aa2fd3567093ada76 From bd28c5f6b072143a6ba34de9d1c60f31d3b432d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Sun, 23 Apr 2017 12:08:12 +0200 Subject: [PATCH 03/12] New release 2.18.7 --- .gitignore | 1 + qgis.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3aea37a..2f16631 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ qgis_1.5.0.tar.gz /qgis-2.18.4.tar.bz2 /qgis-2.18.5.tar.bz2 /qgis-2.18.6.tar.bz2 +/qgis-2.18.7.tar.bz2 diff --git a/qgis.spec b/qgis.spec index 460a3bb..c30b425 100644 --- a/qgis.spec +++ b/qgis.spec @@ -15,7 +15,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 2.18.6 +Version: 2.18.7 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -406,6 +406,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Sun Apr 23 2017 Volker Froehlich - 2.18.7-1 +- New upstream release + * Fri Apr 07 2017 Volker Froehlich - 2.18.6-1 - New upstream release diff --git a/sources b/sources index ab9e81e..d806106 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-2.18.6.tar.bz2) = 0046a7b4b573e3ecef0ad006c8cf3d22cf3f6032b7a57c445d416f903d6aa063bd9f5459b22375fb99f5f7a027cda98b861300cb1399448aa2fd3567093ada76 +SHA512 (qgis-2.18.7.tar.bz2) = e7908ebe8049d0ca2e99980ba8ac6e9b6941811c96d6139db87072315404987da0ec7272f77abacaddf5fb4bd540a0be7f64e44662fa32d2d4eb11b85421744d From b6f86ffe21d7ffec398add9b44fa4f18e36dee39 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 15 May 2017 20:06:01 +0000 Subject: [PATCH 04/12] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index c30b425..c559d08 100644 --- a/qgis.spec +++ b/qgis.spec @@ -16,7 +16,7 @@ Name: qgis Version: 2.18.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -406,6 +406,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Mon May 15 2017 Fedora Release Engineering - 2.18.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild + * Sun Apr 23 2017 Volker Froehlich - 2.18.7-1 - New upstream release From 23aed9fd0c52de1459cadfe1388138741fcc6b17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Fri, 19 May 2017 22:58:11 +0200 Subject: [PATCH 05/12] New version 2.18.8 --- .gitignore | 1 + qgis.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2f16631..6608168 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ qgis_1.5.0.tar.gz /qgis-2.18.5.tar.bz2 /qgis-2.18.6.tar.bz2 /qgis-2.18.7.tar.bz2 +/qgis-2.18.8.tar.bz2 diff --git a/qgis.spec b/qgis.spec index c559d08..2b18a8b 100644 --- a/qgis.spec +++ b/qgis.spec @@ -15,8 +15,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 2.18.7 -Release: 2%{?dist} +Version: 2.18.8 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -406,6 +406,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Fri May 19 2017 Volker Froehlich - 2.18.8-1 +- New upstream release + * Mon May 15 2017 Fedora Release Engineering - 2.18.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild diff --git a/sources b/sources index d806106..72d5bab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-2.18.7.tar.bz2) = e7908ebe8049d0ca2e99980ba8ac6e9b6941811c96d6139db87072315404987da0ec7272f77abacaddf5fb4bd540a0be7f64e44662fa32d2d4eb11b85421744d +SHA512 (qgis-2.18.8.tar.bz2) = ea6d3d6e95c186ced38f37f2da7e2fc43d337ce20c371cd1fa5160f816d42e8e59e87cd2efdc20db555d89970ca2ae1f0e089d616e0391efe6735fd3fec41ed4 From e5c2853c68848ddb024aa9d9990a1821f5f1cd0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Fri, 19 May 2017 22:58:11 +0200 Subject: [PATCH 06/12] New version 2.18.8 --- .gitignore | 1 + qgis.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2f16631..6608168 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ qgis_1.5.0.tar.gz /qgis-2.18.5.tar.bz2 /qgis-2.18.6.tar.bz2 /qgis-2.18.7.tar.bz2 +/qgis-2.18.8.tar.bz2 diff --git a/qgis.spec b/qgis.spec index c559d08..2b18a8b 100644 --- a/qgis.spec +++ b/qgis.spec @@ -15,8 +15,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 2.18.7 -Release: 2%{?dist} +Version: 2.18.8 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -406,6 +406,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Fri May 19 2017 Volker Froehlich - 2.18.8-1 +- New upstream release + * Mon May 15 2017 Fedora Release Engineering - 2.18.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild diff --git a/sources b/sources index d806106..72d5bab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-2.18.7.tar.bz2) = e7908ebe8049d0ca2e99980ba8ac6e9b6941811c96d6139db87072315404987da0ec7272f77abacaddf5fb4bd540a0be7f64e44662fa32d2d4eb11b85421744d +SHA512 (qgis-2.18.8.tar.bz2) = ea6d3d6e95c186ced38f37f2da7e2fc43d337ce20c371cd1fa5160f816d42e8e59e87cd2efdc20db555d89970ca2ae1f0e089d616e0391efe6735fd3fec41ed4 From 6429480d0f5dc04ff6817fa4cd2f7eec32b89c90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Wed, 31 May 2017 23:24:20 +0200 Subject: [PATCH 07/12] New upstream release 2.18.9 --- .gitignore | 1 + qgis.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6608168..170c0ae 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ qgis_1.5.0.tar.gz /qgis-2.18.6.tar.bz2 /qgis-2.18.7.tar.bz2 /qgis-2.18.8.tar.bz2 +/qgis-2.18.9.tar.bz2 diff --git a/qgis.spec b/qgis.spec index 2b18a8b..93fefba 100644 --- a/qgis.spec +++ b/qgis.spec @@ -15,7 +15,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 2.18.8 +Version: 2.18.9 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -406,6 +406,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Wed May 31 2017 Volker Froehlich - 2.18.9-1 +- New upstream release + * Fri May 19 2017 Volker Froehlich - 2.18.8-1 - New upstream release diff --git a/sources b/sources index 72d5bab..99a64c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-2.18.8.tar.bz2) = ea6d3d6e95c186ced38f37f2da7e2fc43d337ce20c371cd1fa5160f816d42e8e59e87cd2efdc20db555d89970ca2ae1f0e089d616e0391efe6735fd3fec41ed4 +SHA512 (qgis-2.18.9.tar.bz2) = 2495d9bc4f22f22882beb322d01465dd456a6db8a59a7e8e8056555b6ab4c895e9fc70d423f36a856d3a3b890bb3fbab607f7fd34736a8d2bc69f29bf1d91ca4 From 7e14c091657fb1f226cda68118a876e25668f158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Sun, 25 Jun 2017 10:55:27 +0200 Subject: [PATCH 08/12] New version 2.18.10 --- .gitignore | 1 + qgis.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 170c0ae..4b947ab 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ qgis_1.5.0.tar.gz /qgis-2.18.7.tar.bz2 /qgis-2.18.8.tar.bz2 /qgis-2.18.9.tar.bz2 +/qgis-2.18.10.tar.bz2 diff --git a/qgis.spec b/qgis.spec index 93fefba..ae7aa2f 100644 --- a/qgis.spec +++ b/qgis.spec @@ -15,7 +15,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 2.18.9 +Version: 2.18.10 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -406,6 +406,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Sat Jun 24 2017 Volker Froehlich - 2.18.10-1 +- New upstream release + * Wed May 31 2017 Volker Froehlich - 2.18.9-1 - New upstream release diff --git a/sources b/sources index 99a64c5..6b628a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-2.18.9.tar.bz2) = 2495d9bc4f22f22882beb322d01465dd456a6db8a59a7e8e8056555b6ab4c895e9fc70d423f36a856d3a3b890bb3fbab607f7fd34736a8d2bc69f29bf1d91ca4 +SHA512 (qgis-2.18.10.tar.bz2) = 7f72515b72842a8612675c552f0091ca8b7075bda7fa3dbad09641532148af98cbeb17ee0eb3518204e59ce3a87db2eaef9ba57192ee5ade183b1c300e7a96d8 From 29df9e04b368cff75168425ac108a405e58b67b4 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 26 Jun 2017 16:42:09 +0200 Subject: [PATCH 09/12] Disable parallel build for now to avoid build failures --- qgis.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/qgis.spec b/qgis.spec index ae7aa2f..6679a25 100644 --- a/qgis.spec +++ b/qgis.spec @@ -16,7 +16,7 @@ Name: qgis Version: 2.18.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -243,7 +243,10 @@ gzip ChangeLog # Doesn't build, as of 2.10, known issue #-D WITH_GLOBE:BOOL=TRUE -make %{?_smp_mflags} +# Parallel build appears to occasionally result in build failures +# (UI form headers generated too late) +# TODO: Re-check with QGIS-3.0 +make %install @@ -406,6 +409,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Mon Jun 26 2017 Sandro Mani - 2.18.10-2 +- Disable parallel build for now to avoid build failures + * Sat Jun 24 2017 Volker Froehlich - 2.18.10-1 - New upstream release From 86062bf7a0fff3fea03fe33685df1ee302d4e3d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Wed, 28 Jun 2017 08:46:04 +0200 Subject: [PATCH 10/12] Add SIP patch to hopefully restore building --- qgis-2.18.10-sip.patch | 186 +++++++++++++++++++++++++++++++++++++++++ qgis.spec | 9 +- 2 files changed, 194 insertions(+), 1 deletion(-) create mode 100644 qgis-2.18.10-sip.patch diff --git a/qgis-2.18.10-sip.patch b/qgis-2.18.10-sip.patch new file mode 100644 index 0000000..d42ea52 --- /dev/null +++ b/qgis-2.18.10-sip.patch @@ -0,0 +1,186 @@ +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 ++}; +-- +2.12.0 + diff --git a/qgis.spec b/qgis.spec index 6679a25..f100c01 100644 --- a/qgis.spec +++ b/qgis.spec @@ -16,7 +16,7 @@ Name: qgis Version: 2.18.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -40,6 +40,9 @@ Source5: %{name}-mime.xml # https://github.com/qgis/QGIS/commit/718581ffb12b723f9a3c0ae01b7ec2d8aed9d4bb.patch Patch0: %{name}-lib64.patch +# Taken from https://daniele.vigano.me/git/dani/copr-dani-qgis/raw/daniviga-2.18/qgis_sip-ftbfs.patch +Patch1: %{name}-2.18.10-sip.patch + # Some plug-ins need Pyspatialite (bundled) # The license is not totally clear, see: # http://code.google.com/p/pyspatialite/issues/detail?id=3 @@ -184,6 +187,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 {} \+ @@ -409,6 +413,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Wed Jun 28 2017 Volker Froehlich - 2.18.10-3 +- Add patch to fix sip issues + * Mon Jun 26 2017 Sandro Mani - 2.18.10-2 - Disable parallel build for now to avoid build failures From 776b1c79e94890622e78538000654a2492f35d07 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 29 Jun 2017 16:16:12 +0200 Subject: [PATCH 11/12] Drop unnecessary qgis-2.18.10-sip.patch --- qgis-2.18.10-sip.patch | 186 ----------------------------------------- qgis.spec | 9 +- 2 files changed, 4 insertions(+), 191 deletions(-) delete mode 100644 qgis-2.18.10-sip.patch diff --git a/qgis-2.18.10-sip.patch b/qgis-2.18.10-sip.patch deleted file mode 100644 index d42ea52..0000000 --- a/qgis-2.18.10-sip.patch +++ /dev/null @@ -1,186 +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 -+}; --- -2.12.0 - diff --git a/qgis.spec b/qgis.spec index f100c01..aa5712e 100644 --- a/qgis.spec +++ b/qgis.spec @@ -16,7 +16,7 @@ Name: qgis Version: 2.18.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -40,9 +40,6 @@ Source5: %{name}-mime.xml # https://github.com/qgis/QGIS/commit/718581ffb12b723f9a3c0ae01b7ec2d8aed9d4bb.patch Patch0: %{name}-lib64.patch -# Taken from https://daniele.vigano.me/git/dani/copr-dani-qgis/raw/daniviga-2.18/qgis_sip-ftbfs.patch -Patch1: %{name}-2.18.10-sip.patch - # Some plug-ins need Pyspatialite (bundled) # The license is not totally clear, see: # http://code.google.com/p/pyspatialite/issues/detail?id=3 @@ -187,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 +409,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Thu Jun 29 2017 Sandro Mani - 2.18.10-4 +- Drop unnecessary qgis-2.18.10-sip.patch + * Wed Jun 28 2017 Volker Froehlich - 2.18.10-3 - Add patch to fix sip issues From 35f3eec274a55e828bbc32f4bdd2f81eada92f83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Thu, 29 Jun 2017 22:32:50 +0200 Subject: [PATCH 12/12] Rebuild for Grass 7.2 --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index aa5712e..1d6118c 100644 --- a/qgis.spec +++ b/qgis.spec @@ -16,7 +16,7 @@ Name: qgis Version: 2.18.10 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -409,6 +409,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Wed Jun 30 2017 Volker Froehlich - 2.18.10-5 +- Rebuild for Grass 7.2 + * Thu Jun 29 2017 Sandro Mani - 2.18.10-4 - Drop unnecessary qgis-2.18.10-sip.patch