haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

icu73, change patchset according to upstream (#8682)

Browse Source
This commit is contained in:
Schrijvers Luc
2023-05-20 06:40:15 +02:00
committed by GitHub
parent d6fd23fe3c
commit 6a41f42d63
1 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
dev-libs/icu/patches/icu73-73.1.patchset
View File

@@ -1,14 +1,8 @@
From c276500a6f980975e52bb987d544105863883539 Mon Sep 17 00:00:00 2001
From 5eac349b77e65973fc205cce200beba9a8d2266e Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Tue, 22 Feb 2022 10:08:48 -0600
Subject: [PATCH] Import changes from icu66 patchset
Subject: Import changes from icu66 patchset
---
source/common/putilimp.h | 4 +--
source/config/mh-haiku | 2 +-
source/configure.ac | 43 +++------------------------------
source/tools/tzcode/Makefile.in | 2 +-
4 files changed, 7 insertions(+), 44 deletions(-)
diff --git a/source/common/putilimp.h b/source/common/putilimp.h
index 5b95a68..f4ca0c4 100644
@@ -46,10 +40,10 @@ index bb814cd..965c949 100644
## Compiler switch to embed a runtime search path
LD_RPATH=
diff --git a/source/configure.ac b/source/configure.ac
index 22c11af..6305035 100644
index 2d7eb30..6b33e74 100644
--- a/source/configure.ac
+++ b/source/configure.ac
@@ -311,7 +311,7 @@ if test "$ENABLE_STATIC" = "YES"; then
@@ -313,7 +313,7 @@ if test "$ENABLE_STATIC" = "YES"; then
OLD_LDFLAGS="${LDFLAGS}"
case "${host}" in
@@ -58,7 +52,7 @@ index 22c11af..6305035 100644
if test "$GCC" = yes; then
CPPFLAGS="${CPPFLAGS} -ffunction-sections -fdata-sections"
LDFLAGS="${LDFLAGS} -Wl,--gc-sections"
@@ -808,50 +808,12 @@ else
@@ -805,50 +805,12 @@ else
fi
AC_SUBST(U_HAVE_POPEN)
@@ -110,7 +104,7 @@ index 22c11af..6305035 100644
AC_SUBST(U_HAVE_TZNAME)
AC_SUBST(U_TZNAME)
@@ -1298,6 +1260,7 @@ case "${host}" in
@@ -1295,6 +1257,7 @@ case "${host}" in
*-*-nto*) platform=U_QNX ;;
*-dec-osf*) platform=U_OSF ;;
*-*-beos) platform=U_BEOS ;;
@@ -132,5 +126,41 @@ index 4ba969f..ea249f0 100644
tdatamarker: $(TZDATA)
mkdir $(VANGUARD_DIR)
--
2.35.1
2.37.3
From 7d250044f8b2b3634600296784efd772d1c62266 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Fri, 19 May 2023 11:46:23 +0200
Subject: Fix patchset according to upstream
diff --git a/source/common/putilimp.h b/source/common/putilimp.h
index f4ca0c4..50ff4b5 100644
--- a/source/common/putilimp.h
+++ b/source/common/putilimp.h
@@ -88,7 +88,9 @@ typedef size_t uintptr_t;
/* Use the predefined value. */
#elif !U_HAVE_NL_LANGINFO_CODESET
# define U_NL_LANGINFO_CODESET -1
-#elif U_PLATFORM == U_PF_OS400 || defined(__HAIKU__)
+#elif U_PLATFORM == U_PF_OS400
+ /* not defined */
+#elif U_PLATFORM == U_HAIKU
/* not defined */
#else
# define U_NL_LANGINFO_CODESET CODESET
@@ -101,7 +103,9 @@ typedef size_t uintptr_t;
#if U_PLATFORM_HAS_WINUWP_API == 0
# define U_TZSET _tzset
#endif
-#elif U_PLATFORM == U_PF_OS400 || defined(__HAIKU__)
+#elif U_PLATFORM == U_PF_OS400
+ /* not defined */
+#elif U_PLATFORM == U_HAIKU
/* not defined */
#else
# define U_TZSET tzset
--
2.37.3