void-linux · BeedPro · Jul 29, 2026
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
@@ -1,13 +1,13 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.27.0
+version=0.28.0
 revision=1
 short_desc="Historically-based real-time strategy game (data files)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
-distfiles="https://releases.wildfiregames.com/0ad-${version}-unix-data.tar.xz"
-checksum=3e48855ab8e1ef81270338462c8270b015213f14f5e054aab92ad74d5ea59dea
+distfiles="${SOURCEFORGE_SITE}/zero-ad/releases/0ad-${version}-unix-data.tar.xz"
+checksum=e844b30ae2102c47e0a4fff2f0e0ef05ba0cebb1890aa72276fa12457c39526f
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|aarch64*|armv7l*|ppc64le*|riscv64*) ;;

diff --git a/srcpkgs/0ad/patches/boost-system.patch b/srcpkgs/0ad/patches/boost-system.patch
diff --git a/srcpkgs/0ad/patches/disable-font-rendering-test.patch b/srcpkgs/0ad/patches/disable-font-rendering-test.patch
@@ -1,29 +1,24 @@
-diff --git a/source/gui/tests/test_CGUIText.h b/source/gui/tests/test_CGUIText.h
-index dd779c6..735fb79 100644
 --- a/source/gui/tests/test_CGUIText.h
 +++ b/source/gui/tests/test_CGUIText.h
-@@ -316,24 +316,6 @@ public:
- 		TS_ASSERT_EQUALS(text.GetSize().Height, lineHeight + padding * 2);
- 	}
-
--	void test_regression_rP26522()
--	{
--		TS_ASSERT_OK(g_VFS->Mount(L"", DataDir() / "mods" / "mod" / "", VFS_MOUNT_MUST_EXIST));
--
+@@ -341,21 +341,5 @@ public:
+ 	void test_regression_rP26522()
+ 	{
 -		CGUI gui{*g_ScriptContext};
 -
--		const CStrW font = L"sans-bold-13";
+-		const CStrW font{L"sans-bold-13"};
+-		CFontMetrics fontMetrics{CStrIntern(font.ToUTF8())};
+-		const float lineHeight{fontMetrics.GetCapHeight()};
+-		const float lineSpacing{fontMetrics.GetHeight()};
+-
 -		CGUIString string;
 -		CGUIText text;
 -
 -		// rP26522 introduced a bug that triggered in rare cases with word-wrapping.
 -		string.SetValue(L"90–120 min");
--		text = CGUIText(gui, string, L"sans-bold-13", 53, 8.f, EAlign::LEFT, nullptr);
+-		text = CGUIText(gui, string, font, 53, 8.f, EAlign::LEFT, nullptr);
 -
 -		TS_ASSERT_EQUALS(text.GetTextCalls().size(), 2);
--		TS_ASSERT_EQUALS(text.GetSize().Height, 14 + 9 + 8 * 2);
--	}
--
+-		TS_ASSERT_EQUALS(text.GetSize().Height, lineHeight + lineSpacing + 8 * 2);
+ 	}
+ 
  	void test_multiple_blank_spaces()
- 	{
- 		CGUI gui{*g_ScriptContext};
diff --git a/srcpkgs/0ad/patches/ignore-printf-hs-test.patch b/srcpkgs/0ad/patches/ignore-printf-hs-test.patch
@@ -2,19 +2,17 @@ diff --git a/source/lib/tests/test_secure_crt.h1 b/source/lib/tests/test_secure_
 index 530e998a474..45d81a94306 100644
 --- a/source/lib/tests/test_secure_crt.h1
 +++ b/source/lib/tests/test_secure_crt.h
-@@ -351,13 +351,13 @@ public:
+@@ -351,13 +351,11 @@ public:
  	void test_printf_strings()
  	{
  		TEST_PRINTF(d10,10, s10, 3, "123", "%s", "123");
 -		TEST_PRINTF(d10,10, s10, 3, "123", "%hs", "123");
-+		//TEST_PRINTF(d10,10, s10, 3, "123", "%hs", "123");
  		TEST_PRINTF(d10,10, s10, 3, "123", "%ls", L"123");
  	}
 
  	void test_wprintf_strings()
  	{
 -		TEST_WPRINTF(wd10,10, ws10, 3, L"123", L"%hs", "123");
-+		//TEST_WPRINTF(wd10,10, ws10, 3, L"123", L"%hs", "123");
  		TEST_WPRINTF(wd10,10, ws10, 3, L"123", L"%ls", L"123");
  	}
  };
