summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Springer2020-06-09 12:04:43 +0200
committerStephan Springer2020-06-18 16:43:06 +0200
commit44222ab6377ac72b396ae4997b4327220eb0d99d (patch)
treef9378b2792f4218cc97222213e1fb859aebbe1ed
parent3119555a6e9dc6febc2045118c70185882af934b (diff)
downloadaur-44222ab6377ac72b396ae4997b4327220eb0d99d.tar.gz
Fix build with GCC 10 and qt 5.15
• apply patch qgis-pyqt5-sip5.patch from community package qgis • add missing includes • patch for removed --toc-level in txt2tags • apply patches from https://github.com/qgis/QGIS/pull/37250
-rw-r--r--.SRCINFO26
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD38
-rw-r--r--include-QPainterPath.patch66
-rw-r--r--qgis-pyqt5-sip5.patch22
-rw-r--r--t2t-toc-level.patch24
6 files changed, 173 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f556721451e..b56a90c2d6a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = qgis-ltr
pkgdesc = Geographic Information System (GIS); Long Term Release
pkgver = 3.10.6
- pkgrel = 1
+ pkgrel = 2
url = https://qgis.org/
arch = x86_64
license = GPL
@@ -40,7 +40,31 @@ pkgbase = qgis-ltr
provides = qgis=3.10.6
conflicts = qgis
source = https://qgis.org/downloads/qgis-3.10.6.tar.bz2
+ source = qgis-pyqt5-sip5.patch
+ source = include-QPainterPath.patch
+ source = t2t-toc-level.patch
+ source = qgis-qt-5.15-1.patch::https://github.com/qgis/QGIS/pull/37250/commits/572d092df4f7d985bca11050430e0a4adcb20e6e.patch
+ source = qgis-qt-5.15-2.patch::https://github.com/qgis/QGIS/pull/37250/commits/02c949d3edf2da0fc19f2ff7e1c91fe70d4fadab.patch
+ source = qgis-qt-5.15-3.patch::https://github.com/qgis/QGIS/pull/37250/commits/7b7dd795bb4541a02f7c6c93172b91ab2fd0f062.patch
+ source = qgis-qt-5.15-4.patch::https://github.com/qgis/QGIS/pull/37250/commits/b1dd36c52067ee357fbd0bcf70cb2f6717bf2699.patch
+ source = qgis-qt-5.15-5.patch::https://github.com/qgis/QGIS/pull/37250/commits/a1f74450953594e870ded4cd6c3ae01900041c2d.patch
+ source = qgis-qt-5.15-6.patch::https://github.com/qgis/QGIS/pull/37250/commits/560003668fb91b6b4bd6470babb99e2ac9ddf234.patch
+ source = qgis-qt-5.15-7.patch::https://github.com/qgis/QGIS/pull/37250/commits/21b42cb80f9d39c756ab8691bd26ed7e90dea7fc.patch
+ source = qgis-qt-5.15-8.patch::https://github.com/qgis/QGIS/pull/37250/commits/7e4e6f36f17416931166a3d89e7ab2cf3872b210.patch
+ source = qgis-qt-5.15-9.patch::https://github.com/qgis/QGIS/pull/37250/commits/adb616f9109d0b17cda89479a1dbfa99966587bd.patch
sha256sums = a96791bf6615e4f8ecdbbb9a90a8ef14a12459d8c5c374ab22eb5f776f864bb5
+ sha256sums = 47fdab75c94ecf5b61a41b334e23714226e895cef507c35a3bc4b46c7d307981
+ sha256sums = f8a158da9eb9130bba50c17bca266cbdb6adf1004f1c5fa375a9bbf8a1b1f5e2
+ sha256sums = f7e91914cfe366a63383b39c63d5731f6f20a1a0a0d7e9f3d16809a40bb5acff
+ sha256sums = 6eefa66b4971078f4df7df2cb598b1947a69ea41d775d8a0588886af864cea9d
+ sha256sums = 83a424a2749cb429b71b73cebcf37a83dd220e2df459c3f0756d5759c31c6b31
+ sha256sums = b5f0ea8ef2962550b32e6f2e0211c3511563d99cba440b159791ea50522aca8b
+ sha256sums = f52f1ed426711cb203b5b7697a0b0fc253839cd841c6633b6c8103280e00bdeb
+ sha256sums = 068311e8bffd7a3708173cd1f3aa2131afd7d9e9dc5a4adaac94700292017201
+ sha256sums = da6b1e21daa88e2788a330b240efe80d8aff1365eec58f6bdf61af9878d8c868
+ sha256sums = 137f0cf56be3f8e986dd71c80f6dcb9b54bc81465fa313147557ef19ac3d5b2b
+ sha256sums = 575f44c354bebfeba348b4ee70b6b5c570e2ebcc2086138184a1a0b9c789baa5
+ sha256sums = 52fe6f123f8aeb34db835e036282248f44452f97e64e636a174b3bf84dcead73
pkgname = qgis-ltr
diff --git a/.gitignore b/.gitignore
index 71a9d16c2b3..e5a920f6a7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
*/
*.tar.*
*.log
+qgis-qt-5.15-[1-9].patch
diff --git a/PKGBUILD b/PKGBUILD
index ecbaebd94d7..b16147819bb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
_pkgname=qgis
pkgname="$_pkgname"-ltr
pkgver=3.10.6
-pkgrel=1
+pkgrel=2
pkgdesc='Geographic Information System (GIS); Long Term Release'
url='https://qgis.org/'
license=(GPL)
@@ -30,12 +30,44 @@ optdepends=('fcgi: Map server'
'python-yaml: Processing plugin')
provides=("$_pkgname=$pkgver")
conflicts=("$_pkgname")
-source=("https://qgis.org/downloads/$_pkgname-$pkgver.tar.bz2")
+source=("https://qgis.org/downloads/$_pkgname-$pkgver.tar.bz2"
+ qgis-pyqt5-sip5.patch
+ include-QPainterPath.patch
+ t2t-toc-level.patch
+ qgis-qt-5.15-1.patch::https://github.com/qgis/QGIS/pull/37250/commits/572d092df4f7d985bca11050430e0a4adcb20e6e.patch
+ qgis-qt-5.15-2.patch::https://github.com/qgis/QGIS/pull/37250/commits/02c949d3edf2da0fc19f2ff7e1c91fe70d4fadab.patch
+ qgis-qt-5.15-3.patch::https://github.com/qgis/QGIS/pull/37250/commits/7b7dd795bb4541a02f7c6c93172b91ab2fd0f062.patch
+ qgis-qt-5.15-4.patch::https://github.com/qgis/QGIS/pull/37250/commits/b1dd36c52067ee357fbd0bcf70cb2f6717bf2699.patch
+ qgis-qt-5.15-5.patch::https://github.com/qgis/QGIS/pull/37250/commits/a1f74450953594e870ded4cd6c3ae01900041c2d.patch
+ qgis-qt-5.15-6.patch::https://github.com/qgis/QGIS/pull/37250/commits/560003668fb91b6b4bd6470babb99e2ac9ddf234.patch
+ qgis-qt-5.15-7.patch::https://github.com/qgis/QGIS/pull/37250/commits/21b42cb80f9d39c756ab8691bd26ed7e90dea7fc.patch
+ qgis-qt-5.15-8.patch::https://github.com/qgis/QGIS/pull/37250/commits/7e4e6f36f17416931166a3d89e7ab2cf3872b210.patch
+ qgis-qt-5.15-9.patch::https://github.com/qgis/QGIS/pull/37250/commits/adb616f9109d0b17cda89479a1dbfa99966587bd.patch
+)
# curl https://qgis.org/downloads/qgis-latest-ltr.tar.bz2.sha256
-sha256sums=('a96791bf6615e4f8ecdbbb9a90a8ef14a12459d8c5c374ab22eb5f776f864bb5')
+sha256sums=('a96791bf6615e4f8ecdbbb9a90a8ef14a12459d8c5c374ab22eb5f776f864bb5'
+ '47fdab75c94ecf5b61a41b334e23714226e895cef507c35a3bc4b46c7d307981'
+ 'f8a158da9eb9130bba50c17bca266cbdb6adf1004f1c5fa375a9bbf8a1b1f5e2'
+ 'f7e91914cfe366a63383b39c63d5731f6f20a1a0a0d7e9f3d16809a40bb5acff'
+ '6eefa66b4971078f4df7df2cb598b1947a69ea41d775d8a0588886af864cea9d'
+ '83a424a2749cb429b71b73cebcf37a83dd220e2df459c3f0756d5759c31c6b31'
+ 'b5f0ea8ef2962550b32e6f2e0211c3511563d99cba440b159791ea50522aca8b'
+ 'f52f1ed426711cb203b5b7697a0b0fc253839cd841c6633b6c8103280e00bdeb'
+ '068311e8bffd7a3708173cd1f3aa2131afd7d9e9dc5a4adaac94700292017201'
+ 'da6b1e21daa88e2788a330b240efe80d8aff1365eec58f6bdf61af9878d8c868'
+ '137f0cf56be3f8e986dd71c80f6dcb9b54bc81465fa313147557ef19ac3d5b2b'
+ '575f44c354bebfeba348b4ee70b6b5c570e2ebcc2086138184a1a0b9c789baa5'
+ '52fe6f123f8aeb34db835e036282248f44452f97e64e636a174b3bf84dcead73')
prepare() {
mkdir -p build
+ cd "$_pkgname-$pkgver"
+ patch -p1 -i ../qgis-pyqt5-sip5.patch # Use new pyqt sip file location
+ patch -p1 -i ../include-QPainterPath.patch # Add missing includes
+ patch -p1 -i ../t2t-toc-level.patch # --toc-level has been removed in txt2tags
+ for i in 1 2 3 4 5 6 7 8 9; do
+ patch -p1 -i ../qgis-qt-5.15-$i.patch
+ done
}
build() {
diff --git a/include-QPainterPath.patch b/include-QPainterPath.patch
new file mode 100644
index 00000000000..b6640016534
--- /dev/null
+++ b/include-QPainterPath.patch
@@ -0,0 +1,66 @@
+diff -ru orig/src/core/dxf/qgsdxfpaintengine.h qgis-3.10.6/src/core/dxf/qgsdxfpaintengine.h
+--- orig/src/core/dxf/qgsdxfpaintengine.h 2020-06-18 15:24:50.000000000 +0200
++++ qgis-3.10.6/src/core/dxf/qgsdxfpaintengine.h 2020-06-18 16:03:02.919975148 +0200
+@@ -22,6 +22,7 @@
+
+ #include "qgis_core.h"
+ #include <QPaintEngine>
++#include <QPainterPath>
+ #include "qgsabstractgeometry.h"
+
+ class QgsPoint;
+diff -ru orig/src/core/geometry/qgslinestring.h qgis-3.10.6/src/core/geometry/qgslinestring.h
+--- orig/src/core/geometry/qgslinestring.h 2020-06-18 15:24:50.000000000 +0200
++++ qgis-3.10.6/src/core/geometry/qgslinestring.h 2020-06-18 16:03:38.239975033 +0200
+@@ -20,6 +20,7 @@
+
+
+ #include <QPolygonF>
++#include <QPainterPath>
+
+ #include "qgis_core.h"
+ #include "qgis_sip.h"
+diff -ru orig/src/core/qgsmaplayerref.h qgis-3.10.6/src/core/qgsmaplayerref.h
+--- orig/src/core/qgsmaplayerref.h 2020-06-18 15:24:50.000000000 +0200
++++ qgis-3.10.6/src/core/qgsmaplayerref.h 2020-06-18 16:12:53.599973235 +0200
+@@ -19,6 +19,7 @@
+ #define SIP_NO_FILE
+
+ #include <QPointer>
++#include <QPainterPath>
+
+ #include "qgsmaplayer.h"
+ #include "qgsdataprovider.h"
+diff -ru orig/src/core/qgspallabeling.h qgis-3.10.6/src/core/qgspallabeling.h
+--- orig/src/core/qgspallabeling.h 2020-06-18 15:24:50.000000000 +0200
++++ qgis-3.10.6/src/core/qgspallabeling.h 2020-06-18 16:21:14.659971613 +0200
+@@ -30,6 +30,7 @@
+ #include <QHash>
+ #include <QList>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QRectF>
+ #include <QMap>
+ #include "qgsfeature.h"
+diff -ru orig/src/core/symbology/qgssymbollayer.h qgis-3.10.6/src/core/symbology/qgssymbollayer.h
+--- orig/src/core/symbology/qgssymbollayer.h 2020-06-18 15:24:50.000000000 +0200
++++ qgis-3.10.6/src/core/symbology/qgssymbollayer.h 2020-06-18 15:54:24.459976826 +0200
+@@ -22,6 +22,7 @@
+ // #include "qgis.h"
+ #include <QColor>
+ #include <QMap>
++#include <QPainterPath>
+ #include <QPointF>
+ #include <QSet>
+ #include <QDomDocument>
+diff -ru orig/src/gui/qgsmapoverviewcanvas.cpp qgis-3.10.6/src/gui/qgsmapoverviewcanvas.cpp
+--- orig/src/gui/qgsmapoverviewcanvas.cpp 2020-06-18 15:24:50.000000000 +0200
++++ qgis-3.10.6/src/gui/qgsmapoverviewcanvas.cpp 2020-06-18 16:22:23.569971390 +0200
+@@ -24,6 +24,7 @@
+ #include "qgsmaptopixel.h"
+
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPaintEvent>
+ #include <QResizeEvent>
+ #include <QMouseEvent>
diff --git a/qgis-pyqt5-sip5.patch b/qgis-pyqt5-sip5.patch
new file mode 100644
index 00000000000..3e140db6b40
--- /dev/null
+++ b/qgis-pyqt5-sip5.patch
@@ -0,0 +1,22 @@
+diff --git a/cmake/FindPyQt5.py b/cmake/FindPyQt5.py
+index 6a55a0f801..ba46441059 100644
+--- a/cmake/FindPyQt5.py
++++ b/cmake/FindPyQt5.py
+@@ -37,7 +37,7 @@ except ImportError:
+ import PyQt5.QtCore
+ import sipconfig # won't work for SIP v5
+ import os.path
+- import sys
++ import sys, site
+ cfg = sipconfig.Configuration()
+ sip_dir = cfg.default_sip_dir
+ if sys.platform.startswith('freebsd'):
+@@ -54,7 +54,7 @@ except ImportError:
+ 'pyqt_version_str': PyQt5.QtCore.PYQT_VERSION_STR,
+ 'pyqt_sip_flags': PyQt5.QtCore.PYQT_CONFIGURATION['sip_flags'],
+ 'pyqt_mod_dir': os.path.join(cfg.default_mod_dir, "PyQt5"),
+- 'pyqt_sip_dir': sip_dir,
++ 'pyqt_sip_dir': os.path.join(site.getsitepackages()[0], "PyQt5", "bindings"),
+ 'pyqt_bin_dir': cfg.default_bin_dir,
+ }
+ pyqtcfg = sipconfig.Configuration([cfg])
diff --git a/t2t-toc-level.patch b/t2t-toc-level.patch
new file mode 100644
index 00000000000..5fcf882c273
--- /dev/null
+++ b/t2t-toc-level.patch
@@ -0,0 +1,24 @@
+diff -ru orig/doc/INSTALL.t2t qgis-3.10.6/doc/INSTALL.t2t
+--- orig/doc/INSTALL.t2t 2020-06-18 15:24:50.000000000 +0200
++++ qgis-3.10.6/doc/INSTALL.t2t 2020-06-18 15:46:06.409978439 +0200
+@@ -4,7 +4,7 @@
+
+ %! target : html
+ %! style : style.css
+-%! Options : --toc --toc-level 2 --enum-title
++%! Options : --toc --enum-title
+ %! preproc : TUT_URL https://qgis.org
+ %! PostProc(html): '(?i)(<pre>)' '<div class="code">\1'
+ %! PostProc(html): '(?i)(</pre>)' '\1</div>'
+diff -ru orig/doc/news.t2t qgis-3.10.6/doc/news.t2t
+--- orig/doc/news.t2t 2020-06-18 15:24:50.000000000 +0200
++++ qgis-3.10.6/doc/news.t2t 2020-06-18 15:45:58.409978465 +0200
+@@ -4,7 +4,7 @@
+
+ %! target : html
+ %! style : style.css
+-%! Options : --toc --toc-level 1 --enum-title
++%! Options : --toc --enum-title
+ %! preproc : TUT_URL https://qgis.org
+ %! PostProc(html): '(?i)(<pre>)' '<div class="code">\1'
+ %! PostProc(html): '(?i)(</pre>)' '\1</div>'