Hello community, here is the log from the commit of package qgis for openSUSE:Factory checked in at 2020-06-10 00:47:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qgis (Old) and /work/SRC/openSUSE:Factory/.qgis.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qgis" Wed Jun 10 00:47:38 2020 rev:13 rq:812702 version:3.12.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qgis/qgis.changes 2020-05-02 22:16:20.564411022 +0200 +++ /work/SRC/openSUSE:Factory/.qgis.new.3606/qgis.changes 2020-06-10 00:47:45.906842791 +0200 @@ -1,0 +2,11 @@ +Mon Jun 8 15:39:20 UTC 2020 - Guillaume GARDET <[email protected]> + +- Update to 3.12.3 (bugfix) + +------------------------------------------------------------------- +Mon Jun 8 15:38:09 UTC 2020 - Guillaume GARDET <[email protected]> + +- Backport patch for qt 5.15: + * qgis-qt5.15.patch + +------------------------------------------------------------------- Old: ---- qgis-3.12.2.tar.bz2 qgis-3.12.2.tar.bz2.sha256 New: ---- qgis-3.12.3.tar.bz2 qgis-3.12.3.tar.bz2.sha256 qgis-qt5.15.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qgis.spec ++++++ --- /var/tmp/diff_new_pack.HwxGK1/_old 2020-06-10 00:47:47.642847332 +0200 +++ /var/tmp/diff_new_pack.HwxGK1/_new 2020-06-10 00:47:47.646847343 +0200 @@ -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 @@ 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 ++++++ qgis-3.12.2.tar.bz2 -> qgis-3.12.3.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/qgis/qgis-3.12.2.tar.bz2 /work/SRC/openSUSE:Factory/.qgis.new.3606/qgis-3.12.3.tar.bz2 differ: char 11, line 1 ++++++ qgis-3.12.2.tar.bz2.sha256 -> qgis-3.12.3.tar.bz2.sha256 ++++++ --- /work/SRC/openSUSE:Factory/qgis/qgis-3.12.2.tar.bz2.sha256 2020-05-02 22:16:20.524410938 +0200 +++ /work/SRC/openSUSE:Factory/.qgis.new.3606/qgis-3.12.3.tar.bz2.sha256 2020-06-10 00:47:45.798842508 +0200 @@ -1 +1 @@ -501f81715672205afd2c1a289ffc765aff96eaa8ecb49d079a58ef4d907467b8 qgis-3.12.2.tar.bz2 +c2b53815f9b994e1662995d1f25f90628156b996758f5471bffb74ab29a95220 qgis-3.12.3.tar.bz2 ++++++ qgis-qt5.15.patch ++++++ >From 31f586eca3b21ece95a55ba7b0a66526cb92ff12 Mon Sep 17 00:00:00 2001 From: lbartoletti <[email protected]> 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 <QPaintEngine> +#include <QPainterPath> #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 <QPainterPath> 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 <QSet> #include <QDomDocument> #include <QDomElement> +#include <QPainterPath> #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 <QPainter> +#include <QPainterPath> #include <QPaintEvent> #include <QResizeEvent> #include <QMouseEvent>
