[PR PATCH] xonotic: update to 0.8.5

[PR PATCH] xonotic: update to 0.8.5

[ztx-lyghters]

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

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

https://github.com/ztx-lyghters/void-packages master
https://github.com/void-linux/void-packages/pull/37835

xonotic: update to 0.8.5
<!-- 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 add ci skip tag as described in
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 these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->
- I built this PR locally for my native architecture, x86_64-glibc

`./patches/musl-moncontrol.patch` isn't needed anymore and will fail the build, therefore it has been removed.

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

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

From d64591a6c94853593c8129246ec83a731342165c Mon Sep 17 00:00:00 2001
From: "Ivan '.ztx/lyghters' Sivkov" <lyghters@gmail.com>
Date: Mon, 4 Jul 2022 15:48:52 +0500
Subject: [PATCH 1/2] xonotic: update to 0.8.5

deleted musl-moncontrol.patch since it isn't needed anymore and won't
build
---
 srcpkgs/xonotic/patches/musl-moncontrol.patch | 13 -------------
 srcpkgs/xonotic/template                      |  6 +++---
 2 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/xonotic/patches/musl-moncontrol.patch

diff --git a/srcpkgs/xonotic/patches/musl-moncontrol.patch b/srcpkgs/xonotic/patches/musl-moncontrol.patch
deleted file mode 100644
index 41b11d74b8fb..000000000000
--- a/srcpkgs/xonotic/patches/musl-moncontrol.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-There is no moncontrol() in musl libc.
-
---- a/source/darkplaces/sys_shared.c	2015-01-13 19:56:16.000000000 +0100
-+++ b/source/darkplaces/sys_shared.c	2015-08-30 09:24:54.839064473 +0200
-@@ -69,7 +69,7 @@
- 	else
- 		moncleanup();
- #endif
--#elif defined(__linux__) || defined(__FreeBSD__)
-+#elif (defined(__linux__) && defined(__GLIBC__)) || defined(__FreeBSD__)
- 	extern int moncontrol(int);
- 	moncontrol(enable);
- #endif
diff --git a/srcpkgs/xonotic/template b/srcpkgs/xonotic/template
index 576f19979de9..b492d0d5f63d 100644
--- a/srcpkgs/xonotic/template
+++ b/srcpkgs/xonotic/template
@@ -1,7 +1,7 @@
 # Template file for 'xonotic'
 pkgname=xonotic
-version=0.8.2
-revision=2
+version=0.8.5
+revision=1
 wrksrc="Xonotic"
 hostmakedepends="unzip automake libtool"
 makedepends="gmp-devel MesaLib-devel SDL2-devel libcurl-devel alsa-lib-devel
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause"
 homepage="http://xonotic.org"
 distfiles="https://dl.xonotic.org/xonotic-${version}-source.zip"
-checksum=5e6916f1e6e9e22285bb71ddd075189102857383e74ed0b0a3d27cef08e0bd2b
+checksum=a1a81ba55ab151bf09758e7f59614b2e5150e84224753e77950bcd07a282ea5d
 nocross=yes
 
 do_build() {

From acb0fa82d2ffc6fb1f13ceea487f5b7b650c88e1 Mon Sep 17 00:00:00 2001
From: "Ivan '.ztx/lyghters' Sivkov" <lyghters@gmail.com>
Date: Mon, 4 Jul 2022 15:50:05 +0500
Subject: [PATCH 2/2] xonotic-data: update to 0.8.5

---
 srcpkgs/xonotic-data/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xonotic-data/template b/srcpkgs/xonotic-data/template
index 6870e1cae1ea..419c4ca4fd2e 100644
--- a/srcpkgs/xonotic-data/template
+++ b/srcpkgs/xonotic-data/template
@@ -1,15 +1,15 @@
 # Template file for 'xonotic-data'
 pkgname=xonotic-data
-version=0.8.2
-revision=3
+version=0.8.5
+revision=1
 wrksrc=Xonotic
 hostmakedepends="unzip"
 short_desc="Xonotic's data files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://xonotic.org"
-distfiles="http://dl.xonotic.org/xonotic-${version}.zip"
-checksum=a22f7230f486c5825b55cfdadd73399c9b0fae98c9e081dd8ac76eca08359ad5
+distfiles="https://dl.xonotic.org/xonotic-${version}.zip"
+checksum=0f92aa238362aeb059b9d9026a9bd38d6217423a35c19f126fb39e38736e37e5
 
 do_install() {
 	vmkdir usr/share/xonotic

Re: [PR PATCH] [Merged]: xonotic: update to 0.8.5

[Duncaen]

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

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

xonotic: update to 0.8.5
https://github.com/void-linux/void-packages/pull/37835

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 add ci skip tag as described in
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 these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->
- I built this PR locally for my native architecture, x86_64-glibc

`xonotic/patches/musl-moncontrol.patch` isn't needed anymore and will fail the build, therefore it has been removed.