From 09138ab01d20893e53f3a7fdb0fe62984bc784bd Mon Sep 17 00:00:00 2001
From: roytam1 <roytam@gmail.com>
Date: Tue, 28 Mar 2023 13:59:47 +0800
Subject: [PATCH] [Basilisk] Issue MoonchildProductions/UXP#2165 - Support ICU
 as shared library in packaging.

Also removing obsolete MOZ_SYSTEM_ICU
---
 application/basilisk/installer/Makefile.in         | 4 ++--
 application/basilisk/installer/package-manifest.in | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/application/basilisk/installer/Makefile.in b/application/basilisk/installer/Makefile.in
index 83fa01518f..cab18236d3 100644
--- a/application/basilisk/installer/Makefile.in
+++ b/application/basilisk/installer/Makefile.in
@@ -129,8 +129,8 @@ endif
 DEFINES += -DLPROJ_ROOT=$(LPROJ_ROOT)
 
 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/basilisk/installer/package-manifest.in b/application/basilisk/installer/package-manifest.in
index c976577dc1..223341a4a2 100644
--- a/application/basilisk/installer/package-manifest.in
+++ b/application/basilisk/installer/package-manifest.in
@@ -105,6 +105,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@