CVS commit: pkgsrc/lang

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Nov 15 10:58:31 UTC 2024

Modified Files:
        pkgsrc/lang/nodejs18: distinfo
        pkgsrc/lang/nodejs18/patches: patch-configure.py
        pkgsrc/lang/nodejs20: distinfo
        pkgsrc/lang/nodejs22: distinfo
Added Files:
        pkgsrc/lang/nodejs18/patches: patch-configure
        pkgsrc/lang/nodejs20/patches: patch-configure.py
        pkgsrc/lang/nodejs22/patches: patch-configure.py

Log Message:
nodejsNN: fix building with ICU 76


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/nodejs18/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/lang/nodejs18/patches/patch-configure
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/nodejs18/patches/patch-configure.py
cvs rdiff -u -r1.15 -r1.16 pkgsrc/lang/nodejs20/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/lang/nodejs20/patches/patch-configure.py
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/nodejs22/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/nodejs22/patches/patch-configure.py

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

Modified files:

Index: pkgsrc/lang/nodejs18/distinfo
diff -u pkgsrc/lang/nodejs18/distinfo:1.20 pkgsrc/lang/nodejs18/distinfo:1.21
--- pkgsrc/lang/nodejs18/distinfo:1.20  Tue Aug 13 08:55:18 2024
+++ pkgsrc/lang/nodejs18/distinfo       Fri Nov 15 10:58:30 2024
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.20 2024/08/13 08:55:18 adam Exp $
+$NetBSD: distinfo,v 1.21 2024/11/15 10:58:30 adam Exp $
 
 BLAKE2s (node-v18.20.4.tar.xz) = f52f391617c120f7e3049e0f1d8af9216ded70291f0d1e7a031f93860fd7504e
 SHA512 (node-v18.20.4.tar.xz) = 1ccef99ebee3906f5bad3c1582f9551ced9bed15e6a047d59d1a23c6110004fb46ea4bebcf9899748c64109f78788d7365ee956444e645eaf397dabbcddda21e
 Size (node-v18.20.4.tar.xz) = 40445740 bytes
 SHA1 (patch-common.gypi) = 333fffbc32b36391c347c6cb9ef00d66ca5d6341
-SHA1 (patch-configure.py) = f31cd2349806d49148eeeb08b428a9b021185604
+SHA1 (patch-configure) = 4ba9a64f3a3df66c980b85302a69cf160215ceda
+SHA1 (patch-configure.py) = 32fff9b8dcdab023c0794badeb060fc53b21b38b
 SHA1 (patch-deps_cares_cares.gyp) = 22b44f2ac59963f694dfe4f4585e08960b3dec32
 SHA1 (patch-deps_uv_common.gypi) = 0a07799ec675f2426f7c2d7a7d80fd422250f260
 SHA1 (patch-deps_uvwasi_include_wasi__serdes.h) = 32b85ef5824b96b35aba9280bbe7aa7899d9e5cf

Index: pkgsrc/lang/nodejs18/patches/patch-configure.py
diff -u pkgsrc/lang/nodejs18/patches/patch-configure.py:1.1 pkgsrc/lang/nodejs18/patches/patch-configure.py:1.2
--- pkgsrc/lang/nodejs18/patches/patch-configure.py:1.1 Thu Nov  2 13:20:35 2023
+++ pkgsrc/lang/nodejs18/patches/patch-configure.py     Fri Nov 15 10:58:31 2024
@@ -1,8 +1,10 @@
-$NetBSD: patch-configure.py,v 1.1 2023/11/02 13:20:35 adam Exp $
+$NetBSD: patch-configure.py,v 1.2 2024/11/15 10:58:31 adam Exp $
 
 Use packaging instead of deprecated distutils.
 
---- configure.py.orig  2023-10-13 14:42:13.000000000 +0000
+Fix building with ICU 76.
+
+--- configure.py.orig  2024-11-15 10:34:42.874157210 +0000
 +++ configure.py
 @@ -14,7 +14,7 @@ import bz2
  import io
