rpm/qgis
SHA256
1
0
Fork 0
forked from pool/qgis
Code Pull Requests Activity

add patch for QT 5.13

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=251
This commit is contained in:
Dirk Stoecker 2019-07-03 11:56:46 +00:00 committed by Git OBS Bridge
parent 45f7a9400f
commit 94761c2950
3 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ef8f06330f57882f740cfe7f8f3659b54b1bb1fb.patch Normal file
View File

@ -0,0 +1,22 @@
From ef8f06330f57882f740cfe7f8f3659b54b1bb1fb Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@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"

5
qgis.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jul 3 11:48:45 UTC 2019 - Dirk Stoecker <opensuse@dstoecker.de>
- add ef8f06330f57882f740cfe7f8f3659b54b1bb1fb.patch to build qith QT >5.13
-------------------------------------------------------------------
Sat Apr 6 20:00:18 UTC 2019 - Bruno Friedmann <bruno@ioda-net.ch>

3
qgis.spec
View File

@ -29,6 +29,8 @@ Source2: %{name}.rpmlintrc
Source3: qgis_sample_data.zip
# Headers in Qt5.11 were cleaned up to no longer include unneeded other headers.
Patch0: fix_grass_qt511.patch
# PATCH-FIX-UPSTREAM Missing include https://github.com/qgis/QGIS/issues/30316
Patch1: ef8f06330f57882f740cfe7f8f3659b54b1bb1fb.patch
BuildRequires: -post-build-checks
BuildRequires: FastCGI-devel
BuildRequires: bison >= 2.4
@ -178,6 +180,7 @@ QGIS sample data with free raster, vector, gps files and a GRASS location from A
%prep
%setup -q
%patch0 -p1
%patch1 -p1
# Remove bad env and python version in grass plugin
sed -i 's,^#!%{_bindir}/env python$,#!%{_bindir}/python3,g' src/plugins/grass/scripts/*.py
sed -i 's,^#!%{_bindir}/env python3$,#!%{_bindir}/python3,g' src/plugins/grass/scripts/*.py