netbsd: revert _ISOC99_SOURCE, add uchar.h condition; from Marc

git-svn-id: svn://tug.org/texlive/trunk@72716 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 33 insertions, 19 deletions

diff --git a/Build/source/libs/icu/ChangeLog b/Build/source/libs/icu/ChangeLog
index 5556842b149..922c3255d54 100644
--- a/Build/source/libs/icu/ChangeLog
+++ b/Build/source/libs/icu/ChangeLog
@@ -1,3 +1,16 @@
+2024-10-30  Karl Berry  <karl@freefriends.org>
+
+	* icu-src/source/common/uposixdefs.h: undo #define of
+	 _ISOC99_SOURCE on __NETBSD__, what was patch-19-netbsd,
+	 now delete. (See TLpatches/ChangeLog).
+	 * icu-src/source/common/unicode/ptypes.h [U_PLATFORM_IS_LINUX_BASED]:
+	 add conditional for #include <uchar.h>.
+
+2024-10-27  Karl Berry  <karl@freefriends.org>
+
+	* Import 76.2.
+	(version.ac): update.
+
 2023-12-22  Karl Berry  <karl@freefriends.org>
 
 	* Import 74.2.
diff --git a/Build/source/libs/icu/TLpatches/ChangeLog b/Build/source/libs/icu/TLpatches/ChangeLog
index c101729c014..245977d517b 100644
--- a/Build/source/libs/icu/TLpatches/ChangeLog
+++ b/Build/source/libs/icu/TLpatches/ChangeLog
@@ -1,3 +1,10 @@
+2024-10-30  Karl Berry  <karl@freefriends.org>
+
+	* 
+	* patch-19-netbsd: remove
+	Per Marc Baudoin,
+	https://tug.org/pipermail/tlbuild/2024q4/005581.html
+
 2024-10-27  Karl Berry  <karl@freefriends.org>
 
 	Update for icu-76.1.
diff --git a/Build/source/libs/icu/TLpatches/patch-18-uchar b/Build/source/libs/icu/TLpatches/patch-18-uchar
new file mode 100644
index 00000000000..9ef8b03aaea
--- /dev/null
+++ b/Build/source/libs/icu/TLpatches/patch-18-uchar
@@ -0,0 +1,12 @@
+	From Marc Baudoin.
+	https://tug.org/pipermail/tlbuild/2024q4/005581.html
+
+--- source/common/unicode/ptypes.h~	2024-10-24 11:24:00.000000000 -0700
++++ source/common/unicode/ptypes.h	2024-10-30 17:25:22.442817993 -0700
+@@ -57,5 +57,5 @@
+ // ICU4C must detect and deal with that.
+ #if !defined(__cplusplus) && !defined(U_IN_DOXYGEN)
+-#   if U_HAVE_CHAR16_T
++#   if U_HAVE_CHAR16_T && U_PLATFORM_IS_LINUX_BASED
+ #       include <uchar.h>
+ #   else
diff --git a/Build/source/libs/icu/TLpatches/patch-19-netbsd b/Build/source/libs/icu/TLpatches/patch-19-netbsd
deleted file mode 100644
index 446584cd321..00000000000
--- a/Build/source/libs/icu/TLpatches/patch-19-netbsd
+++ /dev/null
@@ -1,14 +0,0 @@
-	Date: Sat, 13 Jan 2018 14:28:11 +0100
-	From: Marc Baudoin <babafou@babafou.eu.org>
-	tlbuild
-
---- source/common/uposixdefs.h~	2023-12-11 14:27:41.000000000 -0800
-+++ source/common/uposixdefs.h	2023-12-22 09:06:04.056017024 -0800
-@@ -75,3 +75,7 @@
- #endif
- 
-+#if defined(__cplusplus) && defined(__NetBSD__)
-+#define _ISOC99_SOURCE
-+#endif
-+
- #endif  /* __UPOSIXDEFS_H__ */
diff --git a/Build/source/libs/icu/icu-src/source/common/unicode/ptypes.h b/Build/source/libs/icu/icu-src/source/common/unicode/ptypes.h
index 270a729ccb0..3ca6c3ec8a4 100644
--- a/Build/source/libs/icu/icu-src/source/common/unicode/ptypes.h
+++ b/Build/source/libs/icu/icu-src/source/common/unicode/ptypes.h
@@ -56,7 +56,7 @@
 // implementations (looking at you, Apple, spring 2024) actually do this, so
 // ICU4C must detect and deal with that.
 #if !defined(__cplusplus) && !defined(U_IN_DOXYGEN)
-#   if U_HAVE_CHAR16_T
+#   if U_HAVE_CHAR16_T && U_PLATFORM_IS_LINUX_BASED
 #       include <uchar.h>
 #   else
         typedef uint16_t char16_t;
diff --git a/Build/source/libs/icu/icu-src/source/common/uposixdefs.h b/Build/source/libs/icu/icu-src/source/common/uposixdefs.h
index 3f162c33755..826c9bb47a2 100644
--- a/Build/source/libs/icu/icu-src/source/common/uposixdefs.h
+++ b/Build/source/libs/icu/icu-src/source/common/uposixdefs.h
@@ -74,8 +74,4 @@
 #define _POSIX_C_SOURCE 200809L
 #endif
 
-#if defined(__cplusplus) && defined(__NetBSD__)
-#define _ISOC99_SOURCE
-#endif
-
 #endif  /* __UPOSIXDEFS_H__ */