diff options
author | gdt <gdt@pkgsrc.org> | 2020-06-20 17:52:05 +0000 |
---|---|---|
committer | gdt <gdt@pkgsrc.org> | 2020-06-20 17:52:05 +0000 |
commit | a7fb693b6ef30e613fd064f689cdc86ad43c1f42 (patch) | |
tree | 23148dfed5ca8a330e6a49f43d54d72f98ff0086 /geography | |
parent | f6de5a685680ef66603adeb737fe55e824ec05fe (diff) | |
download | pkgsrc-a7fb693b6ef30e613fd064f689cdc86ad43c1f42.tar.gz |
geography/qgis: Cope with qt 5.15 (partial)
Apply patches from upstream, basically about QPaint.
(Still does not build, but this is progress.)
Diffstat (limited to 'geography')
5 files changed, 72 insertions, 1 deletions
diff --git a/geography/qgis/distinfo b/geography/qgis/distinfo index 87c273d7e7a..186bc5d7cac 100644 --- a/geography/qgis/distinfo +++ b/geography/qgis/distinfo @@ -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_CMakeLists.txt) = 2468c0a629738ce78cccb784395eb1f41049cc73 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 --git a/geography/qgis/patches/patch-src_core_dxf_qgsdxfpaintengine.h b/geography/qgis/patches/patch-src_core_dxf_qgsdxfpaintengine.h new file mode 100644 index 00000000000..92fac6c08b4 --- /dev/null +++ b/geography/qgis/patches/patch-src_core_dxf_qgsdxfpaintengine.h @@ -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 --git a/geography/qgis/patches/patch-src_core_geometry_qgscurve.h b/geography/qgis/patches/patch-src_core_geometry_qgscurve.h new file mode 100644 index 00000000000..50755068723 --- /dev/null +++ b/geography/qgis/patches/patch-src_core_geometry_qgscurve.h @@ -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 --git a/geography/qgis/patches/patch-src_core_symbology_qgssymbollayer.h b/geography/qgis/patches/patch-src_core_symbology_qgssymbollayer.h new file mode 100644 index 00000000000..38aa1316115 --- /dev/null +++ b/geography/qgis/patches/patch-src_core_symbology_qgssymbollayer.h @@ -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 --git a/geography/qgis/patches/patch-src_gui_qgsmapoverviewcanvas.cpp b/geography/qgis/patches/patch-src_gui_qgsmapoverviewcanvas.cpp new file mode 100644 index 00000000000..b0169488147 --- /dev/null +++ b/geography/qgis/patches/patch-src_gui_qgsmapoverviewcanvas.cpp @@ -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> |