From cf0e1f4a8a47994b010c2a7be513bf318218fbca Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 3 Apr 2025 10:29:57 -0400 Subject: [PATCH] icu4lua: remove package upstream is gone, package is orphaned, leaf package Co-authored-by: John Taylor closes: #54794 fixes: #53802 --- common/shlibs | 1 - srcpkgs/icu4lua-devel | 1 - srcpkgs/icu4lua/files/Makefile | 47 -------------- srcpkgs/icu4lua/files/icu4lua.pc.in | 11 ---- srcpkgs/icu4lua/patches/icu-68.patch | 94 ---------------------------- srcpkgs/icu4lua/template | 42 ------------- srcpkgs/icu4lua/update | 2 - srcpkgs/removed-packages/template | 2 + 8 files changed, 2 insertions(+), 198 deletions(-) delete mode 120000 srcpkgs/icu4lua-devel delete mode 100644 srcpkgs/icu4lua/files/Makefile delete mode 100644 srcpkgs/icu4lua/files/icu4lua.pc.in delete mode 100644 srcpkgs/icu4lua/patches/icu-68.patch delete mode 100644 srcpkgs/icu4lua/template delete mode 100644 srcpkgs/icu4lua/update diff --git a/common/shlibs b/common/shlibs index 0bd2d1fb7e4..a51d54d5472 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2507,7 +2507,6 @@ libmlt++-7.so.7 mlt7-7.0.1_1 libmlt-7.so.7 mlt7-7.0.1_1 libunibilium.so.4 unibilium-2.0.0_1 libtermkey.so.1 libtermkey-0.17_1 -libicu4lua.so.0 icu4lua-0.2B_1 libKF5I18n.so.5 ki18n-5.26.0_1 libKF5I18nLocaleData.so.5 ki18n-5.88.0_1 libglog.so.1 glog-0.6.0_1 diff --git a/srcpkgs/icu4lua-devel b/srcpkgs/icu4lua-devel deleted file mode 120000 index ae3bc8de3e7..00000000000 --- a/srcpkgs/icu4lua-devel +++ /dev/null @@ -1 +0,0 @@ -icu4lua \ No newline at end of file diff --git a/srcpkgs/icu4lua/files/Makefile b/srcpkgs/icu4lua/files/Makefile deleted file mode 100644 index 2b0b2788e98..00000000000 --- a/srcpkgs/icu4lua/files/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -VERSION?= 0.2B -DESTDIR?= / -PREFIX= $(DESTDIR)/usr -LIBDIR= $(PREFIX)/lib -INCDIR= $(PREFIX)/include - -SILENT?= -SOURCES= icu.c icu.collator.c icu.idna.c icu.normalizer.c icu.regex.c \ - icu.stringprep.c icu.ufile.c icu.ustring.c icu.utf8.c matchengine.c -OBJS= icu.o icu.collator.o icu.idna.o icu.normalizer.o icu.regex.o \ - icu.stringprep.o icu.ufile.o icu.ustring.o icu.utf8.o matchengine.o -HEADERS= formatting.h icu4lua.h matchengine.h -TARGET= libicu4lua.so -SO_MAJOR= 0 -SO_MINOR= 1 -SO_BUILD= 1 -SO_VER= $(SO_MAJOR).$(SO_MINOR).$(SO_BUILD) -ICU_CFLAGS= `pkg-config --cflags icu-i18n icu-io` -ICU_LIBS= `pkg-config --libs icu-i18n icu-io` -LUA_CFLAGS= `pkg-config --cflags lua5.1` -LUA_LIBS= `pkg-config --libs lua5.1` - -all: $(TARGET) - -$(TARGET): $(OBJS) - @echo "Linking $@ ..." - $(SILENT)$(CC) -shared -Wl,-soname,$(TARGET).$(SO_MAJOR) \ - -o $(TARGET).$(SO_VER) $(LDFLAGS) \ - $(OBJS) $(LIBS) $(LUA_LIBS) -L/usr/lib/icu $(ICU_LIBS) - -.c.o: - @echo "Compling $< ..." - $(SILENT)$(CC) $(CFLAGS) $(ICU_CFLAGS) $(LUA_CFLAGS) -o $@ -c $< - -install: $(TARGET) - @echo "Installing..." - install -d $(LIBDIR)/ - install -m 0755 $(TARGET).$(SO_VER) $(LIBDIR) - ln -s $(TARGET).$(SO_VER) $(LIBDIR)/$(TARGET).$(SO_MAJOR).$(SO_MINOR) - ln -s $(TARGET).$(SO_MAJOR).$(SO_MINOR) $(LIBDIR)/$(TARGET).$(SO_MAJOR) - ln -s $(TARGET).$(SO_MAJOR) $(LIBDIR)/$(TARGET) - install -d $(INCDIR)/icu4lua - install -m 0644 *.h $(INCDIR)/icu4lua - install -d $(LIBDIR)/pkgconfig - sed < icu4lua.pc.in -e "s;@VERSION@;$(VERSION);" \ - > $(LIBDIR)/pkgconfig/icu4lua.pc - diff --git a/srcpkgs/icu4lua/files/icu4lua.pc.in b/srcpkgs/icu4lua/files/icu4lua.pc.in deleted file mode 100644 index ea050ddbce3..00000000000 --- a/srcpkgs/icu4lua/files/icu4lua.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${exec_prefix}/incude - -Name: icu4lua -Description: Unicode support for Lua 5.1 -Version: @VERSION@ -Requires: icu-i18n icu-io -Libs: -L${libdir} -licu4lua -CFlags: -I${includedir}/icu4lua diff --git a/srcpkgs/icu4lua/patches/icu-68.patch b/srcpkgs/icu4lua/patches/icu-68.patch deleted file mode 100644 index 6971b049054..00000000000 --- a/srcpkgs/icu4lua/patches/icu-68.patch +++ /dev/null @@ -1,94 +0,0 @@ ---- a/src/icu.ustring.c.orig -+++ b/src/icu.ustring.c -@@ -38,7 +38,7 @@ - target_limit = target + ICU4LUA_UBUFFERSIZE; - for (;;) { - status = U_ZERO_ERROR; -- ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status); -+ ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status); - switch(status) { - case U_ZERO_ERROR: - icu4lua_addusize(&build_buffer, target - temp_buffer); -@@ -100,7 +100,7 @@ - - for (;;) { - status = U_ZERO_ERROR; -- ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status); -+ ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status); - switch(status) { - case U_BUFFER_OVERFLOW_ERROR: - luaL_addsize(&build_buffer, (const char*)target - (const char*)temp_buffer); -@@ -691,7 +691,7 @@ - lua_pushboolean(L, u_strCompare( - icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1), - icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2), -- TRUE -+ 1 - ) < 0); - return 1; - } -@@ -703,7 +703,7 @@ - lua_pushboolean(L, u_strCompare( - icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1), - icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2), -- TRUE -+ 1 - ) <= 0); - return 1; - } -@@ -733,7 +733,7 @@ - lua_pushboolean(L, u_strCompare( - icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1), - icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2), -- TRUE -+ 1 - ) < 0); - } - return 1; -@@ -759,7 +759,7 @@ - lua_pushboolean(L, u_strCompare( - icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1), - icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2), -- TRUE -+ 1 - ) <= 0); - } - return 1; -@@ -785,7 +785,7 @@ - lua_pushboolean(L, u_strCompare( - icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1), - icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2), -- TRUE -+ 1 - ) == 0); - } - return 1; ---- a/src/icu.utf8.c.orig -+++ b/src/icu.utf8.c -@@ -730,7 +730,7 @@ - UCharIterator iter_b; - uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len); - uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len); -- lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) < 0); -+ lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) < 0); - } - return 1; - } -@@ -746,7 +746,7 @@ - UCharIterator iter_b; - uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len); - uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len); -- lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) <= 0); -+ lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) <= 0); - } - return 1; - } -@@ -764,7 +764,7 @@ - UCharIterator iter_b; - uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len); - uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len); -- lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) == 0); -+ lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) == 0); - } - return 1; - } diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template deleted file mode 100644 index 05117c642db..00000000000 --- a/srcpkgs/icu4lua/template +++ /dev/null @@ -1,42 +0,0 @@ -# Template file for 'icu4lua' -pkgname=icu4lua -version=0.2B -revision=14 -create_wrksrc=yes -build_style=gnu-makefile -hostmakedepends="pkg-config unzip" -makedepends="icu-devel lua51-devel" -short_desc="Binary module for providing Unicode support to Lua" -maintainer="Orphaned " -license="MIT,X" -homepage="http://luaforge.net/projects/icu-lua/" -distfiles=" - http://files.luaforge.net/releases/icu-lua/icu-lua/${version}/ICU4Lua-${version}-src.zip - http://files.luaforge.net/releases/icu-lua/icu-lua/${version}/ICU4Lua-${version}-docs.zip" -checksum=" - 04368e7f7573f7e0d9ca4d9f06d760234ae51199e6e7682701a0fc0cfb5cd677 - d46449d77bc403e3258fd77e37de664148b0051fbd92a5d1c51b167370a26d02" - -CFLAGS="-fPIC" - -do_build() { - cp ${FILESDIR}/Makefile src - cp ${FILESDIR}/icu4lua.pc.in src - make -C src ${make_build_args} ${make_build_target} -} - -do_install() { - make -C src VERSION=${version} DESTDIR=${DESTDIR} install - vdoc doc/index.html -} - -icu4lua-devel_package() { - short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/share/doc - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - } -} diff --git a/srcpkgs/icu4lua/update b/srcpkgs/icu4lua/update deleted file mode 100644 index 6823d4e84ca..00000000000 --- a/srcpkgs/icu4lua/update +++ /dev/null @@ -1,2 +0,0 @@ -site=http://files.luaforge.net/releases/icu-lua/icu-lua -pattern="\K[\d]+\.[\d][A-Z]+" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 1bda5687114..470582d364c 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -314,6 +314,8 @@ replaces=" icecat-i18n-zh-CN<=78.6.1_1 icecat-i18n-zh-TW<=78.6.1_1 icecat<=78.6.1_1 + icu4lua-devel<=0.2B_14 + icu4lua<=0.2B_14 ilmbase-devel<=2.4.2_2 ilmbase<=2.4.2_2 ioquake3-rpi<=20130506_2