CVS commit: pkgsrc/geography/qgis

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Jun 30 22:51:46 UTC 2025

Modified Files:
        pkgsrc/geography/qgis: Makefile distinfo
        pkgsrc/geography/qgis/patches: patch-mac_CMakeLists.txt
Added Files:
        pkgsrc/geography/qgis/patches: patch-external_nmea_tok.c

Log Message:
geography/qgis: Fix ctype abuse


To generate a diff of this commit:
cvs rdiff -u -r1.246 -r1.247 pkgsrc/geography/qgis/Makefile
cvs rdiff -u -r1.76 -r1.77 pkgsrc/geography/qgis/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/geography/qgis/patches/patch-external_nmea_tok.c
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/geography/qgis/patches/patch-mac_CMakeLists.txt

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

Modified files:

Index: pkgsrc/geography/qgis/Makefile
diff -u pkgsrc/geography/qgis/Makefile:1.246 pkgsrc/geography/qgis/Makefile:1.247
--- pkgsrc/geography/qgis/Makefile:1.246        Fri Jun 13 12:47:34 2025
+++ pkgsrc/geography/qgis/Makefile      Mon Jun 30 22:51:46 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.246 2025/06/13 12:47:34 gdt Exp $
+# $NetBSD: Makefile,v 1.247 2025/06/30 22:51:46 gdt Exp $
 
 # This is intentionally 3.40 Long Term Release.  Please do not update
 # to later branches, and instead discuss whether/how we want multiple
@@ -7,6 +7,7 @@ DISTNAME=       qgis-3.40.7
 CATEGORIES=    geography
 MASTER_SITES=  https://qgis.org/downloads/
 EXTRACT_SUFX=  .tar.bz2
+PKGREVISION=   1
 
 MAINTAINER=    gdt%NetBSD.org@localhost
 #MAINTAINER+=  brook%nmsu.edu@localhost

Index: pkgsrc/geography/qgis/distinfo
diff -u pkgsrc/geography/qgis/distinfo:1.76 pkgsrc/geography/qgis/distinfo:1.77
--- pkgsrc/geography/qgis/distinfo:1.76 Sun Jun  8 22:51:22 2025
+++ pkgsrc/geography/qgis/distinfo      Mon Jun 30 22:51:46 2025
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.76 2025/06/08 22:51:22 gdt Exp $
+$NetBSD: distinfo,v 1.77 2025/06/30 22:51:46 gdt Exp $
 
 BLAKE2s (qgis-3.40.7.tar.bz2) = 944a643afbdef8a072cab86feeca36b6a60574aa3259868f3a3d96d21e83fdd9
 SHA512 (qgis-3.40.7.tar.bz2) = 5ff7f2038e13efe981020e3fee54850927a4e1d8f408f4af41067d9cdc80fc6d3ee6f583450254d020c424317a50587b471fbc5f6c9788ec8cd09718f14a3bd1
 Size (qgis-3.40.7.tar.bz2) = 181877862 bytes
 SHA1 (patch-cmake_FindQwt.cmake) = 245463bc44fb4f2cb4aa61a8b86931e95e4ac820
-SHA1 (patch-mac_CMakeLists.txt) = 7967c0fa4eed8dc2ce24192bdbec8ae8a336be1c
+SHA1 (patch-external_nmea_tok.c) = 94b9ce398787170250fc5fbd8835d7d7fa1cd013
+SHA1 (patch-mac_CMakeLists.txt) = 09986d53737b2825bf53e03173e3eab55d6d19c0
 SHA1 (patch-mac_cmake_1qt.cmake.in) = d74f7201849ef6dd83f39251e466eb04c791c0e6
 SHA1 (patch-src_core_proj_qgscoordinatereferencesystemutils.cpp) = 619c44a2d6348448fa982dcf184fa31da7894201
 SHA1 (patch-src_core_qgsapplication.cpp) = ca9e193cc4c7b275463e6e74b80594e6390187b8

Index: pkgsrc/geography/qgis/patches/patch-mac_CMakeLists.txt
diff -u pkgsrc/geography/qgis/patches/patch-mac_CMakeLists.txt:1.3 pkgsrc/geography/qgis/patches/patch-mac_CMakeLists.txt:1.4
--- pkgsrc/geography/qgis/patches/patch-mac_CMakeLists.txt:1.3  Tue Feb 15 12:59:21 2022
+++ pkgsrc/geography/qgis/patches/patch-mac_CMakeLists.txt      Mon Jun 30 22:51:46 2025
@@ -1,12 +1,20 @@
-$NetBSD: patch-mac_CMakeLists.txt,v 1.3 2022/02/15 12:59:21 gdt Exp $
+$NetBSD: patch-mac_CMakeLists.txt,v 1.4 2025/06/30 22:51:46 gdt Exp $
 
 Make sure QCATOOL_EXECUTABLE is available to 1qt.cmake
 This is in conjunction with patch-mac_cmake_1qt.cmake.in
 
 Not yet reported upstream.
 
---- mac/CMakeLists.txt.orig    2022-01-14 12:06:34.000000000 +0000
+--- mac/CMakeLists.txt.orig    2025-05-16 12:02:00.000000000 +0000
 +++ mac/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ # mac bundling must happen at end, so all binaries installed
+ # and install_names can be adjusted
+-if (APPLE AND QGIS_MACAPP_BUNDLE GREATER -1)
++if (XAPPLE AND QGIS_MACAPP_BUNDLE GREATER -1)
+   # for included scripts that set policies (ie OS X bundling)
+   install (CODE "cmake_policy(SET CMP0011 NEW)")
+   configure_file (cmake/0vars.cmake.in 0vars.cmake @ONLY)
 @@ -8,6 +8,7 @@ if (APPLE AND QGIS_MACAPP_BUNDLE GREATER
    install (SCRIPT ${CMAKE_BINARY_DIR}/mac/0qgis.cmake)
    if (QGIS_MACAPP_BUNDLE GREATER 0)

Added files:

Index: pkgsrc/geography/qgis/patches/patch-external_nmea_tok.c
diff -u /dev/null pkgsrc/geography/qgis/patches/patch-external_nmea_tok.c:1.1
--- /dev/null   Mon Jun 30 22:51:46 2025
+++ pkgsrc/geography/qgis/patches/patch-external_nmea_tok.c     Mon Jun 30 22:51:46 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-external_nmea_tok.c,v 1.1 2025/06/30 22:51:46 gdt Exp $
+
+Fix ctype abuse.
+
+Not yet filed upstream.
+
+--- external/nmea/tok.c.orig   2025-06-30 17:42:24.183818957 +0000
++++ external/nmea/tok.c
+@@ -179,7 +179,7 @@ int nmea_scanf( const char *buff, int bu
+ 
+       case NMEA_TOKS_WIDTH:
+       {
+-        if ( isdigit( *format ) )
++        if ( isdigit( (unsigned char) *format ) )
+           break;
+ 
+         tok_type = NMEA_TOKS_TYPE;