Received: by mail.netbsd.org (Postfix, from userid 605) id D379184DF1; Sat, 20 Jun 2020 17:52:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5BD4D84DE1 for ; Sat, 20 Jun 2020 17:52:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id E0S-0qAy-4Lc for ; Sat, 20 Jun 2020 17:52:05 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 902D084D95 for ; Sat, 20 Jun 2020 17:52:05 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 89F87FB28; Sat, 20 Jun 2020 17:52:05 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_159267552531460" MIME-Version: 1.0 Date: Sat, 20 Jun 2020 17:52:05 +0000 From: "Greg Troxel" Subject: CVS commit: pkgsrc/geography/qgis To: pkgsrc-changes@NetBSD.org Reply-To: gdt@netbsd.org X-Mailer: log_accum Message-Id: <20200620175205.89F87FB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_159267552531460 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gdt Date: Sat Jun 20 17:52:05 UTC 2020 Modified Files: pkgsrc/geography/qgis: distinfo Added Files: pkgsrc/geography/qgis/patches: patch-src_core_dxf_qgsdxfpaintengine.h patch-src_core_geometry_qgscurve.h patch-src_core_symbology_qgssymbollayer.h patch-src_gui_qgsmapoverviewcanvas.cpp Log Message: geography/qgis: Cope with qt 5.15 (partial) Apply patches from upstream, basically about QPaint. (Still does not build, but this is progress.) To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 pkgsrc/geography/qgis/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/geography/qgis/patches/patch-src_core_dxf_qgsdxfpaintengine.h \ pkgsrc/geography/qgis/patches/patch-src_core_geometry_qgscurve.h \ pkgsrc/geography/qgis/patches/patch-src_core_symbology_qgssymbollayer.h \ pkgsrc/geography/qgis/patches/patch-src_gui_qgsmapoverviewcanvas.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_159267552531460 Content-Disposition: inline Content-Length: 4726 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/geography/qgis/distinfo diff -u pkgsrc/geography/qgis/distinfo:1.14 pkgsrc/geography/qgis/distinfo:1.15 --- pkgsrc/geography/qgis/distinfo:1.14 Tue Oct 29 19:30:11 2019 +++ pkgsrc/geography/qgis/distinfo Sat Jun 20 17:52:05 2020 @@ -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) = 2468c0 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 Added files: Index: pkgsrc/geography/qgis/patches/patch-src_core_dxf_qgsdxfpaintengine.h diff -u /dev/null pkgsrc/geography/qgis/patches/patch-src_core_dxf_qgsdxfpaintengine.h:1.1 --- /dev/null Sat Jun 20 17:52:05 2020 +++ pkgsrc/geography/qgis/patches/patch-src_core_dxf_qgsdxfpaintengine.h Sat Jun 20 17:52:05 2020 @@ -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 ++#include + #include "qgsabstractgeometry.h" + + class QgsPoint; Index: pkgsrc/geography/qgis/patches/patch-src_core_geometry_qgscurve.h diff -u /dev/null pkgsrc/geography/qgis/patches/patch-src_core_geometry_qgscurve.h:1.1 --- /dev/null Sat Jun 20 17:52:05 2020 +++ pkgsrc/geography/qgis/patches/patch-src_core_geometry_qgscurve.h Sat Jun 20 17:52:05 2020 @@ -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 + + class QgsLineString; +-class QPainterPath; + + /** + * \ingroup core Index: pkgsrc/geography/qgis/patches/patch-src_core_symbology_qgssymbollayer.h diff -u /dev/null pkgsrc/geography/qgis/patches/patch-src_core_symbology_qgssymbollayer.h:1.1 --- /dev/null Sat Jun 20 17:52:05 2020 +++ pkgsrc/geography/qgis/patches/patch-src_core_symbology_qgssymbollayer.h Sat Jun 20 17:52:05 2020 @@ -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 + #include + #include ++#include + + #include "qgssymbol.h" + #include "qgsfields.h" Index: pkgsrc/geography/qgis/patches/patch-src_gui_qgsmapoverviewcanvas.cpp diff -u /dev/null pkgsrc/geography/qgis/patches/patch-src_gui_qgsmapoverviewcanvas.cpp:1.1 --- /dev/null Sat Jun 20 17:52:05 2020 +++ pkgsrc/geography/qgis/patches/patch-src_gui_qgsmapoverviewcanvas.cpp Sat Jun 20 17:52:05 2020 @@ -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 ++#include + #include + #include + #include --_----------=_159267552531460--