From 4a1e4a0bdc41b8c9fed876987c2ff4b260c4f3cab9435680faf45a268d27a1c2 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Thu, 14 Nov 2019 18:25:57 +0000 Subject: [PATCH] drop obsolete patch OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=279 --- fix_grass_qt511.patch | 22 ---------------------- qgis.changes | 5 +++++ qgis.spec | 5 +---- 3 files changed, 6 insertions(+), 26 deletions(-) delete mode 100644 fix_grass_qt511.patch diff --git a/fix_grass_qt511.patch b/fix_grass_qt511.patch deleted file mode 100644 index 0d0a259..0000000 --- a/fix_grass_qt511.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -rup a/src/plugins/grass/qgsgrassmoduleinput.h b/src/plugins/grass/qgsgrassmoduleinput.h ---- a/src/plugins/grass/qgsgrassmoduleinput.h 2018-05-27 14:42:00.818046215 +0200 -+++ b/src/plugins/grass/qgsgrassmoduleinput.h 2018-06-10 17:25:28.632016481 +0200 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff -rup a/src/plugins/grass/qgsgrassregion.h b/src/plugins/grass/qgsgrassregion.h ---- a/src/plugins/grass/qgsgrassregion.h 2018-05-27 14:42:00.822046231 +0200 -+++ b/src/plugins/grass/qgsgrassregion.h 2018-06-10 18:13:31.935308056 +0200 -@@ -16,6 +16,7 @@ - #ifndef QGSGRASSREGION_H - #define QGSGRASSREGION_H - -+#include - #include "ui_qgsgrassregionbase.h" - #include "qgscoordinatereferencesystem.h" - #include "qgscoordinatetransform.h" diff --git a/qgis.changes b/qgis.changes index b570715..da5fe2d 100644 --- a/qgis.changes +++ b/qgis.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 14 17:19:11 UTC 2019 - Dirk Stoecker + +- drop obsolete patch fix_grass_qt511.patch + ------------------------------------------------------------------- Wed Nov 13 11:59:22 UTC 2019 - Libor Pechacek diff --git a/qgis.spec b/qgis.spec index 98ae5e3..43d7524 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,7 +1,7 @@ # # spec file for package qgis # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,8 +30,6 @@ Source: https://qgis.org/downloads/%{name}-%{version}.tar.bz2 Source1: https://qgis.org/downloads/%{name}-%{version}.tar.bz2.sha256 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 fix randomness in desktop file translations Patch2: qgis-3.8.3-reproducible.patch Patch3: a07d915d7bf9c7c54b2047f8819ba2aae6669f35.patch @@ -186,7 +184,6 @@ QGIS sample data with raster, vector, gps files and a GRASS location from the Al %prep %setup -q -%patch0 -p1 %patch2 -p1 %patch3 -p1 # Remove bad env and python version in grass plugin