[PR PATCH] Akawama patch 1

[PR PATCH] Akawama patch 1

[akawama]

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

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

https://github.com/akawama/void-packages akawama-patch-1
https://github.com/void-linux/void-packages/pull/46399

Akawama patch 1
<!-- 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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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
<!--
- 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/46399.patch is attached

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

From 87ee194bacc6f7fa16793eaff67b4bd12c1d7f87 Mon Sep 17 00:00:00 2001
From: Akawama <98961096+akawama@users.noreply.github.com>
Date: Tue, 3 Oct 2023 10:13:44 +0545
Subject: [PATCH 1/3] Update template to 0.50.10

---
 srcpkgs/dwarffortress/template | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/dwarffortress/template b/srcpkgs/dwarffortress/template
index 423e050f25781..d74c433ba3e81 100644
--- a/srcpkgs/dwarffortress/template
+++ b/srcpkgs/dwarffortress/template
@@ -1,33 +1,26 @@
 # Template file for 'dwarffortress'
 pkgname=dwarffortress
-version=0.47.05
-revision=2
+version=0.50.10
+revision=1
 _urlver=${version#*.}
 archs="x86_64"
-depends="gtk+ SDL SDL_ttf SDL_image virtual?libGL glu"
+depends="gtk+ SDL2 SDL2_ttf SDL2_image libGL glu"
 short_desc="Control a dwarven outpost in a randomly generated world"
 maintainer="Robert Stancil <robert.stancil@mavs.uta.edu>"
 license="custom: Proprietary"
 homepage="http://www.bay12games.com/dwarves/"
 distfiles="http://www.bay12games.com/dwarves/df_${_urlver//./_}_linux.tar.bz2"
-checksum=ac74a6dbb7d7d9621f430405080322ab50c35f6632352ff2ea923f6dc5affca3
+checksum=438143c81670820b2702b4b14506cef378d078ce8a1d5ba45030e502c4b9458f
 
-nostrip_files="Dwarf_Fortress"
+nostrip_files="dwarfort"
+ignore_elf_dirs="/usr/share/dwarffortress"
 nopie="distfiles are precompiled as PIE"
 repository=nonfree
 noshlibprovides=yes
 
-post_extract() {
-	rm libs/libstdc++.so.6
-	rm libs/libgcc_s.so.1
-}
-
 do_install() {
-	vbin ${FILESDIR}/dwarffortress
-	vmkdir /usr/share/dwarffortress
-	vmkdir /usr/lib/dwarffortress/libs
-	vcopy "libs/*" /usr/lib/dwarffortress/libs
-	rm -r libs
-	vcopy "*" /usr/share/dwarffortress/
-	vlicense "readme.txt" dwarffortress.txt
+    vbin ${FILESDIR}/dwarffortress
+    vmkdir /usr/share/dwarffortress
+    vcopy "*" /usr/share/dwarffortress
+    vlicense "readme.txt" dwaffortress.txt
 }

From 39f094b5c63652b9b0bef4cfe170f63c766e596a Mon Sep 17 00:00:00 2001
From: Akawama <98961096+akawama@users.noreply.github.com>
Date: Tue, 3 Oct 2023 10:16:29 +0545
Subject: [PATCH 2/3] Update dwarffortress

df file is renamed to run_df in new version and removed link to libs
---
 srcpkgs/dwarffortress/files/dwarffortress | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/dwarffortress/files/dwarffortress b/srcpkgs/dwarffortress/files/dwarffortress
index e40fc75e3cec0..c282a45b8219c 100644
--- a/srcpkgs/dwarffortress/files/dwarffortress
+++ b/srcpkgs/dwarffortress/files/dwarffortress
@@ -55,7 +55,6 @@ if [ $_FORCE ]
 then
  rm -rf ${XDG_DATA_HOME:-$HOME/.local/share}/dwarffortress
  cp /usr/share/dwarffortress ${XDG_DATA_HOME:-$HOME/.local/share} -r
- ln -s /usr/lib/dwarffortress/libs ${XDG_DATA_HOME:-$HOME/.local/share}/dwarffortress/
 fi
 
-${XDG_DATA_HOME:-$HOME/.local/share}/dwarffortress/df
+${XDG_DATA_HOME:-$HOME/.local/share}/dwarffortress/run_df

Re: [PR PATCH] [Closed]: Akawama patch 1

[akawama]

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

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

Akawama patch 1
https://github.com/void-linux/void-packages/pull/46399

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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->