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

[Antonio Rojas]

    Date: Friday, November 29, 2019 @ 19:59:19
  Author: arojas
Revision: 534530

Update to 3.10.0

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

---------------+
 PKGBUILD      |   13 ++++++-------
 qt-5.13.patch |   22 ----------------------
 2 files changed, 6 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-29 19:56:02 UTC (rev 534529)
+++ PKGBUILD	2019-11-29 19:59:19 UTC (rev 534530)
@@ -9,8 +9,8 @@
 # Contributor: Eric Forgeot < http://esclinux.tk >
 
 pkgname=qgis
-pkgver=3.8.3
-pkgrel=2
+pkgver=3.10.0
+pkgrel=1
 pkgdesc='Geographic Information System (GIS) that supports vector, raster & database formats'
 url='https://qgis.org/'
 license=(GPL)
@@ -29,16 +29,15 @@
             'python-numpy: Processing plugin'
             'python-yaml: Processing plugin')
 source=("https://qgis.org/downloads/$pkgname-$pkgver.tar.bz2"
-        qt-5.13.patch)
-sha256sums=('3cca3e8483bc158cb8e972eb819a55a5734ba70f2c7da28ebc485864aafb17bd'
-            '2798a8c2d2dfbe18e05a4c44611291d9688dddac3e000dc95f4c8893e0fbfe93')
+         qgis-fix-dependency.patch::"https://github.com/qgis/QGIS/commit/319ee306.patch")
+sha256sums=('25eb1c41d9fb922ffa337a720dfdceee43cf2d38409923f087c2010c9742f012'
+            '92f255dfa0eba785dbf278fe87c08468b0546b4fe330a720596b883f0bb82b3f')
 
 prepare() {
   [[ -d build ]] || mkdir build
 
   cd $pkgname-$pkgver
-  # Fix build with Qt 5.13
-  patch -Np1 -i ../qt-5.13.patch
+  patch -p1 -i ../qgis-fix-dependency.patch # Fix race
 }
 
 build() {

Deleted: qt-5.13.patch
===================================================================
--- qt-5.13.patch	2019-11-29 19:56:02 UTC (rev 534529)
+++ qt-5.13.patch	2019-11-29 19:59:19 UTC (rev 534530)
@@ -1,22 +0,0 @@
-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"
-