[PR PATCH] 0ad-0.0.24b

[PR PATCH] 0ad-0.0.24b

[Hoshpak]

[-- Attachment #1: Type: text/plain, Size: 304 bytes --]

There is a new pull request by Hoshpak against master on the void-packages repository

https://github.com/Hoshpak/void-packages 0ad-0.0.24b
https://github.com/void-linux/void-packages/pull/29287

0ad-0.0.24b
None

A patch file from https://github.com/void-linux/void-packages/pull/29287.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-0ad-0.0.24b-29287.patch --]
[-- Type: text/x-diff, Size: 3967 bytes --]

From 20c60e0ab6fa849a724166ab9ebe9e32db101590 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Mar 2021 11:51:38 +0100
Subject: [PATCH 1/2] 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 9e6cc6189c8..00000000000
--- 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 <cxxtest/TestMain.h>
- 
- 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 f98525f995b..ba58de90f39 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 <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}-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)" >> \

From 944b99542d3ef65e8f08413066ea45078437e0df Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Mar 2021 11:51:41 +0100
Subject: [PATCH 2/2] 0ad-data: update to 0.0.24b.

---
 srcpkgs/0ad-data/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 0a4c8ab0108..689f6594d3d 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,14 +1,14 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.24
+version=0.0.24b
 revision=1
-create_wrksrc=yes
+wrksrc="${pkgname%-data}-${version}-alpha"
 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}-alpha-unix-data.tar.xz"
-checksum=929a55a6aa63c143b7fd20553375878a2e732353dbbcc757fa876b4181fdd75a
+checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -16,10 +16,6 @@ case "$XBPS_TARGET_MACHINE" in
 	*) broken="no base game available";;
 esac
 
-do_extract() {
-	bsdtar xJf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/0ad-${version}-alpha-unix-data.tar.xz -C ${wrksrc}
-}
-
 do_install() {
 	vmkdir usr/share/0ad/data
 	vmkdir usr/share/0ad/data/tools

Re: 0ad-0.0.24b

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 198 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29287#issuecomment-792420054

Comment:
Might be nice to take the opportunity to fix the tests :_

Re: [PR PATCH] [Merged]: 0ad-0.0.24b

[Hoshpak]

[-- Attachment #1: Type: text/plain, Size: 149 bytes --]

There's a merged pull request on the void-packages repository

0ad-0.0.24b
https://github.com/void-linux/void-packages/pull/29287

Description:
None