From f284afab44b9819fe9c735dee44faae5ebb5a36b Mon Sep 17 00:00:00 2001 From: Job Bautista Date: Sun, 19 Mar 2023 00:25:08 +0800 Subject: [PATCH] [Pale-Moon] Issue MoonchildProductions/UXP#2165 - Support ICU as shared library in packaging. Also removing obsolete MOZ_SYSTEM_ICU --- application/palemoon/installer/Makefile.in | 4 ++-- application/palemoon/installer/package-manifest.in | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/application/palemoon/installer/Makefile.in b/application/palemoon/installer/Makefile.in index 770ab9ba74..0547108488 100644 --- a/application/palemoon/installer/Makefile.in +++ b/application/palemoon/installer/Makefile.in @@ -136,8 +136,8 @@ AB = $(firstword $(subst -, ,$(AB_CD))) DEFINES += -DAB=$(AB) DEFINES += -DMOZ_ICU_VERSION=$(MOZ_ICU_VERSION) -ifdef MOZ_SYSTEM_ICU -DEFINES += -DMOZ_SYSTEM_ICU +ifdef MOZ_SHARED_ICU +DEFINES += -DMOZ_SHARED_ICU endif ifdef MOZ_ICU_DATA_ARCHIVE DEFINES += -DMOZ_ICU_DATA_ARCHIVE diff --git a/application/palemoon/installer/package-manifest.in b/application/palemoon/installer/package-manifest.in index 7c56d17f88..eee4f4699c 100644 --- a/application/palemoon/installer/package-manifest.in +++ b/application/palemoon/installer/package-manifest.in @@ -89,6 +89,15 @@ #ifdef MOZ_ICU_DATA_ARCHIVE @RESPATH@/@ICU_DATA_FILE@ #endif +#ifdef MOZ_SHARED_ICU +#ifdef XP_WIN +@BINPATH@/icu@MOZ_ICU_VERSION@.dll +#elif defined(XP_MACOSX) +@BINPATH@/icu@MOZ_ICU_VERSION@.dylib +#elif defined(XP_UNIX) +@BINPATH@/libicu@MOZ_ICU_VERSION@.so +#endif +#endif #ifdef MOZ_GTK3 @BINPATH@/@DLL_PREFIX@mozgtk@DLL_SUFFIX@ @BINPATH@/gtk2/@DLL_PREFIX@mozgtk@DLL_SUFFIX@