dani/copr-dani-qgis
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Activity

Merge branch 'daniviga-2.18-sync' of dani/copr-dani-qgis into daniviga-2.18

Browse Source
This commit is contained in:
Daniele Viganò 2017-07-18 09:29:41 +00:00 committed by Gogs
commit d5e00f3862
2 changed files with 9 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
qgis.spec
View File

@ -1,13 +1,5 @@
#TODO: Fix error message with processing plug-in in regards to pyspatialite
# Limit the number of concurrent make to avoid failures due races:
# qgsprojectionselector.h:14:10: fatal error: ui_qgsprojectionselectorbase.h: No such file or directory
# #include <ui_qgsprojectionselectorbase.h>
# ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
%if %(grep -c processor /proc/cpuinfo) > 4
%_smp_mflags -j4
%endif
# Shared lib calls exit
# https://hub.qgis.org/issues/2854
@ -27,7 +19,7 @@
Name: qgis
Version: 2.18.10
Release: 2%{?dist}
Release: 6%{?dist}
Summary: A user friendly Open Source Geographic Information System
Group: Applications/Engineering
@ -51,11 +43,6 @@ Source5: %{name}-mime.xml
# https://github.com/qgis/QGIS/commit/718581ffb12b723f9a3c0ae01b7ec2d8aed9d4bb.patch
Patch0: %{name}-lib64.patch
# Fix some SIP related FTBFS issues
# workaround (?): RuntimeError: qgis._core cannot import type 'QList<QVariant>' from PyQt4.QtCore
# workaround (?): RuntimeError: qgis._core cannot import type 'QList<QPolygonF>' 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
@ -200,9 +187,6 @@ Please refer to %{name}-server-README.fedora for details!
%prep
%setup -q
%patch0 -p1 -b .lib64
%if 0%{?fedora} == 26
%patch1 -p1 -b .sip
%endif
# Remove executable permissions from source code files
find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+
@ -262,7 +246,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
@ -425,6 +412,10 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog
* Mon Jul 17 2017 Daniele Viganò <daniele@vigano.me> - 2.18.10-6
- Rebuild for F26 GA
- Sync with Fedora upstream http://pkgs.fedoraproject.org/cgit/rpms/qgis.git
* Mon Jun 26 2017 Daniele Viganò <daniele@vigano.me> - 2.18.10-2
- Limit maximum number of concurrent make

186
qgis_sip-ftbfs.patch
View File

@ -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<QVariant> is implemented as a Python list.
+%MappedType QList<QVariant> /TypeHintIn="Sequence[QVariant]", TypeHintOut="List[QVariant]", TypeHintValue="[]"/
+{
+%TypeHeaderCode
+#include <qlist.h>
+%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<QVariant> *ql = new QList<QVariant>;
+ 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<QVariant *>(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<QPolygonF> is implemented as a Python list.
+%MappedType QList<QPolygonF> /TypeHintIn="Sequence[QPolygonF]", TypeHintOut="List[QPolygonF]", TypeHintValue="[]"/
+{
+%TypeHeaderCode
+#include <qlist.h>
+%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<QPolygonF> *ql = new QList<QPolygonF>;
+ 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<QPolygonF *>(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