From 005f560e6d181c33bb3271f416cebd483bf219be Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sun, 7 Mar 2021 11:51:38 +0100 Subject: [PATCH] 0ad: update to 0.0.24b. --- srcpkgs/0ad/patches/remove-macos-include.patch | 11 ----------- srcpkgs/0ad/template | 13 ++++--------- 2 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 srcpkgs/0ad/patches/remove-macos-include.patch diff --git a/srcpkgs/0ad/patches/remove-macos-include.patch b/srcpkgs/0ad/patches/remove-macos-include.patch deleted file mode 100644 index 9e6cc6189c..0000000000 --- a/srcpkgs/0ad/patches/remove-macos-include.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- source/ps/tests/stub_impl_hack.cpp.orig 2021-03-01 11:33:10.873986567 +0100 -+++ source/ps/tests/stub_impl_hack.cpp 2021-03-01 11:35:37.991089218 +0100 -@@ -13,7 +13,7 @@ - #include - - bool suite_TestDummy_init = false; --#include "/Users/wfg/Jenkins/workspace/macOS-all-bundles/source/ps/tests/stub_impl_hack.h" -+#include "stub_impl_hack.h" - - static TestDummy suite_TestDummy; - diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template index f98525f995..ba58de90f3 100644 --- a/srcpkgs/0ad/template +++ b/srcpkgs/0ad/template @@ -1,9 +1,9 @@ # Template file for '0ad' pkgname=0ad -version=0.0.24 -revision=2 +version=0.0.24b +revision=1 archs="x86_64* i686* aarch64* armv7l* ppc64le*" -create_wrksrc=yes +wrksrc="${pkgname}-${version}-alpha" hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang" makedepends="SDL2-devel boost-devel gloox-devel libcurl-devel libenet-devel libopenal-devel libpng-devel libsodium-devel libxml2-devel miniupnpc-devel @@ -14,7 +14,7 @@ maintainer="Helmut Pozimski " 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}-alpha-unix-build.tar.xz" -checksum=00aee2d2f11e48b169be41ddad8090e49f8173c09242fc2fa4a0d44e4763cc53 +checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8 nocross="uses bundled third-party libraries that do not cross-compile" CXXFLAGS="-fpermissive" @@ -27,11 +27,6 @@ if [ "$XBPS_TARGET_LIBC" = musl ]; then makedepends+=" libexecinfo-devel" fi - -do_extract() { - bsdtar xJf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-${version}-alpha-unix-build.tar.xz -C ${wrksrc} -} - post_patch() { if [ "$XBPS_TARGET_LIBC" = "musl" ]; then echo "TARGET_LINK_LIBRARIES(nvcore execinfo)" >> \