diff --git a/qgis-3.12.2.tar.bz2 b/qgis-3.12.2.tar.bz2 deleted file mode 100644 index b1914c9..0000000 --- a/qgis-3.12.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:501f81715672205afd2c1a289ffc765aff96eaa8ecb49d079a58ef4d907467b8 -size 109719614 diff --git a/qgis-3.12.2.tar.bz2.sha256 b/qgis-3.12.2.tar.bz2.sha256 deleted file mode 100644 index dfacafe..0000000 --- a/qgis-3.12.2.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -501f81715672205afd2c1a289ffc765aff96eaa8ecb49d079a58ef4d907467b8 qgis-3.12.2.tar.bz2 diff --git a/qgis-3.12.3.tar.bz2 b/qgis-3.12.3.tar.bz2 new file mode 100644 index 0000000..04b8e04 --- /dev/null +++ b/qgis-3.12.3.tar.bz2 @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..086ce91 --- /dev/null +++ b/qgis-3.12.3.tar.bz2.sha256 @@ -0,0 +1 @@ +c2b53815f9b994e1662995d1f25f90628156b996758f5471bffb74ab29a95220 qgis-3.12.3.tar.bz2 diff --git a/qgis-qt5.15.patch b/qgis-qt5.15.patch new file mode 100644 index 0000000..d62b643 --- /dev/null +++ b/qgis-qt5.15.patch @@ -0,0 +1,63 @@ +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 64f0280..775afb4 100644 --- a/qgis.changes +++ b/qgis.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Jun 8 15:39:20 UTC 2020 - Guillaume GARDET + +- Update to 3.12.3 (bugfix) + +------------------------------------------------------------------- +Mon Jun 8 15:38:09 UTC 2020 - Guillaume GARDET + +- Backport patch for qt 5.15: + * qgis-qt5.15.patch + ------------------------------------------------------------------- Mon Apr 27 17:52:35 UTC 2020 - Nicolas Rochard diff --git a/qgis.spec b/qgis.spec index bc3e242..a52226a 100644 --- a/qgis.spec +++ b/qgis.spec @@ -18,7 +18,7 @@ %bcond_without grass Name: qgis -Version: 3.12.2 +Version: 3.12.3 Release: 0 Summary: A Geographic Information System (GIS) License: GPL-2.0-only @@ -28,6 +28,8 @@ 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