[pkgsrc/trunk]: pkgsrc/geography/qgis geography/qgis: Cope with qt 5.15 (part...

[gdt <gdt%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/63d3a55070d4
branches:  trunk
changeset: 434702:63d3a55070d4
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Sat Jun 20 17:52:05 2020 +0000

description:
geography/qgis: Cope with qt 5.15 (partial)

Apply patches from upstream, basically about QPaint.

(Still does not build, but this is progress.)

diffstat:

 geography/qgis/distinfo                                          |   6 ++-
 geography/qgis/patches/patch-src_core_dxf_qgsdxfpaintengine.h    |  16 ++++++++
 geography/qgis/patches/patch-src_core_geometry_qgscurve.h        |  19 ++++++++++
 geography/qgis/patches/patch-src_core_symbology_qgssymbollayer.h |  16 ++++++++
 geography/qgis/patches/patch-src_gui_qgsmapoverviewcanvas.cpp    |  16 ++++++++
 5 files changed, 72 insertions(+), 1 deletions(-)

diffs (102 lines):

diff -r fc20fff9342e -r 63d3a55070d4 geography/qgis/distinfo
--- a/geography/qgis/distinfo   Sat Jun 20 17:48:15 2020 +0000
+++ b/geography/qgis/distinfo   Sat Jun 20 17:52:05 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2019/10/29 19:30:11 bouyer Exp $
+$NetBSD: distinfo,v 1.15 2020/06/20 17:52:05 gdt Exp $
 
 SHA1 (qgis-3.8.3.tar.bz2) = 4ac18e9818e86433901158185e2c807cf418a043
 RMD160 (qgis-3.8.3.tar.bz2) = dd90e89d522924cedb5152826eae426ad7aa1754
@@ -9,5 +9,9 @@
 SHA1 (patch-mac_cmake_1qt.cmake.in) = d74f7201849ef6dd83f39251e466eb04c791c0e6
 SHA1 (patch-src_analysis_interpolation_qgsinterpolator.h) = 13e48b38dbe2c2e3a134da7d551a81067ffe25bd
 SHA1 (patch-src_core_CMakeLists.txt) = f476770fcb488385723def8aecaa8146de18d624
+SHA1 (patch-src_core_dxf_qgsdxfpaintengine.h) = 1c574fa457bb9fbbf3fc5421dd806875a883c518
+SHA1 (patch-src_core_geometry_qgscurve.h) = 890b19e0821ac63de53e348ad43ee7b080b9c361
 SHA1 (patch-src_core_qgsapplication.cpp) = 9300b9af85281c1b766560e72e52658930f50a12
+SHA1 (patch-src_core_symbology_qgssymbollayer.h) = f79e02a6b5440f802ef41126004f8fee92f4f28a
 SHA1 (patch-src_crssync_CMakeLists.txt) = 49b551cd2231704dac0872b7c8893b5bdda3e0ad
+SHA1 (patch-src_gui_qgsmapoverviewcanvas.cpp) = c0caaae20b12d9363addb1117c9ae1e788e246a9
diff -r fc20fff9342e -r 63d3a55070d4 geography/qgis/patches/patch-src_core_dxf_qgsdxfpaintengine.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/geography/qgis/patches/patch-src_core_dxf_qgsdxfpaintengine.h     Sat Jun 20 17:52:05 2020 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_core_dxf_qgsdxfpaintengine.h,v 1.1 2020/06/20 17:52:05 gdt Exp $
+
+Deal with QT 5.15, from upstream.
+https://github.com/qgis/QGIS/issues/37005
+https://github.com/qgis/QGIS/commit/31f586ec.patch
+
+--- src/core/dxf/qgsdxfpaintengine.h.orig      2019-09-13 12:11:09.000000000 +0000
++++ src/core/dxf/qgsdxfpaintengine.h
+@@ -22,6 +22,7 @@
+ 
+ #include "qgis_core.h"
+ #include <QPaintEngine>
++#include <QPainterPath>
+ #include "qgsabstractgeometry.h"
+ 
+ class QgsPoint;
diff -r fc20fff9342e -r 63d3a55070d4 geography/qgis/patches/patch-src_core_geometry_qgscurve.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/geography/qgis/patches/patch-src_core_geometry_qgscurve.h Sat Jun 20 17:52:05 2020 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_core_geometry_qgscurve.h,v 1.1 2020/06/20 17:52:05 gdt Exp $
+
+Deal with QT 5.15, from upstream.
+https://github.com/qgis/QGIS/issues/37005
+https://github.com/qgis/QGIS/commit/31f586ec.patch
+
+--- src/core/geometry/qgscurve.h.orig  2019-09-13 12:11:09.000000000 +0000
++++ 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 -r fc20fff9342e -r 63d3a55070d4 geography/qgis/patches/patch-src_core_symbology_qgssymbollayer.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/geography/qgis/patches/patch-src_core_symbology_qgssymbollayer.h  Sat Jun 20 17:52:05 2020 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_core_symbology_qgssymbollayer.h,v 1.1 2020/06/20 17:52:05 gdt Exp $
+
+Deal with QT 5.15, from upstream.
+https://github.com/qgis/QGIS/issues/37005
+https://github.com/qgis/QGIS/commit/31f586ec.patch
+
+--- src/core/symbology/qgssymbollayer.h.orig   2019-09-13 12:11:09.000000000 +0000
++++ src/core/symbology/qgssymbollayer.h
+@@ -26,6 +26,7 @@
+ #include <QSet>
+ #include <QDomDocument>
+ #include <QDomElement>
++#include <QPainterPath>
+ 
+ #include "qgssymbol.h"
+ #include "qgsfields.h"
diff -r fc20fff9342e -r 63d3a55070d4 geography/qgis/patches/patch-src_gui_qgsmapoverviewcanvas.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/geography/qgis/patches/patch-src_gui_qgsmapoverviewcanvas.cpp     Sat Jun 20 17:52:05 2020 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_gui_qgsmapoverviewcanvas.cpp,v 1.1 2020/06/20 17:52:05 gdt Exp $
+
+Deal with QT 5.15, from upstream.
+https://github.com/qgis/QGIS/issues/37005
+https://github.com/qgis/QGIS/commit/31f586ec.patch
+
+--- src/gui/qgsmapoverviewcanvas.cpp.orig      2019-09-13 12:11:09.000000000 +0000
++++ src/gui/qgsmapoverviewcanvas.cpp
+@@ -24,6 +24,7 @@
+ #include "qgsmaptopixel.h"
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPaintEvent>
+ #include <QResizeEvent>
+ #include <QMouseEvent>