pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

qgis: Update along master



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Sun Feb 22 08:12:17 2026 -0500
Changeset:	08ba071ca0709745f8211cf5306e7383265d5c8c

Modified Files:
	qgis/Makefile
	qgis/distinfo
Removed Files:
	qgis/patches/patch-tests_src_core_geometry_testqgsgeometrycollection.cpp
	qgis/patches/patch-tests_src_core_geometry_testqgslinestring.cpp
	qgis/patches/patch-tests_src_core_geometry_testqgspoint.cpp
	qgis/patches/patch-tests_src_core_geometry_testqgspolygon.cpp

Log Message:
qgis: Update along master

gcc12 accomodations (c++20 is just too complicated!) have been merged
upstream and hence gc'd here.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=08ba071ca0709745f8211cf5306e7383265d5c8c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 qgis/Makefile                                             |  4 ++--
 qgis/distinfo                                             | 10 +++-------
 ...-tests_src_core_geometry_testqgsgeometrycollection.cpp | 15 ---------------
 .../patch-tests_src_core_geometry_testqgslinestring.cpp   | 15 ---------------
 .../patch-tests_src_core_geometry_testqgspoint.cpp        | 15 ---------------
 .../patch-tests_src_core_geometry_testqgspolygon.cpp      | 15 ---------------
 6 files changed, 5 insertions(+), 69 deletions(-)

diffs:
diff --git a/qgis/Makefile b/qgis/Makefile
index 2190921aa8..c4b7c1f046 100644
--- a/qgis/Makefile
+++ b/qgis/Makefile
@@ -1,12 +1,12 @@
 # $NetBSD: Makefile,v 1.267 2026/02/06 10:04:56 wiz Exp $
 
 # This package tracks what ought to be a/b/rc of 4.0.
-DISTNAME=	qgis-3.99.2
+DISTNAME=	qgis-3.99.3
 CATEGORIES=	geography
 #MASTER_SITES=	https://qgis.org/downloads/
 MASTER_SITES=	${MASTER_SITE_GITHUB:=qgis/}
 GITHUB_PROJECT=	QGIS
-GITHUB_TAG=	3d3f7187fef84dcd1b79aa837ccd8b32cf62073f
+GITHUB_TAG=	7d2ca374f2db34eef5b433d9dbf46ae894ada937
 DIST_SUBDIR=	qgis-snapshot
 
 MAINTAINER=	gdt%NetBSD.org@localhost
diff --git a/qgis/distinfo b/qgis/distinfo
index 32f2c487f0..03b1580280 100644
--- a/qgis/distinfo
+++ b/qgis/distinfo
@@ -1,12 +1,8 @@
 $NetBSD: distinfo,v 1.87 2026/02/02 10:54:45 gdt Exp $
 
-BLAKE2s (qgis-snapshot/qgis-3.99.2-3d3f7187fef84dcd1b79aa837ccd8b32cf62073f.tar.gz) = 8cdf1503a014f14de5cd884541ee6856eae702f006aeceecdbc58084160a5815
-SHA512 (qgis-snapshot/qgis-3.99.2-3d3f7187fef84dcd1b79aa837ccd8b32cf62073f.tar.gz) = a32d12083708d4b6bc1bc8162c2b58cf2b7d8e5d718749d2f5e84ebd4eadae1a13dda2fd662935e487e672db54fa4cc56ef08afaf988f1dc9a885e74018d3848
-Size (qgis-snapshot/qgis-3.99.2-3d3f7187fef84dcd1b79aa837ccd8b32cf62073f.tar.gz) = 232034760 bytes
+BLAKE2s (qgis-snapshot/qgis-3.99.3-7d2ca374f2db34eef5b433d9dbf46ae894ada937.tar.gz) = 0dccbfd81bfc42247d0a1be730e9364075018e90288065095529cddcef74beed
+SHA512 (qgis-snapshot/qgis-3.99.3-7d2ca374f2db34eef5b433d9dbf46ae894ada937.tar.gz) = eab8ae0291242bb178a2a2af265f6cce603dbb0103a0aab8805f50cf4ab36696d1ff39f0ec9ebb433bb2c155b78b0a8b9722d957bcff0fee8fdbcaf13c7eb94c
+Size (qgis-snapshot/qgis-3.99.3-7d2ca374f2db34eef5b433d9dbf46ae894ada937.tar.gz) = 232040665 bytes
 SHA1 (patch-cmake_FindQwt.cmake) = 245463bc44fb4f2cb4aa61a8b86931e95e4ac820
 SHA1 (patch-external_nmea_tok.c) = 94b9ce398787170250fc5fbd8835d7d7fa1cd013
 SHA1 (patch-src_crssync_CMakeLists.txt) = 7269ba6dce3ca41f5d63d36ffc02ffc6d0cea5d8
