Re: [PR PATCH] [Updated] Dwarf Fortress: Update to 0.50.10

[akawama <akawama@users.noreply.github.com>]

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

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

https://github.com/akawama/void-packages master
https://github.com/void-linux/void-packages/pull/46398

Dwarf Fortress: Update to 0.50.10
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-46398.patch --]
[-- Type: text/x-diff, Size: 4923 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/5] 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/5] 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

From 449bd10bca2aa1552f282d1d7aa4b824e8fc2816 Mon Sep 17 00:00:00 2001
From: Akawama <98961096+akawama@users.noreply.github.com>
Date: Tue, 3 Oct 2023 11:34:02 +0545
Subject: [PATCH 4/5] Some important notice for installers

---
 srcpkgs/dwarffortress/INSTALL.msg | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/dwarffortress/INSTALL.msg

diff --git a/srcpkgs/dwarffortress/INSTALL.msg b/srcpkgs/dwarffortress/INSTALL.msg
new file mode 100644
index 0000000000000..090384fd2539e
--- /dev/null
+++ b/srcpkgs/dwarffortress/INSTALL.msg
@@ -0,0 +1,12 @@
+NOTICE:
+
+Please maintain a backup of your old saved games.
+
+Tilesets for 0.47 are only partially supported by the new
+version (0.50.10). If you still want to use the 0.47 tilesets
+copy the 'art' and 'init' directories from your tileset to
+/home/user/.local/share/dwarffortress/data/
+
+In your game settings video option, make sure
+'Use Classic ASCII glyphs' is switched to 'Yes', in order to
+avoid your game displaying with missing graphic assets.

From 023a3fccac326ad63ba26e0cd27f8c285817ae17 Mon Sep 17 00:00:00 2001
From: Akawama <98961096+akawama@users.noreply.github.com>
Date: Tue, 3 Oct 2023 14:10:01 +0545
Subject: [PATCH 5/5] Update INSTALL.msg

---
 srcpkgs/dwarffortress/INSTALL.msg | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/dwarffortress/INSTALL.msg b/srcpkgs/dwarffortress/INSTALL.msg
index 090384fd2539e..afdccfc1f0cd3 100644
--- a/srcpkgs/dwarffortress/INSTALL.msg
+++ b/srcpkgs/dwarffortress/INSTALL.msg
@@ -10,3 +10,7 @@ copy the 'art' and 'init' directories from your tileset to
 In your game settings video option, make sure
 'Use Classic ASCII glyphs' is switched to 'Yes', in order to
 avoid your game displaying with missing graphic assets.
+
+If you have purchased the game on itch or Steam,
+you can also replace ~/.local/share/dwarffortress/data
+directory with the one from your purchased version then turn off the ASCII glypjs.
\ No newline at end of file