[PR PATCH] opentyrian: update to 2.1.20220318

[PR PATCH] opentyrian: update to 2.1.20220318

[iamacatnotaperson]

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

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

https://github.com/iamacatnotaperson/void-packages patch-1
https://github.com/void-linux/void-packages/pull/36779

opentyrian: update to 2.1.20220318
<!-- 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 my native architecture, x86_64-glibc
<!-- 
- 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/36779.patch is attached

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

From 45e62c44060fed25c7e504334e19f65131f3f05c Mon Sep 17 00:00:00 2001
From: iamacatnotaperson <45576816+iamacatnotaperson@users.noreply.github.com>
Date: Wed, 20 Apr 2022 11:15:58 -0500
Subject: [PATCH] opentyrian: update to 2.1.20220318

---
 srcpkgs/opentyrian/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/opentyrian/template b/srcpkgs/opentyrian/template
index 2f70a3b2a0a2..1dd101d9a190 100644
--- a/srcpkgs/opentyrian/template
+++ b/srcpkgs/opentyrian/template
@@ -1,20 +1,20 @@
 # Template file for 'opentyrian'
 pkgname=opentyrian
-version=2.1.20130907
-revision=3
+version=2.1.20220318
+revision=1
 _dataver=21
 create_wrksrc=yes
 build_wrksrc=$pkgname-$version
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
-makedepends="SDL_net-devel"
+makedepends="SDL2_net-devel"
 short_desc="OSS port of the DOS shoot-em-up Tyrian"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/opentyrian/opentyrian"
-distfiles="http://www.camanis.net/${pkgname}/releases/${pkgname}-${version}-src.tar.gz
+distfiles="https://github.com/opentyrian/opentyrian/archive/refs/tags/v${version}.tar.gz
  http://camanis.net/tyrian/tyrian${_dataver}.zip"
-checksum="f54b6b3cedcefa187c9f605d6164aae29ec46a731a6df30d351af4c008dee45f
+checksum="e0c6afbb5d395c919f9202f4c9b3b4da7bd6e993e9da6152f995012577e1ccbd
  7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277"
 replaces="opentyrian-data>=0"
 

Re: [PR PATCH] [Updated] opentyrian: update to 2.1.20220318

[iamacatnotaperson]

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

There is an updated pull request by iamacatnotaperson against master on the void-packages repository

https://github.com/iamacatnotaperson/void-packages patch-1
https://github.com/void-linux/void-packages/pull/36779

opentyrian: update to 2.1.20220318
<!-- 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 my native architecture, x86_64-glibc
<!-- 
- 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/36779.patch is attached

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

From 45e62c44060fed25c7e504334e19f65131f3f05c Mon Sep 17 00:00:00 2001
From: iamacatnotaperson <45576816+iamacatnotaperson@users.noreply.github.com>
Date: Wed, 20 Apr 2022 11:15:58 -0500
Subject: [PATCH 1/2] opentyrian: update to 2.1.20220318

---
 srcpkgs/opentyrian/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/opentyrian/template b/srcpkgs/opentyrian/template
index 2f70a3b2a0a2..1dd101d9a190 100644
--- a/srcpkgs/opentyrian/template
+++ b/srcpkgs/opentyrian/template
@@ -1,20 +1,20 @@
 # Template file for 'opentyrian'
 pkgname=opentyrian
-version=2.1.20130907
-revision=3
+version=2.1.20220318
+revision=1
 _dataver=21
 create_wrksrc=yes
 build_wrksrc=$pkgname-$version
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
-makedepends="SDL_net-devel"
+makedepends="SDL2_net-devel"
 short_desc="OSS port of the DOS shoot-em-up Tyrian"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/opentyrian/opentyrian"
-distfiles="http://www.camanis.net/${pkgname}/releases/${pkgname}-${version}-src.tar.gz
+distfiles="https://github.com/opentyrian/opentyrian/archive/refs/tags/v${version}.tar.gz
  http://camanis.net/tyrian/tyrian${_dataver}.zip"
-checksum="f54b6b3cedcefa187c9f605d6164aae29ec46a731a6df30d351af4c008dee45f
+checksum="e0c6afbb5d395c919f9202f4c9b3b4da7bd6e993e9da6152f995012577e1ccbd
  7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277"
 replaces="opentyrian-data>=0"
 

From 473867484f88aad3751b3a51593896e59b502e9c Mon Sep 17 00:00:00 2001
From: iamacatnotaperson <45576816+iamacatnotaperson@users.noreply.github.com>
Date: Wed, 20 Apr 2022 11:50:39 -0500
Subject: [PATCH 2/2] Update template

---
 srcpkgs/opentyrian/template | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/srcpkgs/opentyrian/template b/srcpkgs/opentyrian/template
index 1dd101d9a190..41647a143ce2 100644
--- a/srcpkgs/opentyrian/template
+++ b/srcpkgs/opentyrian/template
@@ -20,9 +20,6 @@ replaces="opentyrian-data>=0"
 
 CFLAGS="-Wno-error -fcommon"
 
-pre_build() {
-	vsed -i Makefile -e "s;-g0;$CFLAGS;"
-}
 do_install() {
 	vbin ${pkgname}
 	vman linux/man/${pkgname}.6

Re: opentyrian: update to 2.1.20220318

[abenson]

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

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/36779#issuecomment-1104341098

Comment:
Please squash the two into a single commit.

Re: opentyrian: update to 2.1.20220318

[abenson]

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

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/36779#issuecomment-1104341098

Comment:
Please squash the two into a single commit.

[Squash Commits with `git rebase`](https://www.git-tower.com/learn/git/faq/git-squash)

Re: [PR PATCH] [Closed]: opentyrian: update to 2.1.20220318

[iamacatnotaperson]

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

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

opentyrian: update to 2.1.20220318
https://github.com/void-linux/void-packages/pull/36779

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