CVS commit: pkgsrc/lang/openjdk17

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

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

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

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

* Apply a patch from lang/openjdk21.
* Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/lang/openjdk17/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/lang/openjdk17/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/openjdk17/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/openjdk17/Makefile
diff -u pkgsrc/lang/openjdk17/Makefile:1.37 pkgsrc/lang/openjdk17/Makefile:1.38
--- pkgsrc/lang/openjdk17/Makefile:1.37 Sat Aug 30 22:45:47 2025
+++ pkgsrc/lang/openjdk17/Makefile      Tue Oct  7 14:14:58 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2025/08/30 22:45:47 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2025/10/07 14:14:58 ryoon Exp $
 
 DISTNAME=      jdk17u-${GITHUB_TAG:C/\+/-/}
 PKGNAME=       openjdk17-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=battleblow/}
 GITHUB_PROJECT=        jdk17u

Index: pkgsrc/lang/openjdk17/distinfo
diff -u pkgsrc/lang/openjdk17/distinfo:1.24 pkgsrc/lang/openjdk17/distinfo:1.25
--- pkgsrc/lang/openjdk17/distinfo:1.24 Tue Aug 12 14:50:46 2025
+++ pkgsrc/lang/openjdk17/distinfo      Tue Oct  7 14:14:58 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2025/08/12 14:50:46 ryoon Exp $
+$NetBSD: distinfo,v 1.25 2025/10/07 14:14:58 ryoon Exp $
 
 BLAKE2s (bootstrap-jdk-1.17.0.15.6-netbsd-9-aarch64-20250806.tar.xz) = cd7cd0c0acc259f55291932fc679388003c3c108257f08f660d328974b764ee5
 SHA512 (bootstrap-jdk-1.17.0.15.6-netbsd-9-aarch64-20250806.tar.xz) = 26003c0ace59f41b03584ae0bbe79b15041d4c3537d5d4227a3396276943ff95d687de0aa5025b5dddb1d91cf33ffbc7fd57d7cc8de70aef53907fa2c2652811
@@ -38,3 +38,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_unix_native_common_awt_fontpath.c) = d7bd8839ecd84459fbd3e7d14ac0e2f48b8b4032
 SHA1 (patch-src_java.desktop_unix_native_libpipewire_include_spa_utils_endian.h) = 7b40072b374a6af92adc732f0e24c52bca84ed61
+SHA1 (patch-src_java.desktop_unix_native_libpipewire_include_spa_utils_string.h) = 56090e5f992171db874a1427e8b2905da017fa3c

Added files:

Index: pkgsrc/lang/openjdk17/patches/patch-src_java.desktop_unix_native_libpipewire_include_spa_utils_string.h
diff -u /dev/null pkgsrc/lang/openjdk17/patches/patch-src_java.desktop_unix_native_libpipewire_include_spa_utils_string.h:1.1
--- /dev/null   Tue Oct  7 14:14:58 2025
+++ pkgsrc/lang/openjdk17/patches/patch-src_java.desktop_unix_native_libpipewire_include_spa_utils_string.h     Tue Oct  7 14:14:58 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:14:58 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;
+ }
+