-SHA1 (patch-tests_src_core_geometry_testqgsgeometrycollection.cpp) = 11d961ffddd3e2a8a0da84371b442bb7f5ed549d
-SHA1 (patch-tests_src_core_geometry_testqgslinestring.cpp) = 90fda0ff44dab94f9d59063cfc2f08c6f57d7b25
-SHA1 (patch-tests_src_core_geometry_testqgspoint.cpp) = 3cc41eb72ba1c75558d8dd2d1d04e79c9a1f54a4
-SHA1 (patch-tests_src_core_geometry_testqgspolygon.cpp) = 56dd2af308a0596691542fe2239bf5e912b3e996
diff --git a/qgis/patches/patch-tests_src_core_geometry_testqgsgeometrycollection.cpp b/qgis/patches/patch-tests_src_core_geometry_testqgsgeometrycollection.cpp
deleted file mode 100644
index 1be4896a74..0000000000
--- a/qgis/patches/patch-tests_src_core_geometry_testqgsgeometrycollection.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
---- tests/src/core/geometry/testqgsgeometrycollection.cpp.orig	2026-02-18 09:05:44.000000000 +0000
-+++ tests/src/core/geometry/testqgsgeometrycollection.cpp
-@@ -195,8 +195,10 @@ void TestQgsGeometryCollection::geometry
-   QVERIFY( !( emptyCollection == c11 ) );
-   QVERIFY( emptyCollection != c11 );
-   QgsPoint notCollection;
-+#if 0
-   QVERIFY( !( emptyCollection == notCollection ) );
-   QVERIFY( emptyCollection != notCollection );
-+#endif
-   QgsMultiPoint mp;
-   QgsMultiLineString ml;
-   QVERIFY( mp != ml );
diff --git a/qgis/patches/patch-tests_src_core_geometry_testqgslinestring.cpp b/qgis/patches/patch-tests_src_core_geometry_testqgslinestring.cpp
deleted file mode 100644
index ade34eb9b5..0000000000
--- a/qgis/patches/patch-tests_src_core_geometry_testqgslinestring.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
---- tests/src/core/geometry/testqgslinestring.cpp.orig	2026-02-18 09:05:44.000000000 +0000
-+++ tests/src/core/geometry/testqgslinestring.cpp
-@@ -953,8 +953,10 @@ void TestQgsLineString::equality()
-   QVERIFY( ls6 != QgsCircularString() );
- 
-   QgsPoint p1;
-+#if 0
-   QVERIFY( !( ls6 == p1 ) );
-   QVERIFY( ls6 != p1 );
-+#endif
-   QVERIFY( ls6 == ls6 );
- }
- 
diff --git a/qgis/patches/patch-tests_src_core_geometry_testqgspoint.cpp b/qgis/patches/patch-tests_src_core_geometry_testqgspoint.cpp
deleted file mode 100644
index ff7dbdebc4..0000000000
--- a/qgis/patches/patch-tests_src_core_geometry_testqgspoint.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
---- tests/src/core/geometry/testqgspoint.cpp.orig	2026-02-18 09:05:44.000000000 +0000
-+++ tests/src/core/geometry/testqgspoint.cpp
-@@ -373,8 +373,10 @@ void TestQgsPoint::equality()
-   QVERIFY( QgsPoint( Qgis::WkbType::Point, 2 / 3.0, 1 / 3.0 ) != QgsPoint( Qgis::WkbType::PointZ, 2 / 3.0, 1 / 3.0 ) );
- 
-   QgsLineString ls;
-+#if 0
-   QVERIFY( pt1 != ls );
-   QVERIFY( !( pt1 == ls ) );
-+#endif
- }
- 
- void TestQgsPoint::operators()
diff --git a/qgis/patches/patch-tests_src_core_geometry_testqgspolygon.cpp b/qgis/patches/patch-tests_src_core_geometry_testqgspolygon.cpp
deleted file mode 100644
index 114215d592..0000000000
--- a/qgis/patches/patch-tests_src_core_geometry_testqgspolygon.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
---- tests/src/core/geometry/testqgspolygon.cpp.orig	2026-02-18 09:05:44.000000000 +0000
-+++ tests/src/core/geometry/testqgspolygon.cpp
-@@ -267,8 +267,10 @@ void TestQgsPolygon::equality()
-   QVERIFY( !( pl1 != pl2 ) );
- 
-   QgsLineString ls;
-+#if 0
-   QVERIFY( pl1 != ls );
-   QVERIFY( !( pl1 == ls ) );
-+#endif
- }
- 
- void TestQgsPolygon::clone()


Home | Main Index | Thread Index | Old Index