CVS commit: pkgsrc/audio/musescore

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Wed Oct 15 03:32:58 UTC 2025

Modified Files:
        pkgsrc/audio/musescore: Makefile distinfo
Added Files:
        pkgsrc/audio/musescore/patches:
            patch-src_framework_global_types_string.cpp

Log Message:
musescore: fix some ctype(3) usage


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 pkgsrc/audio/musescore/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/audio/musescore/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/musescore/patches/patch-src_framework_global_types_string.cpp

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

Modified files:

Index: pkgsrc/audio/musescore/Makefile
diff -u pkgsrc/audio/musescore/Makefile:1.57 pkgsrc/audio/musescore/Makefile:1.58
--- pkgsrc/audio/musescore/Makefile:1.57        Wed Oct 15 02:06:05 2025
+++ pkgsrc/audio/musescore/Makefile     Wed Oct 15 03:32:58 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2025/10/15 02:06:05 gutteridge Exp $
+# $NetBSD: Makefile,v 1.58 2025/10/15 03:32:58 gutteridge Exp $
 
 DISTNAME=      musescore-4.6.2
+PKGREVISION=   1
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=musescore/}
 GITHUB_PROJECT=        MuseScore

Index: pkgsrc/audio/musescore/distinfo
diff -u pkgsrc/audio/musescore/distinfo:1.14 pkgsrc/audio/musescore/distinfo:1.15
--- pkgsrc/audio/musescore/distinfo:1.14        Wed Oct 15 01:32:00 2025
+++ pkgsrc/audio/musescore/distinfo     Wed Oct 15 03:32:58 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2025/10/15 01:32:00 gutteridge Exp $
+$NetBSD: distinfo,v 1.15 2025/10/15 03:32:58 gutteridge Exp $
 
 BLAKE2s (musescore-4.6.2.tar.gz) = cab24e6311539d79fba6612a4ad2670e82484c694ec0d5877db9184fba591d94
 SHA512 (musescore-4.6.2.tar.gz) = b93519063bfab20be5a7f228f53c9c9d0ec829aee23328e8ac797c98de8a0bb9e4441fa48e7883a951b14e622b64375a4bfab53a2f27cd5dcbc4e674e06a02e3
@@ -13,6 +13,7 @@ SHA1 (patch-src_framework_audio_driver_a
 SHA1 (patch-src_framework_audio_main_internal_audiodrivercontroller.cpp) = f4b8bd1d332a993ab618cf966435efb67e43f1f4
 SHA1 (patch-src_framework_audio_thirdparty_fluidsynth_fluidsynth-2.3.3_src_external_portable__endian.h) = f9fa1c02fd12ac97f82bf10352b70b120ebe6ab4
 SHA1 (patch-src_framework_global_runtime.cpp) = 62452ec72bf7ca6a4c97d7e1b947e904b02f970c
+SHA1 (patch-src_framework_global_types_string.cpp) = 9b76e6aab7a883cfd5a2162dce49da5da6ed2c8b
 SHA1 (patch-src_framework_global_types_version.h) = e0dd1e25eeafa5e1d4bbc7616707c0c488835305
 SHA1 (patch-src_framework_midi_CMakeLists.txt) = 16df8a75ac1a4470e2bbb786a74d5165a5f39020
 SHA1 (patch-src_framework_midi_midimodule.cpp) = a91069ff3be8c3a7d0fe568cde76cc8bbf702bbd

Added files:

Index: pkgsrc/audio/musescore/patches/patch-src_framework_global_types_string.cpp
diff -u /dev/null pkgsrc/audio/musescore/patches/patch-src_framework_global_types_string.cpp:1.1
--- /dev/null   Wed Oct 15 03:32:58 2025
+++ pkgsrc/audio/musescore/patches/patch-src_framework_global_types_string.cpp  Wed Oct 15 03:32:58 2025
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_framework_global_types_string.cpp,v 1.1 2025/10/15 03:32:58 gutteridge Exp $
+
+Use ctype(3) correctly.
+
+--- src/framework/global/types/string.cpp.orig 2025-10-10 09:21:06.000000000 +0000
++++ src/framework/global/types/string.cpp
+@@ -88,14 +88,14 @@ static double toDouble_helper(const char
+ static void ltrim_helper(std::u16string& s)
+ {
+     s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](char16_t ch) {
+-        return !std::isspace(ch);
++        return !std::isspace(static_cast<unsigned char>(ch));
+     }));
+ }
+ 
+ static void rtrim_helper(std::u16string& s)
+ {
+     s.erase(std::find_if(s.rbegin(), s.rend(), [](char16_t ch) {
+-        return !std::isspace(ch);
++        return !std::isspace(static_cast<unsigned char>(ch));
+     }).base(), s.end());
+ }
+