From 1506ed414cab2dcebf820119557ab4be4dea1d18 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 29 Jun 2017 16:16:12 +0200 Subject: [PATCH 01/10] 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 5f0a0a090e176561279bb9226d53ccaa78a7161d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 3 Jul 2017 20:09:40 +0200 Subject: [PATCH 02/10] Bump release for NVR parity with F26 --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index aa5712e..267eaeb 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 +* Mon Jul 03 2017 Sandro Mani - 2.18.10-5 +- Bump release for NVR parity with F26 + * Thu Jun 29 2017 Sandro Mani - 2.18.10-4 - Drop unnecessary qgis-2.18.10-sip.patch From 303b6f6c8c2887398fba5384dff79eab67c6430b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 6 Jul 2017 06:42:39 -0500 Subject: [PATCH 03/10] rebuild (sip) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 267eaeb..cc388c1 100644 --- a/qgis.spec +++ b/qgis.spec @@ -16,7 +16,7 @@ Name: qgis Version: 2.18.10 -Release: 5%{?dist} +Release: 6%{?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 +* Thu Jul 06 2017 Rex Dieter - 2.18.10-6 +- rebuild (sip) + * Mon Jul 03 2017 Sandro Mani - 2.18.10-5 - Bump release for NVR parity with F26 From 33d97c3a57f88e9e7c1d41eb56e2ea2873639eec Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 7 Jul 2017 13:11:33 +0200 Subject: [PATCH 04/10] Rebuild due to bug in RPM (RHBZ #1468476) Signed-off-by: Igor Gnatenko --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index cc388c1..5247350 100644 --- a/qgis.spec +++ b/qgis.spec @@ -16,7 +16,7 @@ Name: qgis Version: 2.18.10 -Release: 6%{?dist} +Release: 7%{?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 +* Fri Jul 07 2017 Igor Gnatenko - 2.18.10-7 +- Rebuild due to bug in RPM (RHBZ #1468476) + * Thu Jul 06 2017 Rex Dieter - 2.18.10-6 - rebuild (sip) From 3b31dfbe55daf37fdb4b76487878d24908631dca Mon Sep 17 00:00:00 2001 From: Volker Froehlich Date: Sat, 22 Jul 2017 08:45:25 +0200 Subject: [PATCH 05/10] New version 2.8.11 --- .gitignore | 1 + qgis.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4b947ab..a31c4ff 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ qgis_1.5.0.tar.gz /qgis-2.18.8.tar.bz2 /qgis-2.18.9.tar.bz2 /qgis-2.18.10.tar.bz2 +/qgis-2.18.11.tar.bz2 diff --git a/qgis.spec b/qgis.spec index 5247350..d33381a 100644 --- a/qgis.spec +++ b/qgis.spec @@ -15,8 +15,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 2.18.10 -Release: 7%{?dist} +Version: 2.18.11 +Release: 1%{?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 +* Sat Jul 22 2017 Volker Froehlich - 2.18.11-1 +- New upstream release + * Fri Jul 07 2017 Igor Gnatenko - 2.18.10-7 - Rebuild due to bug in RPM (RHBZ #1468476) diff --git a/sources b/sources index 6b628a1..8e724a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-2.18.10.tar.bz2) = 7f72515b72842a8612675c552f0091ca8b7075bda7fa3dbad09641532148af98cbeb17ee0eb3518204e59ce3a87db2eaef9ba57192ee5ade183b1c300e7a96d8 +SHA512 (qgis-2.18.11.tar.bz2) = 5100904912bbc9886e71cabfb70306e1e6a501d22da583df919211332b18f05cee5b5e3ca225976493ab03270d26d9de9e1050eeb140386df36c7e9f69f01ac0 From 6833749b42a7642eef2099cba7ad4ce89c330d9a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 12:35:03 +0000 Subject: [PATCH 06/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index d33381a..3dbb776 100644 --- a/qgis.spec +++ b/qgis.spec @@ -16,7 +16,7 @@ Name: qgis Version: 2.18.11 -Release: 1%{?dist} +Release: 2%{?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 +* Thu Jul 27 2017 Fedora Release Engineering - 2.18.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Jul 22 2017 Volker Froehlich - 2.18.11-1 - New upstream release From 2010e1c5550122153e411fad0c1740a708daa5cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 07:11:10 +0000 Subject: [PATCH 07/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 3dbb776..96a3d50 100644 --- a/qgis.spec +++ b/qgis.spec @@ -16,7 +16,7 @@ Name: qgis Version: 2.18.11 -Release: 2%{?dist} +Release: 3%{?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 +* Thu Aug 03 2017 Fedora Release Engineering - 2.18.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 2.18.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From fb7bb13fe3f44173d072a8d36f82b3a68dce0bc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 19 Aug 2017 09:43:37 -0400 Subject: [PATCH 08/10] Python 2 binary package renamed to python2-qgis --- qgis.spec | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/qgis.spec b/qgis.spec index 96a3d50..2efed58 100644 --- a/qgis.spec +++ b/qgis.spec @@ -16,7 +16,7 @@ Name: qgis Version: 2.18.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -145,7 +145,11 @@ Requires: grass%{?_isa} = %{grass_version} %description grass GRASS plugin for QGIS required to interface with the GRASS system. -%package python +%package -n python2-qgis +%{?python_provide:%python_provide python2-qgis} +# Remove before F30 +Provides: %{name}-python%{?_isa} = %{version}-%{release} +Obsoletes: %{name}-python < %{version}-%{release} Summary: Python integration and plug-ins for QGIS Group: Applications/Engineering Requires: %{name}%{?_isa} = %{version}-%{release} @@ -162,7 +166,7 @@ Requires: PyYAML Requires: qscintilla-python %{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}} -%description python +%description -n python2-qgis Python integration and plug-ins for QGIS. %package server @@ -339,9 +343,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %postun grass -p /sbin/ldconfig -%post python -p /sbin/ldconfig +%post -n python2-qgis -p /sbin/ldconfig -%postun python -p /sbin/ldconfig +%postun -n python2-qgis -p /sbin/ldconfig %files -f %{name}.lang %doc BUGS NEWS Exception_to_GPL_for_Qt.txt ChangeLog.gz @@ -391,7 +395,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %{_libdir}/%{name}/grass/ %{_datadir}/%{name}/grass/ -%files python +%files -n python2-qgis %{_libdir}/libqgispython.so.* %{_datadir}/%{name}/python/ %{python_sitearch}/%{name}/ @@ -409,6 +413,10 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 2.18.11-4 +- Python 2 binary package renamed to python2-qgis + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + * Thu Aug 03 2017 Fedora Release Engineering - 2.18.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 272e902b1f16c35115461ecf6940aa79ab6c8650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 19 Aug 2017 16:42:18 -0400 Subject: [PATCH 09/10] Also add Provides for the old name without %_isa --- qgis.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/qgis.spec b/qgis.spec index 2efed58..6f4e2bf 100644 --- a/qgis.spec +++ b/qgis.spec @@ -148,6 +148,7 @@ GRASS plugin for QGIS required to interface with the GRASS system. %package -n python2-qgis %{?python_provide:%python_provide python2-qgis} # Remove before F30 +Provides: %{name}-python = %{version}-%{release} Provides: %{name}-python%{?_isa} = %{version}-%{release} Obsoletes: %{name}-python < %{version}-%{release} Summary: Python integration and plug-ins for QGIS From 466f350b03cfa0cd17f1fe1ddd7c473995422d51 Mon Sep 17 00:00:00 2001 From: Volker Froehlich Date: Wed, 23 Aug 2017 09:15:59 +0200 Subject: [PATCH 10/10] New version 2.18.12 and fix for SIP-4.19-related build failure --- .gitignore | 1 + qgis-2.18.12-pyobject-redefined.patch | 18 ++++++++++++++++++ qgis.spec | 14 ++++++++++++-- sources | 2 +- 4 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 qgis-2.18.12-pyobject-redefined.patch diff --git a/.gitignore b/.gitignore index a31c4ff..7a8dd79 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ qgis_1.5.0.tar.gz /qgis-2.18.9.tar.bz2 /qgis-2.18.10.tar.bz2 /qgis-2.18.11.tar.bz2 +/qgis-2.18.12.tar.bz2 diff --git a/qgis-2.18.12-pyobject-redefined.patch b/qgis-2.18.12-pyobject-redefined.patch new file mode 100644 index 0000000..dca2446 --- /dev/null +++ b/qgis-2.18.12-pyobject-redefined.patch @@ -0,0 +1,18 @@ +commit 91171370514b558ea7f0ae34af7503ddb31d68e6 +Author: Juergen E. Fischer +Date: Sun Aug 20 10:51:52 2017 +0200 + + remove sip workaround (fixes #17038, refs #16071) + +diff --git a/python/core/qgscoordinatetransform.sip b/python/core/qgscoordinatetransform.sip +index f9b7854..464952d 100644 +--- a/python/core/qgscoordinatetransform.sip ++++ b/python/core/qgscoordinatetransform.sip +@@ -15,7 +15,6 @@ + class QgsCoordinateTransform : QObject + { + %TypeHeaderCode +-extern PyObject *sipExportedExceptions__core[2]; // workaround: sipExportedExceptions__core is only defined in the first sip part + #include + %End + diff --git a/qgis.spec b/qgis.spec index 6f4e2bf..5d5f70f 100644 --- a/qgis.spec +++ b/qgis.spec @@ -15,8 +15,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 2.18.11 -Release: 4%{?dist} +Version: 2.18.12 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -39,6 +39,7 @@ Source5: %{name}-mime.xml # https://hub.qgis.org/issues/15602 # https://github.com/qgis/QGIS/commit/718581ffb12b723f9a3c0ae01b7ec2d8aed9d4bb.patch Patch0: %{name}-lib64.patch +Patch1: %{name}-2.18.12-pyobject-redefined.patch # Some plug-ins need Pyspatialite (bundled) # The license is not totally clear, see: @@ -190,6 +191,11 @@ Please refer to %{name}-server-README.fedora for details! %setup -q %patch0 -p1 -b .lib64 +# Solve "error: conflicting declaration 'PyObject* sipExportedExceptions__core [3]'" +# https://issues.qgis.org/projects/qgis/repository/revisions/91171370514b558ea7f0ae34af7503ddb31d68e6 +# https://issues.qgis.org/projects/qgis/repository/revisions/91171370514b558ea7f0ae34af7503ddb31d68e6/diff/python/core/qgscoordinatetransform.sip?format=diff +%patch1 -p1 -b .pyobject + # Remove executable permissions from source code files find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+ @@ -414,6 +420,10 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Tue Aug 22 2017 Volker Froehlich - 2.18.12-1 +- New upstream release +- Add patch to solve SIP-4.19-related build failure + * Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 2.18.11-4 - Python 2 binary package renamed to python2-qgis See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 diff --git a/sources b/sources index 8e724a5..ef85b44 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-2.18.11.tar.bz2) = 5100904912bbc9886e71cabfb70306e1e6a501d22da583df919211332b18f05cee5b5e3ca225976493ab03270d26d9de9e1050eeb140386df36c7e9f69f01ac0 +SHA512 (qgis-2.18.12.tar.bz2) = e34dd98d0d0aa5fdf1f980dbc1376c25a9a7ffaa59b1a2eba8423e7f44bc039b547f3f65368178a8c485fa34526dd9fece2e09d9372fed3b9a758f7286b690ea