[PR PATCH] opentyrian: update to 2.1.20220318.

[PR PATCH] opentyrian: update to 2.1.20220318.

[beltofdespair]

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

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

https://github.com/beltofdespair/void-packages master
https://github.com/void-linux/void-packages/pull/36807

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):
  - armv7l


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

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

From 0170684f564b59571cb387b2176e36ee97756cd9 Mon Sep 17 00:00:00 2001
From: beltofdespair <mogwinglodot@protonmail.com>
Date: Thu, 21 Apr 2022 13:37:43 -0500
Subject: [PATCH] opentyrian: update to 2.1.20220318.

---
 srcpkgs/opentyrian/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opentyrian/template b/srcpkgs/opentyrian/template
index 2f70a3b2a0a2..742aee8c2b3e 100644
--- a/srcpkgs/opentyrian/template
+++ b/srcpkgs/opentyrian/template
@@ -1,28 +1,29 @@
 # 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/${pkgname}/${pkgname}/archive/refs/tags/v${version}.tar.gz
  http://camanis.net/tyrian/tyrian${_dataver}.zip"
-checksum="f54b6b3cedcefa187c9f605d6164aae29ec46a731a6df30d351af4c008dee45f
+checksum="e0c6afbb5d395c919f9202f4c9b3b4da7bd6e993e9da6152f995012577e1ccbd
  7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277"
 replaces="opentyrian-data>=0"
 
-CFLAGS="-Wno-error -fcommon"
+_FLAGS="\n-Wno-error \\\\\n-fcommon \\\\"
 
 pre_build() {
-	vsed -i Makefile -e "s;-g0;$CFLAGS;"
+	vsed -i Makefile -e "s/pedantic \\\\/&${_FLAGS}/"
 }
+
 do_install() {
 	vbin ${pkgname}
 	vman linux/man/${pkgname}.6

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

[beltofdespair]

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

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

https://github.com/beltofdespair/void-packages master
https://github.com/void-linux/void-packages/pull/36807

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):
  - armv7l


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

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

From 0170684f564b59571cb387b2176e36ee97756cd9 Mon Sep 17 00:00:00 2001
From: beltofdespair <mogwinglodot@protonmail.com>
Date: Thu, 21 Apr 2022 13:37:43 -0500
Subject: [PATCH] opentyrian: update to 2.1.20220318.

---
 srcpkgs/opentyrian/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opentyrian/template b/srcpkgs/opentyrian/template
index 2f70a3b2a0a2..742aee8c2b3e 100644
--- a/srcpkgs/opentyrian/template
+++ b/srcpkgs/opentyrian/template
@@ -1,28 +1,29 @@
 # 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/${pkgname}/${pkgname}/archive/refs/tags/v${version}.tar.gz
  http://camanis.net/tyrian/tyrian${_dataver}.zip"
-checksum="f54b6b3cedcefa187c9f605d6164aae29ec46a731a6df30d351af4c008dee45f
+checksum="e0c6afbb5d395c919f9202f4c9b3b4da7bd6e993e9da6152f995012577e1ccbd
  7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277"
 replaces="opentyrian-data>=0"
 
-CFLAGS="-Wno-error -fcommon"
+_FLAGS="\n-Wno-error \\\\\n-fcommon \\\\"
 
 pre_build() {
-	vsed -i Makefile -e "s;-g0;$CFLAGS;"
+	vsed -i Makefile -e "s/pedantic \\\\/&${_FLAGS}/"
 }
+
 do_install() {
 	vbin ${pkgname}
 	vman linux/man/${pkgname}.6

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

[beltofdespair]

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

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

https://github.com/beltofdespair/void-packages master
https://github.com/void-linux/void-packages/pull/36807

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):
  - armv7l


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

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

From 0170684f564b59571cb387b2176e36ee97756cd9 Mon Sep 17 00:00:00 2001
From: beltofdespair <mogwinglodot@protonmail.com>
Date: Thu, 21 Apr 2022 13:37:43 -0500
Subject: [PATCH 1/2] opentyrian: update to 2.1.20220318.

---
 srcpkgs/opentyrian/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opentyrian/template b/srcpkgs/opentyrian/template
