Merge a9d2cb5c98 into cc03789145

upstream is gone, package is orphaned, leaf package

Co-authored-by: John Taylor <gitea@johntaylor.hu>

closes: #54794
fixes: #53802

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

srcpkgs/discord/template

@@ -1,6 +1,6 @@
 # Template file for 'discord'
 pkgname=discord
-version=0.0.89
+version=0.0.90
 revision=1
 archs="x86_64"
 depends="alsa-lib dbus-glib gtk+3 libnotify nss libXtst libcxx libatomic
@@ -10,7 +10,7 @@ maintainer="Ryan Conwell <ryanconwell@protonmail.com>"
 license="custom:Proprietary"
 homepage="https://discord.com"
 distfiles="https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"
-checksum=ef833648024b4bcbb7ee6d9b128fd86e5abcdb611b59665fa4b7f97a6bd3bac1
+checksum=99f428ef51b86796700eba16888d96e436f98ac331771e05c376fa5fee27ec58
 repository=nonfree
 restricted=yes
 nopie=yes

srcpkgs/godot/patches/20-fix-musl.patch

@@ -0,0 +1,18 @@
+diff --git a/thirdparty/manifold/src/sparse.h b/thirdparty/manifold/src/sparse.h
+index a25ea61141..82ba7c5af6 100644
+--- a/thirdparty/manifold/src/sparse.h
++++ b/thirdparty/manifold/src/sparse.h
+@@ -40,11 +40,13 @@ class SparseIndices {
+   // such that the indices are sorted by (p << 32) | q
+  public:
+ #if defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN ||                 \
++	defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ ||                 \
+     defined(__BIG_ENDIAN__) || defined(__ARMEB__) || defined(__THUMBEB__) || \
+     defined(__AARCH64EB__) || defined(_MIBSEB) || defined(__MIBSEB) ||       \
+     defined(__MIBSEB__)
+   static constexpr size_t pOffset = 0;
+ #elif defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN ||          \
++	defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ ||                 \
+     defined(__LITTLE_ENDIAN__) || defined(__ARMEL__) ||                    \
+     defined(__THUMBEL__) || defined(__AARCH64EL__) || defined(_MIPSEL) ||  \
+     defined(__MIPSEL) || defined(__MIPSEL__) || defined(__EMSCRIPTEN__) || \

srcpkgs/godot/template

@@ -1,7 +1,7 @@
 # Template file for 'godot'
 pkgname=godot
-version=4.3
-revision=7
+version=4.4.1
+revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
 make_build_args="platform=linuxbsd target=editor progress=no production=yes
@@ -25,7 +25,7 @@ maintainer="dataCobra <datacobra@thinkbot.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/godot/archive/${version}-stable.tar.gz"
-checksum=6a441d02957432d76343052296dc514b1b6bd72af920c9f2518b1ec3cb534874
+checksum=a486c523494e155b6912a607b5813577f8f39285f8ad43ac76cb9141edad9888
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"

srcpkgs/icu4lua-devel

@@ -1 +0,0 @@
-icu4lua

srcpkgs/icu4lua/files/Makefile

@@ -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
-

srcpkgs/icu4lua/files/icu4lua.pc.in

@@ -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

srcpkgs/icu4lua/patches/icu-68.patch

@@ -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;
- }

srcpkgs/icu4lua/template

@@ -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 <orphan@voidlinux.org>"
-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"
-	}
-}

srcpkgs/icu4lua/update

@@ -1,2 +0,0 @@
-site=http://files.luaforge.net/releases/icu-lua/icu-lua
-pattern="\K[\d]+\.[\d][A-Z]+"

srcpkgs/limine/template

@@ -1,6 +1,6 @@
 # Template file for 'limine'
 pkgname=limine
-version=9.2.1
+version=9.2.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-all TOOLCHAIN_FOR_TARGET=llvm"
@@ -11,7 +11,7 @@ license="BSD-2-Clause"
 homepage="https://limine-bootloader.org/"
 changelog="https://raw.githubusercontent.com/limine-bootloader/limine/trunk/ChangeLog"
 distfiles="https://github.com/limine-bootloader/limine/releases/download/v${version}/limine-${version}.tar.gz"
-checksum=c87afc14c38a9569529249a41800c2e91e0f1ceeed1e4dfc830ac94bf9cfbefb
+checksum=b83decd75effba101e4427b1efc81748cf73201c85be36e3795ca090f5f08083
 
 post_install() {
 	vlicense COPYING

srcpkgs/lua54-luaposix/template

@@ -9,7 +9,7 @@ _desc="POSIX library for Lua programming language"
 short_desc="${_desc} (5.4.x)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="http://luaforge.net/projects/luaposix/"
+homepage="https://luaposix.github.io/luaposix/"
 distfiles="https://github.com/luaposix/luaposix/archive/refs/tags/v${version}.tar.gz"
 checksum=a4edf2f715feff65acb009e8d1689e57ec665eb79bc36a6649fae55eafd56809
 lib32disabled=yes

srcpkgs/opera/template

@@ -1,6 +1,6 @@
 # Template file for 'opera'
 pkgname=opera
-version=116.0.5366.71
+version=117.0.5408.93
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -10,7 +10,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:Proprietary"
 homepage="https://www.opera.com/computer"
 distfiles="https://get.geo.opera.com/pub/opera/desktop/${version}/linux/opera-stable_${version}_amd64.rpm"
-checksum=d6b15ab8cdd5288104d16fb408826175a1c9ed99ce8631ae59c238294212be7c
+checksum=a094adf3865839270ee9967155c266d670c3f3bd00e986b4125eb57d814374e4
 repository="nonfree"
 nostrip=yes
 

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

srcpkgs/xdg-user-dirs-gtk/template

@@ -1,20 +1,14 @@
 # Template file for 'xdg-user-dirs-gtk'
 pkgname=xdg-user-dirs-gtk
-version=0.11
+version=0.14
 revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool xdg-user-dirs"
-makedepends="gtk+3-devel xdg-user-dirs"
+build_style=meson
+hostmakedepends="pkg-config xdg-user-dirs gettext"
+makedepends="gtk+3-devel"
 depends="xdg-user-dirs"
 short_desc="GTK+ tool to help manage user directories"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/xdg-user-dirs-gtk/${version}/xdg-user-dirs-gtk-${version}.tar.xz"
-checksum=534bd563d3c0e3f8dcbf3578cb8ab0e49d3ba41c966d477c8af9438364121e7d
-
-post_patch() {
-       vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
-               -e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
-               configure
-}
+checksum=537fbe142b24736ed7894e4a01f69fd758cb6c7a677a382879529d217f4a2873