[arch-commits] Commit in qgis/trunk (PKGBUILD qt-5.13.patch)

[Balló György]

    Date: Saturday, June 22, 2019 @ 11:06:00
  Author: bgyorgy
Revision: 482762

upgpkg: qgis 3.8.0-1

Update to new version

Added:
  qgis/trunk/qt-5.13.patch
Modified:
  qgis/trunk/PKGBUILD

---------------+
 PKGBUILD      |   14 ++++++++++----
 qt-5.13.patch |   22 ++++++++++++++++++++++
 2 files changed, 32 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-22 10:53:00 UTC (rev 482761)
+++ PKGBUILD	2019-06-22 11:06:00 UTC (rev 482762)
@@ -9,8 +9,8 @@
 # Contributor: Eric Forgeot < http://esclinux.tk >
 
 pkgname=qgis
-pkgver=3.6.3
-pkgrel=2
+pkgver=3.8.0
+pkgrel=1
 pkgdesc='Geographic Information System (GIS) that supports vector, raster & database formats'
 url='https://qgis.org/'
 license=(GPL)
@@ -28,11 +28,17 @@
             'python-pygments: MetaSearch plugin'
             'python-numpy: Processing plugin'
             'python-yaml: Processing plugin')
-source=("https://qgis.org/downloads/$pkgname-$pkgver.tar.bz2")
-sha256sums=('b77790b47d978035e24d4652c5ad4227ae68205c056db54fa0fd2da6bf6f7b7d')
+source=("https://qgis.org/downloads/$pkgname-$pkgver.tar.bz2"
+        qt-5.13.patch)
+sha256sums=('a28ff8cec27e1160ddfd331bc58f190f4dd581222a51b32eece7cd7ca8b8fc03'
+            '2798a8c2d2dfbe18e05a4c44611291d9688dddac3e000dc95f4c8893e0fbfe93')
 
 prepare() {
   [[ -d build ]] || mkdir build
+
+  cd $pkgname-$pkgver
+  # Fix build with Qt 5.13
+  patch -Np1 -i ../qt-5.13.patch
 }
 
 build() {

Added: qt-5.13.patch
===================================================================
--- qt-5.13.patch	                        (rev 0)
+++ qt-5.13.patch	2019-06-22 11:06:00 UTC (rev 482762)
@@ -0,0 +1,22 @@
+From ef8f06330f57882f740cfe7f8f3659b54b1bb1fb Mon Sep 17 00:00:00 2001
+From: Matthias Kuhn <matthias at opengis.ch>
+Date: Sat, 22 Jun 2019 10:11:31 +0200
+Subject: [PATCH] Add missing include
+
+Fix https://github.com/qgis/QGIS/issues/30316
+---
+ src/analysis/interpolation/qgsinterpolator.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/analysis/interpolation/qgsinterpolator.h b/src/analysis/interpolation/qgsinterpolator.h
+index 35343ccdf7f..5d694418299 100644
+--- a/src/analysis/interpolation/qgsinterpolator.h
++++ b/src/analysis/interpolation/qgsinterpolator.h
+@@ -19,6 +19,7 @@
+ #define QGSINTERPOLATOR_H
+ 
+ #include <QVector>
++#include <QList>
+ #include "qgis_sip.h"
+ #include "qgis_analysis.h"
+