index 2f70a3b2a0a2..742aee8c2b3e 100644
--- a/srcpkgs/opentyrian/template
+++ b/srcpkgs/opentyrian/template
@@ -1,28 +1,29 @@
 # 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/${pkgname}/${pkgname}/archive/refs/tags/v${version}.tar.gz
  http://camanis.net/tyrian/tyrian${_dataver}.zip"
-checksum="f54b6b3cedcefa187c9f605d6164aae29ec46a731a6df30d351af4c008dee45f
+checksum="e0c6afbb5d395c919f9202f4c9b3b4da7bd6e993e9da6152f995012577e1ccbd
  7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277"
 replaces="opentyrian-data>=0"
 
-CFLAGS="-Wno-error -fcommon"
+_FLAGS="\n-Wno-error \\\\\n-fcommon \\\\"
 
 pre_build() {
-	vsed -i Makefile -e "s;-g0;$CFLAGS;"
+	vsed -i Makefile -e "s/pedantic \\\\/&${_FLAGS}/"
 }
+
 do_install() {
 	vbin ${pkgname}
 	vman linux/man/${pkgname}.6

From 25cccdade8c1dba49d3280e208264497e3321896 Mon Sep 17 00:00:00 2001
From: beltofdespair <104115617+beltofdespair@users.noreply.github.com>
Date: Mon, 25 Apr 2022 01:38:56 -0500
Subject: [PATCH 2/2] Update template

---
 srcpkgs/opentyrian/template | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/opentyrian/template b/srcpkgs/opentyrian/template
index 742aee8c2b3e..bf2a8c0ba6b2 100644
--- a/srcpkgs/opentyrian/template
+++ b/srcpkgs/opentyrian/template
@@ -1,41 +1,40 @@
 # Template file for 'opentyrian'
 pkgname=opentyrian
-version=2.1.20220318
-revision=1
+version=2.1.20130907
+revision=3
 _dataver=21
 create_wrksrc=yes
 build_wrksrc=$pkgname-$version
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
-makedepends="SDL2_net-devel"
+makedepends="SDL_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="https://github.com/${pkgname}/${pkgname}/archive/refs/tags/v${version}.tar.gz
+distfiles="http://www.camanis.net/${pkgname}/releases/${pkgname}-${version}-src.tar.gz
  http://camanis.net/tyrian/tyrian${_dataver}.zip"
-checksum="e0c6afbb5d395c919f9202f4c9b3b4da7bd6e993e9da6152f995012577e1ccbd
+checksum="f54b6b3cedcefa187c9f605d6164aae29ec46a731a6df30d351af4c008dee45f
  7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277"
 replaces="opentyrian-data>=0"
 
-_FLAGS="\n-Wno-error \\\\\n-fcommon \\\\"
+CFLAGS="-Wno-error -fcommon"
 
 pre_build() {
-	vsed -i Makefile -e "s/pedantic \\\\/&${_FLAGS}/"
+        vsed -i Makefile -e "s;-g0;$CFLAGS;"
 }
-
 do_install() {
-	vbin ${pkgname}
-	vman linux/man/${pkgname}.6
-	vinstall linux/${pkgname}.desktop 644 usr/share/applications
-	vinstall linux/icons/tyrian-128.png 644 usr/share/pixmaps ${pkgname}.png
-	vmkdir usr/share/${sourcepkg}/data
-	vcopy "${wrksrc}/tyrian${_dataver}/*" usr/share/${sourcepkg}/data
-	cat <<EOT > manual.txt
+        vbin ${pkgname}
+        vman linux/man/${pkgname}.6
+        vinstall linux/${pkgname}.desktop 644 usr/share/applications
+        vinstall linux/icons/tyrian-128.png 644 usr/share/pixmaps ${pkgname}.png
+        vmkdir usr/share/${sourcepkg}/data
+        vcopy "${wrksrc}/tyrian${_dataver}/*" usr/share/${sourcepkg}/data
+        cat <<EOT > manual.txt
 ******** This is the original manual of the DOS game. The install
 instructions are obsolete, while the story and gameplay instructions
 starting in section "V) THE STORY" may still be useful. ********
 EOT
-	sed 's/\r//' ${wrksrc}/tyrian${_dataver}/manual.doc >> manual.txt
-	vdoc manual.txt
+        sed 's/\r//' ${wrksrc}/tyrian${_dataver}/manual.doc >> manual.txt
+        vdoc manual.txt
 }

[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"