libicu: bump to 76.1

termux · Nov 11, 2024 · 5bf8789 · 5bf8789
1 parent 7ab7f49
commit 5bf8789
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 3 deletions.
diff --git a/packages/libicu/build.sh b/packages/libicu/build.sh
@@ -7,9 +7,9 @@ TERMUX_PKG_LICENSE_FILE="../LICENSE"
 TERMUX_PKG_MAINTAINER="@termux"
 # Never forget to always bump revision of reverse dependencies and rebuild them
 # when bumping "major" version.
-TERMUX_PKG_VERSION="75.1"
+TERMUX_PKG_VERSION="76.1"
 TERMUX_PKG_SRCURL=https://github.com/unicode-org/icu/releases/download/release-${TERMUX_PKG_VERSION//./-}/icu4c-${TERMUX_PKG_VERSION//./_}-src.tgz
-TERMUX_PKG_SHA256=cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef
+TERMUX_PKG_SHA256=dfacb46bfe4747410472ce3e1144bf28a102feeaa4e3875bac9b4c6cf30f4f3e
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_UPDATE_METHOD=repology
 TERMUX_PKG_DEPENDS="libc++"
@@ -27,7 +27,7 @@ termux_step_post_get_source() {
 }
 
 termux_step_post_massage() {
-	local _GUARD_FILE="lib/libicuuc.so.75"
+	local _GUARD_FILE="lib/libicuuc.so.76"
 	if [ ! -e "${_GUARD_FILE}" ]; then
 		termux_error_exit "Error: file ${_GUARD_FILE} not found."
 	fi

diff --git a/packages/libicu/source-Makefile.in.patch b/packages/libicu/source-Makefile.in.patch
@@ -0,0 +1,43 @@
+Lots of libraries don't use libicu libs properly. For example, in `samba`, it uses `u_strToUTF8` which
+is declared in `icu-uc`, but it searches `icu-i18n` through pkg-config.
+
+Equivalent to revert commit https://github.com/unicode-org/icu/commit/199bc827021ffdb43b6579d68e5eecf54c7f6f56
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -275,7 +275,7 @@
+ 	@cat config/icu.pc > $@
+ 	@echo "Description: $(PACKAGE_ICU_DESCRIPTION): Common and Data libraries" >> $@
+ 	@echo "Name: $(PACKAGE)-uc" >> $@
+-ifeq ($(ENABLE_SHARED),)
++ifeq (,)
+ 	@echo "Libs:" '-L$${libdir}' "${ICULIBS_UC}" "${ICULIBS_DT}" '$${baselibs}' >> $@
+ else
+ 	@echo "Libs:" '-L$${libdir}' "${ICULIBS_UC}" >> $@
+@@ -287,7 +287,7 @@
+ 	@cat config/icu.pc > $@
+ 	@echo "Description: $(PACKAGE_ICU_DESCRIPTION): Internationalization library" >> $@
+ 	@echo "Name: $(PACKAGE)-i18n" >> $@
+-ifeq ($(ENABLE_SHARED),)
++ifeq (,)
+ 	@echo "Requires: icu-uc" >> $@
+ else
+ 	@echo "Requires.private: icu-uc" >> $@
+@@ -299,7 +299,7 @@
+ 	@cat config/icu.pc > $@
+ 	@echo "Description: $(PACKAGE_ICU_DESCRIPTION): Stream and I/O Library" >> $@
+ 	@echo "Name: $(PACKAGE)-io" >> $@
+-ifeq ($(ENABLE_SHARED),)
++ifeq (,)
+ 	@echo "Requires: icu-i18n" >> $@
+ else
+ 	@echo "Requires.private: icu-i18n" >> $@
+@@ -318,7 +318,7 @@
+ 	@cat config/icu.pc > $@
+ 	@echo "Description: $(PACKAGE_ICU_DESCRIPTION): Paragraph Layout library $(USING_HB)" >> $@
+ 	@echo "Name: $(PACKAGE)-lx" >> $@
+-ifeq ($(ENABLE_SHARED),)
++ifeq (,)
+ ifneq ($(ICULEHB_LIBS),)
+ 	@echo "Requires: icu-le-hb icu-uc" >> $@
+ else