pkgsrc-WIP-changes archive

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

qgis: Adjust patch comments



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Mon May 13 13:14:17 2024 -0400
Changeset:	ce2ac7cbbe342802fc79fba7752a86d3641f4a10

Modified Files:
	qgis/distinfo
	qgis/patches/patch-CMakeLists.txt
	qgis/patches/patch-src_core_CMakeLists.txt

Log Message:
qgis: Adjust patch comments

  - drop vestigial comment about protobuf support from patch that
    doesn't (no longer, probably) patch protobuf
  - add todo about protobuf patch because it's a different patch from
    the linked pull request, isn't on upstream master and there's no
    explanation of what's being fixed and why

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

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

diffstat:
 qgis/distinfo                              | 4 ++--
 qgis/patches/patch-CMakeLists.txt          | 1 -
 qgis/patches/patch-src_core_CMakeLists.txt | 4 ++++
 3 files changed, 6 insertions(+), 3 deletions(-)

diffs:
diff --git a/qgis/distinfo b/qgis/distinfo
index 95a0c8a2e5..353c036b96 100644
--- a/qgis/distinfo
+++ b/qgis/distinfo
@@ -3,14 +3,14 @@ $NetBSD: distinfo,v 1.65 2024/05/12 19:07:37 gdt Exp $
 BLAKE2s (qgis-3.34.6.tar.bz2) = 451b2c6aa13be0e4dbe0cd8eff4ee9cee11bc3bf9a379bd98df0f2cdf9a5e473
 SHA512 (qgis-3.34.6.tar.bz2) = 80a30b38f20ae5d8fa43990af941253faed99fe449e58815c8de2b72c3adf54ba7cf1e189bee7cc539fa3c40523347fb5ba4d5cf4c0a7aa60896a37aa18e4ed6
 Size (qgis-3.34.6.tar.bz2) = 170944068 bytes
-SHA1 (patch-CMakeLists.txt) = bf5d5dc94146a0576461b9d2639c99dbdd466813
+SHA1 (patch-CMakeLists.txt) = 907c0e6e102cf0b0c968abed5af8a2721ad38c46
 SHA1 (patch-cmake_FindGDAL.cmake) = e80401412dfc89ac9e826515a37b53907aa39091
 SHA1 (patch-cmake_FindGEOS.cmake) = 7beb96362d091eef984a8c4e9a74c5067169c2e8
 SHA1 (patch-cmake_FindQwt.cmake) = 14d42b2733f14e0fef976c4944979b3a13274538
 SHA1 (patch-mac_CMakeLists.txt) = 7967c0fa4eed8dc2ce24192bdbec8ae8a336be1c
 SHA1 (patch-mac_cmake_1qt.cmake.in) = d74f7201849ef6dd83f39251e466eb04c791c0e6
 SHA1 (patch-src_app_CMakeLists.txt) = 38ab5aac9a2e8f81ae5644151b6dfb49ed72d196
-SHA1 (patch-src_core_CMakeLists.txt) = f360c369e0bffc9bbaba7e2f2bcf123b865880ce
+SHA1 (patch-src_core_CMakeLists.txt) = 207f5886537012cc15cf4e2608111da966eeb38f
 SHA1 (patch-src_core_qgsapplication.cpp) = 54bba734969cd9fd90a2317d8c1531da2827d145
 SHA1 (patch-src_core_raster_qgsrasterattributetable.cpp) = db31738096e60fa20b546849f56a017a44d0b6e7
 SHA1 (patch-src_crssync_CMakeLists.txt) = 7269ba6dce3ca41f5d63d36ffc02ffc6d0cea5d8
diff --git a/qgis/patches/patch-CMakeLists.txt b/qgis/patches/patch-CMakeLists.txt
index dc30fd6b0e..8cb542dd41 100644
--- a/qgis/patches/patch-CMakeLists.txt
+++ b/qgis/patches/patch-CMakeLists.txt
@@ -1,7 +1,6 @@
 $NetBSD: patch-CMakeLists.txt,v 1.5 2024/05/01 12:46:59 adam Exp $
 
 On Darwin, don't build application bundle.
-Use modern protobuf support.
 
 --- CMakeLists.txt.orig	2024-04-19 12:01:44.000000000 +0000
 +++ CMakeLists.txt
diff --git a/qgis/patches/patch-src_core_CMakeLists.txt b/qgis/patches/patch-src_core_CMakeLists.txt
index 81a21b0c95..6f5bcf6cbf 100644
--- a/qgis/patches/patch-src_core_CMakeLists.txt
+++ b/qgis/patches/patch-src_core_CMakeLists.txt
@@ -1,5 +1,9 @@
 $NetBSD$
 
+\todo The patch below does not appear to be from the linked pull
+request.  It does not even seem to be in qgis master.   The patches in
+the PR appear to be on the 3.34 release branch.
+
 Remove legacy protobuf support.
 https://github.com/qgis/QGIS/pull/53962
 


Home | Main Index | Thread Index | Old Index