diff --git a/srcpkgs/0ad/patches/no-fetch.patch b/srcpkgs/0ad/patches/no-fetch.patch
@@ -1,52 +1,50 @@
---- a/libraries/source/spidermonkey/build.sh	2025-07-20 09:04:51.166563011 +0200
-+++ b/libraries/source/spidermonkey/build.sh	2025-07-20 09:05:05.010183649 +0200
-@@ -48,8 +48,8 @@
+--- a/libraries/source/spidermonkey/build.sh
++++ b/libraries/source/spidermonkey/build.sh
+@@ -68,14 +68,6 @@ if [ ! -e "${FOLDER}.tar.xz" ]; then
  fi
 
  # unpack
 -rm -Rf "${FOLDER}"
--"${TAR}" xfJ "${FOLDER}.tar.xz"
-+#rm -Rf "${FOLDER}"
-+#"${TAR}" xfJ "${FOLDER}.tar.xz"
+-"${TAR}" xfJ "${FOLDER}.tar.xz" \
+-	--exclude=js/src/tests/non262 \
+-	--exclude=js/src/tests/test262 \
+-	--exclude=js/src/jit-test \
+-	--exclude=python/mozperftest \
+-	--exclude=testing/web-platform \
+-	--exclude=third_party/rust/mp4parse/link-u-avif-sample-images
 
  # patch
  (
---- a/libraries/source/cxxtest-4.4/build.sh	2025-07-20 09:05:54.328960135 +0200
-+++ b/libraries/source/cxxtest-4.4/build.sh	2025-07-20 09:06:06.904645296 +0200
-@@ -41,8 +41,8 @@
+--- a/libraries/source/cxxtest-4.4/build.sh
++++ b/libraries/source/cxxtest-4.4/build.sh
+@@ -41,8 +41,6 @@ if [ ! -e "cxxtest-${PV}.tar.gz" ]; then
  fi
 
  # unpack
 -rm -Rf "cxxtest-${PV}"
 -"${TAR}" -xf "cxxtest-${PV}.tar.gz"
-+#rm -Rf "cxxtest-${PV}"
-+#"${TAR}" -xf "cxxtest-${PV}.tar.gz"
 
  # patch
  patch -d "cxxtest-${PV}" -p1 <patches/0001-Add-Debian-python3-patch.patch
---- a/libraries/source/fcollada/build.sh	2025-07-20 09:06:43.431724677 +0200
-+++ b/libraries/source/fcollada/build.sh	2025-07-20 09:06:54.919433333 +0200
-@@ -43,8 +43,8 @@
+--- a/libraries/source/fcollada/build.sh
++++ b/libraries/source/fcollada/build.sh
+@@ -57,8 +57,6 @@ if [ ! -e "fcollada-${PV}.tar.xz" ]; then
  fi
 
  # unpack
 -rm -Rf fcollada-${PV}
 -"${TAR}" xf fcollada-${PV}.tar.xz
-+#rm -Rf fcollada-${PV}
-+#"${TAR}" xf fcollada-${PV}.tar.xz
 
  # build
  (
---- a/libraries/source/nvtt/build.sh	2025-07-20 09:07:03.352218930 +0200
-+++ b/libraries/source/nvtt/build.sh	2025-07-20 09:07:16.270889606 +0200
-@@ -43,8 +43,8 @@
+--- a/libraries/source/nvtt/build.sh
++++ b/libraries/source/nvtt/build.sh
+@@ -57,8 +57,6 @@ if [ ! -e "nvtt-${PV}.tar.xz" ]; then
  fi
 
  # unpack
 -rm -Rf nvtt-${PV}
 -"${TAR}" xf nvtt-${PV}.tar.xz
-+#rm -Rf nvtt-${PV}
-+#"${TAR}" xf nvtt-${PV}.tar.xz
 
  # patch
  patch -d nvtt-${PV} -p1 <patches/0001-Don-t-overspecify-flags.patch
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
@@ -1,30 +1,29 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.27.1
-revision=6
+version=0.28.0
+revision=1
 archs="x86_64* i686* aarch64* armv7l* ppc64le* riscv64*"
 # Unclear whether ppc64le and riscv64 will work, though upstream seems to support them
 build_helper=rust
 _cxxtest_version=4.4
 _fcollada_version=28209
 _nvtt_version=28209
-hostmakedepends="pkg-config perl cmake python3 rust cargo yasm llvm xz m4
- premake5 subversion"
+hostmakedepends="pkg-config perl cmake python3 rust cargo yasm llvm xz tar m4
+ subversion libuuid-devel"
 makedepends="SDL2-devel boost-devel-minimal libboost_filesystem
  gloox-devel libcurl-devel libenet-devel
  libopenal-devel libpng-devel libsodium-devel libxml2-devel miniupnpc-devel
- nspr-devel wxWidgets-gtk3-devel fmt-devel freetype-devel mozjs115-devel"
+ nspr-devel wxWidgets-gtk3-devel fmt-devel freetype-devel mozjs128-devel"
 depends="0ad-data"
 checkdepends="0ad-data"
 short_desc="Historically-based real-time strategy game"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
-distfiles="
-https://releases.wildfiregames.com/${pkgname}-${version}-unix-build.tar.xz
+distfiles="${SOURCEFORGE_SITE}/zero-ad/releases/${pkgname}-${version}-unix-build.tar.xz
 https://github.com/CxxTest/cxxtest/archive/refs/tags/${_cxxtest_version}.tar.gz>cxxtest-${_cxxtest_version}.tar.gz"
-checksum="a0a5355eeb5968d24f283770736150d974dafecba07754d4662707dc17016bfb
- 1c154fef91c65dbf1cd4519af7ade70a61d85a923b6e0c0b007dc7f4895cf7d8"
+checksum="27e217755ef76a922fe58dbf593d96e54b6ed2375d23f548c35619aa6bd5a42a
+1c154fef91c65dbf1cd4519af7ade70a61d85a923b6e0c0b007dc7f4895cf7d8"
 skip_extraction="cxxtest-${_cxxtest_version}.tar.gz"
 lib32disabled=yes
 
@@ -43,16 +42,16 @@ post_extract() {
 	msg_normal "Extracting cxxtest-${_cxxtest_version}"
 	vsrcextract -C ${wrksrc}/libraries/source/cxxtest-${_cxxtest_version}/ --no-strip-components cxxtest-${_cxxtest_version}.tar.gz
 	msg_normal "Fetching fcollada from svn\n"
+	rm -rf ${wrksrc}/libraries/source/fcollada/fcollada-${_fcollada_version}
 	svn export --quiet https://svn.wildfiregames.com/public/source-libs/trunk/fcollada@${_fcollada_version} ${wrksrc}/libraries/source/fcollada/fcollada-${_fcollada_version}
 	msg_normal "Fetching nvtt from svn\n"
+	rm -rf ${wrksrc}/libraries/source/nvtt/nvtt-${_nvtt_version}
 	svn export --quiet https://svn.wildfiregames.com/public/source-libs/trunk/nvtt@${_nvtt_version} ${wrksrc}/libraries/source/nvtt/nvtt-${_nvtt_version}
 }
 
 post_patch() {
 	msg_normal "Applying patch 0ad/files/nvtt-ppc-musl.patch\n"
 	patch -sNp1 -i ${FILESDIR}/nvtt-ppc-musl.patch -d ${wrksrc}/libraries/source/nvtt/nvtt-${_nvtt_version}
-	msg_normal "Applying patch 0ad/files/nvtt-ppc64.patch\n"
-	patch -sNp1 -i ${FILESDIR}/nvtt-ppc64.patch -d ${wrksrc}/libraries/source/nvtt/nvtt-${_nvtt_version}
 
 	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 		echo "TARGET_LINK_LIBRARIES(nvcore execinfo)" >> \
@@ -69,14 +68,18 @@ do_build() {
 			;;
 	esac
 
-	_build_options="--with-system-premake5 --with-lto --with-system-mozjs "
+	_build_options="--with-lto --with-system-mozjs "
 	if [ -n "$CROSS_BUILD" ]; then
 		_build_options+="--without-tests "
 	fi
 
 	cd ${wrksrc}/libraries
 	msg_normal "Building libraries\n"
 
+	env CC=cc CXX=g++ AR=ar STRIP=strip RANLIB=ranlib \
+		CFLAGS= CXXFLAGS= CPPFLAGS= LDFLAGS= \
+		./source/premake-core/build.sh
+
 	# These have to be set separately, as passing extra arguments errors out
 	./build-source-libs.sh --with-system-premake --with-system-mozjs