@@ -28,3 +30,12 @@ Use packaging instead of deprecated dist
  
      if is_x86 and not openssl110_asm_supported:
        error('''Did not find a new enough assembler, install one or build with
+@@ -1764,7 +1764,7 @@ def configure_intl(o):
+   elif with_intl == 'system-icu':
+     # ICU from pkg-config.
+     o['variables']['v8_enable_i18n_support'] = 1
+-    pkgicu = pkg_config('icu-i18n')
++    pkgicu = pkg_config(['icu-i18n', 'icu-uc'])
+     if not pkgicu[0]:
+       error('''Could not load pkg-config data for "icu-i18n".
+        See above errors or the README.md.''')

Index: pkgsrc/lang/nodejs20/distinfo
diff -u pkgsrc/lang/nodejs20/distinfo:1.15 pkgsrc/lang/nodejs20/distinfo:1.16
--- pkgsrc/lang/nodejs20/distinfo:1.15  Tue Oct  8 17:23:31 2024
+++ pkgsrc/lang/nodejs20/distinfo       Fri Nov 15 10:58:31 2024
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.15 2024/10/08 17:23:31 adam Exp $
+$NetBSD: distinfo,v 1.16 2024/11/15 10:58:31 adam Exp $
 
 BLAKE2s (node-v20.18.0.tar.xz) = c41ee12e4659b4a9a80feca62244303776cd9f7c4157eb9ac3f661c4d722f9c7
 SHA512 (node-v20.18.0.tar.xz) = e7d43bb7324df59362591c4d3f2c91a870bec17c4024666ae92e2a3ffc0711b82d05b91a21802a0b252ad7469f8da430f7d427b2d8291d91107dd8589ea91f66
 Size (node-v20.18.0.tar.xz) = 41937144 bytes
 SHA1 (patch-common.gypi) = f50615affd26c2c7902d2112c8e9f2704c057b9c
+SHA1 (patch-configure.py) = 983ed01cce632bc286e34c5845e338bf1128f99f
 SHA1 (patch-deps_cares_cares.gyp) = 22b44f2ac59963f694dfe4f4585e08960b3dec32
 SHA1 (patch-deps_uv_common.gypi) = 29f0c382b68f77749a71ce39fa2ca37338ca18ec
 SHA1 (patch-deps_uvwasi_include_wasi__serdes.h) = 32b85ef5824b96b35aba9280bbe7aa7899d9e5cf

Index: pkgsrc/lang/nodejs22/distinfo
diff -u pkgsrc/lang/nodejs22/distinfo:1.1 pkgsrc/lang/nodejs22/distinfo:1.2
--- pkgsrc/lang/nodejs22/distinfo:1.1   Wed Nov 13 08:45:17 2024
+++ pkgsrc/lang/nodejs22/distinfo       Fri Nov 15 10:58:31 2024
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.1 2024/11/13 08:45:17 adam Exp $
+$NetBSD: distinfo,v 1.2 2024/11/15 10:58:31 adam Exp $
 
 BLAKE2s (node-v22.11.0.tar.xz) = 4c7c455d840d56e5e90aefb3843819d40db56b6d9da551648ec4ed0df85072f3
 SHA512 (node-v22.11.0.tar.xz) = f81f0d4a9606d14fcbfb8b73489f156bbbdfa5ece7a8c4036c1887df768324dc58c91b87367c6631b8a96d19fb0d7cd1414fb90ef1bc7b27f07c40f0480a0e8d
 Size (node-v22.11.0.tar.xz) = 47006780 bytes
 SHA1 (patch-common.gypi) = a4dd4ba7e0dfd5838d7241e35447617bdc0f93df
+SHA1 (patch-configure.py) = 983ed01cce632bc286e34c5845e338bf1128f99f
 SHA1 (patch-deps_cares_cares.gyp) = 22b44f2ac59963f694dfe4f4585e08960b3dec32
 SHA1 (patch-deps_uv_common.gypi) = 29f0c382b68f77749a71ce39fa2ca37338ca18ec
 SHA1 (patch-deps_uvwasi_include_wasi__serdes.h) = 32b85ef5824b96b35aba9280bbe7aa7899d9e5cf

Added files:

Index: pkgsrc/lang/nodejs18/patches/patch-configure
diff -u /dev/null pkgsrc/lang/nodejs18/patches/patch-configure:1.3
--- /dev/null   Fri Nov 15 10:58:31 2024
+++ pkgsrc/lang/nodejs18/patches/patch-configure        Fri Nov 15 10:58:31 2024
@@ -0,0 +1,23 @@
+$NetBSD: patch-configure,v 1.3 2024/11/15 10:58:31 adam Exp $
+
+Allow Python 3.13.
+
+--- configure.orig     2024-11-15 10:45:03.747039656 +0000
++++ configure
+@@ -4,6 +4,7 @@
+ # Note that the mix of single and double quotes is intentional,
+ # as is the fact that the ] goes on a new line.
+ _=[ 'exec' '/bin/sh' '-c' '''
++command -v python3.13 >/dev/null && exec python3.13 "$0" "$@"
+ command -v python3.12 >/dev/null && exec python3.12 "$0" "$@"
+ command -v python3.11 >/dev/null && exec python3.11 "$0" "$@"
+ command -v python3.10 >/dev/null && exec python3.10 "$0" "$@"
+@@ -24,7 +25,7 @@ except ImportError:
+   from distutils.spawn import find_executable as which
+ 
+ print('Node.js configure: Found Python {}.{}.{}...'.format(*sys.version_info))
+-acceptable_pythons = ((3, 12), (3, 11), (3, 10), (3, 9), (3, 8), (3, 7), (3, 6))
++acceptable_pythons = ((3, 13), (3, 12), (3, 11), (3, 10), (3, 9), (3, 8), (3, 7), (3, 6))
+ if sys.version_info[:2] in acceptable_pythons:
+   import configure
+ else:

Index: pkgsrc/lang/nodejs20/patches/patch-configure.py
diff -u /dev/null pkgsrc/lang/nodejs20/patches/patch-configure.py:1.3
--- /dev/null   Fri Nov 15 10:58:31 2024
+++ pkgsrc/lang/nodejs20/patches/patch-configure.py     Fri Nov 15 10:58:31 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure.py,v 1.3 2024/11/15 10:58:31 adam Exp $
+
+Fix building with ICU 76.
+
+--- configure.py.orig  2024-11-15 10:22:32.878698659 +0000
++++ configure.py
+@@ -1829,7 +1829,7 @@ def configure_intl(o):
+   elif with_intl == 'system-icu':
+     # ICU from pkg-config.
+     o['variables']['v8_enable_i18n_support'] = 1
+-    pkgicu = pkg_config('icu-i18n')
++    pkgicu = pkg_config(['icu-i18n', 'icu-uc'])
+     if not pkgicu[0]:
+       error('''Could not load pkg-config data for "icu-i18n".
+        See above errors or the README.md.''')

Index: pkgsrc/lang/nodejs22/patches/patch-configure.py
diff -u /dev/null pkgsrc/lang/nodejs22/patches/patch-configure.py:1.1
--- /dev/null   Fri Nov 15 10:58:31 2024
+++ pkgsrc/lang/nodejs22/patches/patch-configure.py     Fri Nov 15 10:58:31 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure.py,v 1.1 2024/11/15 10:58:31 adam Exp $
+
+Fix building with ICU 76.
+
+--- configure.py.orig  2024-11-15 10:22:32.878698659 +0000
++++ configure.py
+@@ -1829,7 +1829,7 @@ def configure_intl(o):
+   elif with_intl == 'system-icu':
+     # ICU from pkg-config.
+     o['variables']['v8_enable_i18n_support'] = 1
+-    pkgicu = pkg_config('icu-i18n')
++    pkgicu = pkg_config(['icu-i18n', 'icu-uc'])
+     if not pkgicu[0]:
+       error('''Could not load pkg-config data for "icu-i18n".
+        See above errors or the README.md.''')