From b74e7fa0aff26c4bcd63bbf014f2e4322b3261ece01e8abec95140782eb8c3bd Mon Sep 17 00:00:00 2001 From: Nicolas Rochard Date: Tue, 23 Jun 2020 13:26:04 +0000 Subject: [PATCH] Accepting request 816567 from home:Guillaume_G:branches:Application:Geo - Update to 3.14.0, changes are documented at https://changelog.qgis.org/en/qgis/version/3.14/ - Drop upstream patch: * qgis-qt5.15.patch OBS-URL: https://build.opensuse.org/request/show/816567 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=304 --- qgis-3.12.3.tar.bz2 | 3 -- qgis-3.12.3.tar.bz2.sha256 | 1 - qgis-3.14.0.tar.bz2 | 3 ++ qgis-3.14.0.tar.bz2.sha256 | 1 + qgis-qt5.15.patch | 63 -------------------------------------- qgis.changes | 8 +++++ qgis.spec | 5 ++- 7 files changed, 14 insertions(+), 70 deletions(-) delete mode 100644 qgis-3.12.3.tar.bz2 delete mode 100644 qgis-3.12.3.tar.bz2.sha256 create mode 100644 qgis-3.14.0.tar.bz2 create mode 100644 qgis-3.14.0.tar.bz2.sha256 delete mode 100644 qgis-qt5.15.patch diff --git a/qgis-3.12.3.tar.bz2 b/qgis-3.12.3.tar.bz2 deleted file mode 100644 index 04b8e04..0000000 --- a/qgis-3.12.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c2b53815f9b994e1662995d1f25f90628156b996758f5471bffb74ab29a95220 -size 110284377 diff --git a/qgis-3.12.3.tar.bz2.sha256 b/qgis-3.12.3.tar.bz2.sha256 deleted file mode 100644 index 086ce91..0000000 --- a/qgis-3.12.3.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -c2b53815f9b994e1662995d1f25f90628156b996758f5471bffb74ab29a95220 qgis-3.12.3.tar.bz2 diff --git a/qgis-3.14.0.tar.bz2 b/qgis-3.14.0.tar.bz2 new file mode 100644 index 0000000..6b67c81 --- /dev/null +++ b/qgis-3.14.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b76c5278def0c447c3d354149a2afe2562ac26cf0bcbe69b9e0528356d407b8 +size 108823469 diff --git a/qgis-3.14.0.tar.bz2.sha256 b/qgis-3.14.0.tar.bz2.sha256 new file mode 100644 index 0000000..fe09efd --- /dev/null +++ b/qgis-3.14.0.tar.bz2.sha256 @@ -0,0 +1 @@ +1b76c5278def0c447c3d354149a2afe2562ac26cf0bcbe69b9e0528356d407b8 qgis-3.14.0.tar.bz2 diff --git a/qgis-qt5.15.patch b/qgis-qt5.15.patch deleted file mode 100644 index d62b643..0000000 --- a/qgis-qt5.15.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 31f586eca3b21ece95a55ba7b0a66526cb92ff12 Mon Sep 17 00:00:00 2001 -From: lbartoletti -Date: Sun, 31 May 2020 09:55:45 +0200 -Subject: [PATCH] Prepare for Qt5.15. Add QPainterPath include - ---- - src/core/dxf/qgsdxfpaintengine.h | 1 + - src/core/geometry/qgscurve.h | 2 +- - src/core/symbology/qgssymbollayer.h | 1 + - src/gui/qgsmapoverviewcanvas.cpp | 1 + - 4 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/core/dxf/qgsdxfpaintengine.h b/src/core/dxf/qgsdxfpaintengine.h -index 49b2279c4471..103a1b910f97 100644 ---- a/src/core/dxf/qgsdxfpaintengine.h -+++ b/src/core/dxf/qgsdxfpaintengine.h -@@ -22,6 +22,7 @@ - - #include "qgis_core.h" - #include -+#include - #include "qgsabstractgeometry.h" - - class QgsPoint; -diff --git a/src/core/geometry/qgscurve.h b/src/core/geometry/qgscurve.h -index 4c1dcf393fbd..a936655242ca 100644 ---- a/src/core/geometry/qgscurve.h -+++ b/src/core/geometry/qgscurve.h -@@ -22,9 +22,9 @@ - #include "qgis_sip.h" - #include "qgsabstractgeometry.h" - #include "qgsrectangle.h" -+#include - - class QgsLineString; --class QPainterPath; - - /** - * \ingroup core -diff --git a/src/core/symbology/qgssymbollayer.h b/src/core/symbology/qgssymbollayer.h -index cf140e4382d4..725a08062d70 100644 ---- a/src/core/symbology/qgssymbollayer.h -+++ b/src/core/symbology/qgssymbollayer.h -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - #include "qgssymbol.h" - #include "qgsfields.h" -diff --git a/src/gui/qgsmapoverviewcanvas.cpp b/src/gui/qgsmapoverviewcanvas.cpp -index 66f063c5cb2e..e72c6570d8cd 100644 ---- a/src/gui/qgsmapoverviewcanvas.cpp -+++ b/src/gui/qgsmapoverviewcanvas.cpp -@@ -24,6 +24,7 @@ - #include "qgsmaptopixel.h" - - #include -+#include - #include - #include - #include diff --git a/qgis.changes b/qgis.changes index 8c581cc..429422e 100644 --- a/qgis.changes +++ b/qgis.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jun 23 08:10:59 UTC 2020 - Guillaume GARDET + +- Update to 3.14.0, changes are documented at + https://changelog.qgis.org/en/qgis/version/3.14/ +- Drop upstream patch: + * qgis-qt5.15.patch + ------------------------------------------------------------------- Fri Jun 12 06:34:58 UTC 2020 - Guillaume GARDET diff --git a/qgis.spec b/qgis.spec index db4602c..5d03a6f 100644 --- a/qgis.spec +++ b/qgis.spec @@ -18,7 +18,7 @@ %bcond_without grass Name: qgis -Version: 3.12.3 +Version: 3.14.0 Release: 0 Summary: A Geographic Information System (GIS) License: GPL-2.0-only @@ -28,8 +28,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 -# PATCH-FIX-UPSTREAM - Commit 31f586ec -Patch1: qgis-qt5.15.patch BuildRequires: FastCGI-devel BuildRequires: bison >= 2.4 BuildRequires: cmake >= 3.0.0 @@ -50,6 +48,7 @@ BuildRequires: ocl-icd-devel BuildRequires: opencl-cpp-headers BuildRequires: pkgconfig BuildRequires: poppler-tools +BuildRequires: protobuf-devel BuildRequires: python-qscintilla-qt5-sip BuildRequires: python3-GDAL BuildRequires: python3-Jinja2