mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-18 09:40:05 +02:00
128 lines
3.8 KiB
Plaintext
128 lines
3.8 KiB
Plaintext
From b5bd9fb9ada83f237896a31d4d6e0fb4a60ad42b 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: Import changes from icu66 patchset
|
|
|
|
|
|
diff --git a/source/configure.ac b/source/configure.ac
|
|
index be1cca6..a2db44d 100644
|
|
--- a/source/configure.ac
|
|
+++ b/source/configure.ac
|
|
@@ -751,50 +751,12 @@ else
|
|
fi
|
|
AC_SUBST(U_HAVE_POPEN)
|
|
|
|
-AC_CHECK_FUNC(tzset)
|
|
+#AC_CHECK_FUNC(tzset)
|
|
U_HAVE_TZSET=0
|
|
-if test x$ac_cv_func_tzset = xyes
|
|
-then
|
|
- U_TZSET=tzset
|
|
- U_HAVE_TZSET=1
|
|
-else
|
|
- AC_CHECK_FUNC(_tzset)
|
|
- if test x$ac_cv_func__tzset = xyes
|
|
- then
|
|
- U_TZSET=_tzset
|
|
- U_HAVE_TZSET=1
|
|
- else
|
|
- CONFIG_CPPFLAGS="${CONFIG_CPPFLAGS} -DU_HAVE_TZSET=0"
|
|
- fi
|
|
-fi
|
|
AC_SUBST(U_HAVE_TZSET)
|
|
AC_SUBST(U_TZSET)
|
|
|
|
U_HAVE_TZNAME=0
|
|
-AC_CACHE_CHECK(for tzname,ac_cv_var_tzname,
|
|
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#ifndef _XOPEN_SOURCE
|
|
-#define _XOPEN_SOURCE
|
|
-#endif
|
|
-#include <stdlib.h>
|
|
-#include <time.h>
|
|
-#ifndef tzname /* For SGI. */
|
|
-extern char *tzname[]; /* RS6000 and others reject char **tzname. */
|
|
-#endif]], [atoi(*tzname);])],[ac_cv_var_tzname=yes],[ac_cv_var_tzname=no])])
|
|
-if test $ac_cv_var_tzname = yes; then
|
|
- U_TZNAME=tzname
|
|
- U_HAVE_TZNAME=1
|
|
-else
|
|
- AC_CACHE_CHECK(for _tzname,ac_cv_var__tzname,
|
|
- [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
|
|
- #include <time.h>
|
|
- extern char *_tzname[];]], [atoi(*_tzname);])],[ac_cv_var__tzname=yes],[ac_cv_var__tzname=no])])
|
|
- if test $ac_cv_var__tzname = yes; then
|
|
- U_TZNAME=_tzname
|
|
- U_HAVE_TZNAME=1
|
|
- else
|
|
- CONFIG_CPPFLAGS="${CONFIG_CPPFLAGS} -DU_HAVE_TZNAME=0"
|
|
- fi
|
|
-fi
|
|
AC_SUBST(U_HAVE_TZNAME)
|
|
AC_SUBST(U_TZNAME)
|
|
|
|
diff --git a/source/tools/tzcode/Makefile.in b/source/tools/tzcode/Makefile.in
|
|
index ac51771..3cfca55 100644
|
|
--- a/source/tools/tzcode/Makefile.in
|
|
+++ b/source/tools/tzcode/Makefile.in
|
|
@@ -137,7 +137,7 @@ $(ICUZDUMPTARG): $(srcdir)/icuzdump.cpp
|
|
$(LINK.cc) -I$(srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/toolutil -I$(top_srcdir)/io -pedantic $(srcdir)/icuzdump.cpp $(LIBICUUC) $(LIBICUDT) $(LIBICUI18N) $(LIBICUIO) $(LIBICUTOOLUTIL) -o $@
|
|
|
|
|
|
-$(TDATA): tdatamarker
|
|
+$(TDATA) $(XDATA): tdatamarker
|
|
|
|
tdatamarker: $(TZDATA)
|
|
mkdir $(VANGUARD_DIR)
|
|
--
|
|
2.48.1
|
|
|
|
|
|
From 35e9c78d1534c5240084b00bd01795870a892ab7 Mon Sep 17 00:00:00 2001
|
|
From: Alexander von Gluck IV <kallisti5@unixzen.com>
|
|
Date: Tue, 6 Feb 2024 15:04:41 -0600
|
|
Subject: common: prevent potential deadlocks back to ICU
|
|
|
|
|
|
diff --git a/source/configure.ac b/source/configure.ac
|
|
index a2db44d..cfad5a7 100644
|
|
--- a/source/configure.ac
|
|
+++ b/source/configure.ac
|
|
@@ -755,6 +755,7 @@ AC_SUBST(U_HAVE_POPEN)
|
|
U_HAVE_TZSET=0
|
|
AC_SUBST(U_HAVE_TZSET)
|
|
AC_SUBST(U_TZSET)
|
|
+CONFIG_CPPFLAGS="${CONFIG_CPPFLAGS} -DU_HAVE_TZSET=0"
|
|
|
|
U_HAVE_TZNAME=0
|
|
AC_SUBST(U_HAVE_TZNAME)
|
|
--
|
|
2.48.1
|
|
|
|
|
|
From a77c2f7f6a13f142afe38a047ec398f9fbab9b0d Mon Sep 17 00:00:00 2001
|
|
From: Augustin Cavalier <waddlesplash@gmail.com>
|
|
Date: Tue, 17 Sep 2024 13:55:44 -0400
|
|
Subject: udata: Load data from packages first on Haiku.
|
|
|
|
This avoids lots of stat() calls on startup to
|
|
look for files that are not present.
|
|
|
|
diff --git a/source/common/udata.cpp b/source/common/udata.cpp
|
|
index 68b6227..eb7a0f8 100644
|
|
--- a/source/common/udata.cpp
|
|
+++ b/source/common/udata.cpp
|
|
@@ -111,6 +111,10 @@ static u_atomic_int32_t gHaveTriedToLoadCommonData {0}; // See extendICUData()
|
|
static UHashtable *gCommonDataCache = nullptr; /* Global hash table of opened ICU data files. */
|
|
static icu::UInitOnce gCommonDataCacheInitOnce {};
|
|
|
|
+#ifdef __HAIKU__
|
|
+#define UDATA_DEFAULT_ACCESS UDATA_PACKAGES_FIRST
|
|
+#endif
|
|
+
|
|
#if !defined(ICU_DATA_DIR_WINDOWS)
|
|
static UDataFileAccess gDataFileAccess = UDATA_DEFAULT_ACCESS; // Access not synchronized.
|
|
// Modifying is documented as thread-unsafe.
|
|
--
|
|
2.48.1
|
|
|