[PR PATCH] srb2: update to 2.2.10

[PR PATCH] srb2: update to 2.2.10

[oreo639]

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

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

https://github.com/oreo639/void-packages srb2
https://github.com/void-linux/void-packages/pull/36015

srb2: update to 2.2.10
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-srb2-36015.patch --]
[-- Type: text/x-diff, Size: 3719 bytes --]

From ee27fb4f43832967ebe4fee8b01310c302e52ed0 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 6 Mar 2022 17:54:03 -0800
Subject: [PATCH] srb2: update to 2.2.10

---
 srcpkgs/srb2/patches/comptime.patch        | 19 +++++++++++++++++++
 srcpkgs/srb2/patches/libadd-execinfo.patch | 12 ------------
 srcpkgs/srb2/template                      | 14 +++++++-------
 3 files changed, 26 insertions(+), 19 deletions(-)
 create mode 100644 srcpkgs/srb2/patches/comptime.patch
 delete mode 100644 srcpkgs/srb2/patches/libadd-execinfo.patch

diff --git a/srcpkgs/srb2/patches/comptime.patch b/srcpkgs/srb2/patches/comptime.patch
new file mode 100644
index 000000000000..5d0c2167b2ac
--- /dev/null
+++ b/srcpkgs/srb2/patches/comptime.patch
@@ -0,0 +1,19 @@
+diff -Naur comptime.sh comptime.sh.new
+--- a/SRB2-SRB2_release_2.2.10/comptime.sh	2022-03-06 13:52:43.000000000 -0800
++++ b/SRB2-SRB2_release_2.2.10/comptime.sh	2022-03-06 17:05:02.725041025 -0800
+@@ -40,13 +40,14 @@
+ const char* compbranch = "Unknown";
+ const char* comprevision = "illegal";
+ EOF
++exit 0
+ }
+ 
+ compversion() {
+ touch $path/comptime.c
+-versionfake
+ test -d $path/.svn && versionsvn
+ test -d $path/../.git && versiongit
++versionfake
+ exit 1
+ }
+ 
diff --git a/srcpkgs/srb2/patches/libadd-execinfo.patch b/srcpkgs/srb2/patches/libadd-execinfo.patch
deleted file mode 100644
index faa8fb25a687..000000000000
--- a/srcpkgs/srb2/patches/libadd-execinfo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur SRB2-SRB2_release_2.2.9/src/sdl/MakeNIX.cfg SRB2-SRB2_release_2.2.9.orig/src/sdl/MakeNIX.cfg
---- a/SRB2-SRB2_release_2.2.9/src/sdl/MakeNIX.cfg	2021-05-07 00:06:51.901546000 -0700
-+++ b/SRB2-SRB2_release_2.2.9/src/sdl/MakeNIX.cfg	2021-05-06 19:38:24.000000000 -0700
-@@ -22,7 +22,7 @@
- 	OPTS=-DUNIXCOMMON
- 
- 	#LDFLAGS = -L/usr/local/lib
-+	LIBS+=-lm
--	LIBS=-lm
- ifdef LINUX
- 	LIBS+=-lrt
- ifdef NOTERMIOS
diff --git a/srcpkgs/srb2/template b/srcpkgs/srb2/template
index a181643caa8e..f966b5e88a6c 100644
--- a/srcpkgs/srb2/template
+++ b/srcpkgs/srb2/template
@@ -1,7 +1,7 @@
 # Template file for 'srb2'
 pkgname=srb2
-version=2.2.9
-revision=2
+version=2.2.10
+revision=1
 create_wrksrc=true
 build_wrksrc="SRB2-SRB2_release_${version}"
 build_style=gnu-makefile
@@ -16,8 +16,8 @@ license="GPL-2.0-or-later"
 homepage="https://srb2.org/"
 distfiles="https://github.com/STJr/SRB2/archive/SRB2_release_${version}.tar.gz
  https://github.com/STJr/SRB2/releases/download/SRB2_release_${version}/SRB2-v${version//./}-Full.zip"
-checksum="5f7eeb08e90323e28cdcb02ad25c904eef25ce75316720609b995a1e4ffd154a
- 48e644604bed81b5ce6b12ef23a2f4042d0118d0ba70f18c534dfe86ebe6f37d"
+checksum="feb3a95a15ea04218282e5c4f01ae3733672e14d219e2792dcfc500dcf89a3c2
+ e69ac5cacc86f85eeaba14644a37cad932f7d7031b667892d2f9ba9bfb437d25"
 restricted=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -28,7 +28,7 @@ esac
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" libexecinfo-devel"
-	export LIBS="-lexecinfo"
+	export LDFLAGS="-lexecinfo"
 fi
 
 if [ -n "$CROSS_BUILD" ]; then
@@ -36,7 +36,7 @@ if [ -n "$CROSS_BUILD" ]; then
 fi
 
 do_install() {
-	vbin bin/Linux/Release/${pkgname}
+	vbin bin/${pkgname}
 
 	PROGRAM_NAME="${pkgname}" PROGRAM_DESCRIPTION="${short_desc}" \
 		PACKAGE_INSTALL_PATH="/usr/bin" PROGRAM_FILENAME="${pkgname}" \
@@ -45,7 +45,7 @@ do_install() {
 	vinstall srb2.png 644 /usr/share/pixmaps/
 	vinstall srb2.desktop 644 /usr/share/applications/
 	vmkdir /usr/share/games/SRB2
-	for f in {music,player}.dta {srb2,zones,patch,patch_music}.pk3 models models.dat; do
+	for f in {music,player}.dta {srb2,zones}.pk3 models models.dat; do
 		vcopy ../${f} /usr/share/games/SRB2
 	done
 }

Re: srb2: update to 2.2.10

[github-actions]

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/36015#issuecomment-1166754648

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: srb2: update to 2.2.10

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/36015#issuecomment-1166762761

Comment:
bump.

Re: [PR PATCH] [Merged]: srb2: update to 2.2.10

[Duncaen]

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

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

srb2: update to 2.2.10
https://github.com/void-linux/void-packages/pull/36015

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->