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

Update to QGIS 2.18.12 #12

Merged
dani merged 11 commits from daniviga-2.18.12 into daniviga-2.18 2017-08-29 09:25:35 +02:00
Conversation 0 Commits 11 Files Changed 2 +32 -3
4 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 466f350b03 - Show all commits

1
.gitignore vendored
View File

@ -36,3 +36,4 @@ qgis_1.5.0.tar.gz
/qgis-2.18.9.tar.bz2 /qgis-2.18.9.tar.bz2
/qgis-2.18.10.tar.bz2 /qgis-2.18.10.tar.bz2
/qgis-2.18.11.tar.bz2 /qgis-2.18.11.tar.bz2
/qgis-2.18.12.tar.bz2

18
qgis-2.18.12-pyobject-redefined.patch Normal file
View File

@ -0,0 +1,18 @@
commit 91171370514b558ea7f0ae34af7503ddb31d68e6
Author: Juergen E. Fischer <jef@norbit.de>
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 <qgscoordinatetransform.h>
%End

14
qgis.spec
View File

@ -15,8 +15,8 @@
#TODO: Run test suite (see debian/rules) #TODO: Run test suite (see debian/rules)
Name: qgis Name: qgis
Version: 2.18.11 Version: 2.18.12
Release: 4%{?dist} Release: 1%{?dist}
Summary: A user friendly Open Source Geographic Information System Summary: A user friendly Open Source Geographic Information System
Group: Applications/Engineering Group: Applications/Engineering
@ -39,6 +39,7 @@ Source5: %{name}-mime.xml
# https://hub.qgis.org/issues/15602 # https://hub.qgis.org/issues/15602
# https://github.com/qgis/QGIS/commit/718581ffb12b723f9a3c0ae01b7ec2d8aed9d4bb.patch # https://github.com/qgis/QGIS/commit/718581ffb12b723f9a3c0ae01b7ec2d8aed9d4bb.patch
Patch0: %{name}-lib64.patch Patch0: %{name}-lib64.patch
Patch1: %{name}-2.18.12-pyobject-redefined.patch
# Some plug-ins need Pyspatialite (bundled) # Some plug-ins need Pyspatialite (bundled)
# The license is not totally clear, see: # The license is not totally clear, see:
@ -190,6 +191,11 @@ Please refer to %{name}-server-README.fedora for details!
%setup -q %setup -q
%patch0 -p1 -b .lib64 %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 # Remove executable permissions from source code files
find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+ 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 %changelog
* Tue Aug 22 2017 Volker Froehlich <volker27@gmx.at> - 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 <zbyszek@in.waw.pl> - 2.18.11-4 * Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.18.11-4
- Python 2 binary package renamed to python2-qgis - Python 2 binary package renamed to python2-qgis
See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3

2
sources
View File

@ -1 +1 @@
SHA512 (qgis-2.18.11.tar.bz2) = 5100904912bbc9886e71cabfb70306e1e6a501d22da583df919211332b18f05cee5b5e3ca225976493ab03270d26d9de9e1050eeb140386df36c7e9f69f01ac0 SHA512 (qgis-2.18.12.tar.bz2) = e34dd98d0d0aa5fdf1f980dbc1376c25a9a7ffaa59b1a2eba8423e7f44bc039b547f3f65368178a8c485fa34526dd9fece2e09d9372fed3b9a758f7286b690ea