CVS commit: pkgsrc/lang/openjdk21

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Oct  7 14:12:22 UTC 2025

Modified Files:
        pkgsrc/lang/openjdk21: Makefile distinfo
Added Files:
        pkgsrc/lang/openjdk21/patches:
            patch-src_java.desktop_unix_native_libpipewire_include_spa_utils_string.h

Log Message:
lang/openjdk21: Fix build with GCC 14

* Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/lang/openjdk21/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/openjdk21/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/openjdk21/patches/patch-src_java.desktop_unix_native_libpipewire_include_spa_utils_string.h

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

Modified files:

Index: pkgsrc/lang/openjdk21/Makefile
diff -u pkgsrc/lang/openjdk21/Makefile:1.21 pkgsrc/lang/openjdk21/Makefile:1.22
--- pkgsrc/lang/openjdk21/Makefile:1.21 Sat Aug 30 22:45:47 2025
+++ pkgsrc/lang/openjdk21/Makefile      Tue Oct  7 14:12:21 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2025/08/30 22:45:47 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2025/10/07 14:12:21 ryoon Exp $
 
 DISTNAME=      jdk21u-${GITHUB_TAG:C/\+/-/}
 PKGNAME=       openjdk21-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=battleblow/}
 GITHUB_PROJECT=        jdk21u

Index: pkgsrc/lang/openjdk21/distinfo
diff -u pkgsrc/lang/openjdk21/distinfo:1.12 pkgsrc/lang/openjdk21/distinfo:1.13
--- pkgsrc/lang/openjdk21/distinfo:1.12 Thu Aug 21 02:50:14 2025
+++ pkgsrc/lang/openjdk21/distinfo      Tue Oct  7 14:12:21 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2025/08/21 02:50:14 pho Exp $
+$NetBSD: distinfo,v 1.13 2025/10/07 14:12:21 ryoon Exp $
 
 BLAKE2s (bootstrap-jdk-1.21.0.1.12-netbsd-9-amd64-20231207.tar.xz) = 017a9d787a34faa997d72ac69bcafd9c8ab72354e3a1b751d1cb5d376b364f72
 SHA512 (bootstrap-jdk-1.21.0.1.12-netbsd-9-amd64-20231207.tar.xz) = 7ec4208363f44a378674a2b87687ab7facb60bf73118ebd4bec35f7912f073365b36efc4c4b3c034bc448139cb81106e18d6d3b1db45f4ab086ce1ed72bc21bf
@@ -27,3 +27,4 @@ SHA1 (patch-src_hotspot_os_bsd_os__bsd.c
 SHA1 (patch-src_hotspot_share_runtime_threadWXSetters.inline.hpp) = f704bb060803e500415b5d300e26857cf7288ca5
 SHA1 (patch-src_java.desktop_bsd_data_fontconfig_fontconfig.properties) = 32eda43f536dc3a9afb4f1f5f7acae8cb020d546
 SHA1 (patch-src_java.desktop_unix_native_common_awt_fontpath.c) = 4a65df0bf84af967f230636f1da1ec75fbb3f691
+SHA1 (patch-src_java.desktop_unix_native_libpipewire_include_spa_utils_string.h) = 56090e5f992171db874a1427e8b2905da017fa3c

Added files:

Index: pkgsrc/lang/openjdk21/patches/patch-src_java.desktop_unix_native_libpipewire_include_spa_utils_string.h
diff -u /dev/null pkgsrc/lang/openjdk21/patches/patch-src_java.desktop_unix_native_libpipewire_include_spa_utils_string.h:1.1
--- /dev/null   Tue Oct  7 14:12:22 2025
+++ pkgsrc/lang/openjdk21/patches/patch-src_java.desktop_unix_native_libpipewire_include_spa_utils_string.h     Tue Oct  7 14:12:22 2025
@@ -0,0 +1,48 @@
+$NetBSD: patch-src_java.desktop_unix_native_libpipewire_include_spa_utils_string.h,v 1.1 2025/10/07 14:12:22 ryoon Exp $
+
+* Fix build with GCC 14. NetBSD has no uselocale().
+
+--- src/java.desktop/unix/native/libpipewire/include/spa/utils/string.h.orig   2025-10-07 10:23:27.815113122 +0000
++++ src/java.desktop/unix/native/libpipewire/include/spa/utils/string.h
+@@ -269,14 +269,20 @@ SPA_API_STRING float spa_strtof(const ch
+ #endif
+     float v;
+ #ifndef __LOCALE_C_ONLY
++#if !defined(__NetBSD__)
+     if (SPA_UNLIKELY(locale == NULL))
+         locale = newlocale(LC_ALL_MASK, "C", NULL);
+     prev = uselocale(locale);
++#else
++    prev = LC_C_LOCALE;
++#endif
+ #endif
+     v = strtof(str, endptr);
+ #ifndef __LOCALE_C_ONLY
++#if !defined(__NetBSD__)
+     uselocale(prev);
+ #endif
++#endif
+     return v;
+ }
+ 
+@@ -319,14 +325,20 @@ SPA_API_STRING double spa_strtod(const c
+ #endif
+     double v;
+ #ifndef __LOCALE_C_ONLY
++#if !defined(__NetBSD__)
+     if (SPA_UNLIKELY(locale == NULL))
+         locale = newlocale(LC_ALL_MASK, "C", NULL);
+     prev = uselocale(locale);
++#else
++    prev = LC_C_LOCALE;
++#endif
+ #endif
+     v = strtod(str, endptr);
+ #ifndef __LOCALE_C_ONLY
++#if !defined(__NetBSD__)
+     uselocale(prev);
+ #endif
++#endif
+     return v;
+ }
+