Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] dwarffortress: update to 50.15, adopt; dwarftherapist: update to 42.1.8, adopt.
@ 2024-12-22  0:56 Rutpiv
  2024-12-22  1:01 ` [PR PATCH] [Updated] dwarffortress: update to 50.15, adopt; Dwarf-Therapist: " Rutpiv
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Rutpiv @ 2024-12-22  0:56 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Rutpiv/void-packages dwarffortress
https://github.com/void-linux/void-packages/pull/53622

dwarffortress: update to 50.15, adopt; dwarftherapist: update to 42.1.8, adopt.
#### 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)

---

**Summary of Changes:**  
The `dwarffortress` package required updates due to changes in its versioning system and file structure starting from version `0.47.05`. Additionally, I updated the `dwarftherapist` package, which depends on `dwarffortress`. Below are the details of the changes:  

1. **Dwarffortress Package Updates:**  
   - **Versioning Adjustments:**  
     - Simplified version handling to align with the new tagging system.  
     - Updated URLs from `http` to `https` for security.  
   - **Installation Adjustments:**  
     - Removed the now-unnecessary `post_extract` function.  
     - Updated `do_install` to ensure compliance with the new file structure and installation standards.  
   - **Wrapper Updates:**  
     - Reworked the wrapper script to match the updated directory tree and startup script.  
     - Added a backup function for the old `dwarffortress` directory. This preserves save data, even though saves from older versions are incompatible with newer releases.  
   - **Compatibility Considerations:**  
     - Verified compatibility between version `50.10` and the latest `50.15`. The wrapper remains stable due to no changes in the libraries across these versions.  
   - Adopted the package, as it was no longer maintained.  

2. **Dwarftherapist Package Updates:**   
   - Modified the `.desktop` file to include the `ptrace_cap_wrapper` in the execution command.  
     - This wrapper automates the setup required for `Dwarf-Therapist` to work on modern kernels by enabling the necessary permissions to modify the memory of a running `Dwarf Fortress` instance.  
     - Without this automation, players would need to manually disable the `kernel.yama.ptrace_scope` security feature or execute the application through the terminal (`ptrace_cap_wrapper dwarftherapist`).  
   - This change improves the user experience by eliminating the need for manual setup.
   - Adopted the package, as it was no longer maintained.  

By adopting both packages (`dwarffortress` and `dwarftherapist`), I’ve ensured that they are updated and functioning correctly with the latest standards. These changes streamline the player experience and provide better long-term compatibility. 

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

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

From 635663785632a1d00dfdf955d027713b80c00d9c Mon Sep 17 00:00:00 2001
From: Roger Freitas Pereira <roger_freitas@live.com>
Date: Sat, 21 Dec 2024 16:42:04 -0300
Subject: [PATCH 1/2] dwarffortress: update to 50.15.

---
 srcpkgs/dwarffortress/files/dwarffortress | 50 ++++++++++++++++-------
 srcpkgs/dwarffortress/template            | 27 ++++++------
 2 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/dwarffortress/files/dwarffortress b/srcpkgs/dwarffortress/files/dwarffortress
index e40fc75e3cec01..3d0992ede4e433 100644
--- a/srcpkgs/dwarffortress/files/dwarffortress
+++ b/srcpkgs/dwarffortress/files/dwarffortress
@@ -1,26 +1,29 @@
 #!/bin/sh
 ## dwarf fortress wrapper written and maintained by
 # Robert Stancil <robert.stancil@mavs.uta.edu>
-# 
+#
 # MIT License
 #
 # Copyright (c) 2019 Robert Stancil <robert.stancil@mavs.uta.edu>
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy 
-# of this software and associated documentation files (the "Software"), to deal 
-# in the Software without restriction, including without limitation the rights 
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
-# copies of the Software, and to permit persons to whom the Software is 
+# Modified by: Rutpiv <roger_freitas@live.com> in 2024 to adjust symlink
+# creation and preserve existing save data by backing up old directories.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice (including the next 
+# The above copyright notice and this permission notice (including the next
 # paragraph) shall be included in all copies or substantial portions of the Software.
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ##
 
@@ -48,6 +51,22 @@ if [ -z ${XDG_DATA_HOME:-$HOME/.local/share} ]; then
  exit
 fi
 
+# Check if an existing 'dwarffortress' directory with the old structure is found.
+# If found, create a backup of the directory before removing it.
+# The backup is stored as a tar.gz archive with a timestamp to prevent overwriting.
+if [ -d "${XDG_DATA_HOME:-$HOME/.local/share}/dwarffortress" ] &&
+	 [ -f "${XDG_DATA_HOME:-$HOME/.local/share}/dwarffortress/df" ]; then
+ echo "Existing old 'dwarffortress' directory found. Creating a backup..."
+
+ timestamp=$(date +%Y%m%d%H%M%S)
+ backup_file="${XDG_DATA_HOME:-$HOME/.local/share}/dwarffortress_backup_${timestamp}.tar.gz"
+ tar -czf "$backup_file" -C "${XDG_DATA_HOME:-$HOME/.local/share}" dwarffortress
+ echo "Backup created at $backup_file"
+
+ rm -rf "${XDG_DATA_HOME:-$HOME/.local/share}/dwarffortress"
+ echo "Old 'dwarffortress' directory removed."
+fi
+
 if [ ! -d ${XDG_DATA_HOME:-$HOME/.local/share}/dwarffortress ]; then
  _FORCE=yes
 fi
@@ -55,7 +74,10 @@ 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/
+ for lib in /usr/lib/dwarffortress/libs/*; do
+        ln -s "$lib" "${XDG_DATA_HOME:-$HOME/.local/share}/dwarffortress/"
+ done
+ ln -s /usr/bin/dwarfort ${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
diff --git a/srcpkgs/dwarffortress/template b/srcpkgs/dwarffortress/template
index 423e050f257817..ba0d02a17b3b0a 100644
--- a/srcpkgs/dwarffortress/template
+++ b/srcpkgs/dwarffortress/template
@@ -1,33 +1,30 @@
 # Template file for 'dwarffortress'
 pkgname=dwarffortress
-version=0.47.05
-revision=2
-_urlver=${version#*.}
+version=50.15
+revision=1
+_urlver=${version//./_}
 archs="x86_64"
 depends="gtk+ SDL SDL_ttf SDL_image virtual?libGL glu"
 short_desc="Control a dwarven outpost in a randomly generated world"
-maintainer="Robert Stancil <robert.stancil@mavs.uta.edu>"
+maintainer="Rutpiv <roger_freitas@live.com>"
 license="custom: Proprietary"
-homepage="http://www.bay12games.com/dwarves/"
-distfiles="http://www.bay12games.com/dwarves/df_${_urlver//./_}_linux.tar.bz2"
-checksum=ac74a6dbb7d7d9621f430405080322ab50c35f6632352ff2ea923f6dc5affca3
+homepage="https://www.bay12games.com/dwarves/"
+distfiles="https://www.bay12games.com/dwarves/df_${_urlver}_linux.tar.bz2"
+checksum=2a429c5df5e30fb7548d00df2ad5e268a7e889e44df30252631c8dea5881c14e
 
 nostrip_files="Dwarf_Fortress"
 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
+	vbin dwarfort
+	rm dwarfort
 	vmkdir /usr/share/dwarffortress
 	vmkdir /usr/lib/dwarffortress/libs
-	vcopy "libs/*" /usr/lib/dwarffortress/libs
-	rm -r libs
-	vcopy "*" /usr/share/dwarffortress/
+	vcopy lib* /usr/lib/dwarffortress/libs
+	rm lib*
+	vcopy * /usr/share/dwarffortress/
 	vlicense "readme.txt" dwarffortress.txt
 }

From b5ba443dfd121f2bf8aae544238dcd01dd5fe0cb Mon Sep 17 00:00:00 2001
From: Roger Freitas Pereira <roger_freitas@live.com>
Date: Sat, 21 Dec 2024 20:53:34 -0300
Subject: [PATCH 2/2] Dwarf-Therapist: update to 42.1.8.

---
 srcpkgs/Dwarf-Therapist/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Dwarf-Therapist/template b/srcpkgs/Dwarf-Therapist/template
index fd3eb5925f08b9..428031294faba6 100644
--- a/srcpkgs/Dwarf-Therapist/template
+++ b/srcpkgs/Dwarf-Therapist/template
@@ -1,16 +1,21 @@
 # Template file for 'Dwarf-Therapist'
 pkgname=Dwarf-Therapist
-version=41.2.1
+version=42.1.8
 revision=1
 build_style=cmake
 makedepends="qt5-declarative-devel libcap-devel hicolor-icon-theme"
 depends="dwarffortress"
 short_desc="Management tool designed to run side-by-side with Dwarf Fortress"
-maintainer="Robert Stancil <robert.stancil@mavs.uta.edu>"
+maintainer="Rutpiv <roger_freitas@live.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Dwarf-Therapist/Dwarf-Therapist/"
 distfiles="https://github.com/Dwarf-Therapist/Dwarf-Therapist/archive/v${version}.tar.gz"
-checksum=ec954daff6e03d9d44153ed3df90685de3a7a07431fd47639d83b2f5b3f62e4b
+checksum=8770deaa9508b51c78b822e606c69b3dd9e2950f6e97c6e5a2fe0002c9216dfe
+
+post_build() {
+	vsed -i dist/xdg/applications/dwarftherapist.desktop \
+			 -e 's|^Exec=dwarftherapist$|Exec=ptrace_cap_wrapper dwarftherapist|'
+}
 
 post_install() {
 	vbin dist/ptrace_scope/patch_df_ptracer

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR PATCH] [Updated] dwarffortress: update to 50.15, adopt; Dwarf-Therapist: update to 42.1.8, adopt.
  2024-12-22  0:56 [PR PATCH] dwarffortress: update to 50.15, adopt; dwarftherapist: update to 42.1.8, adopt Rutpiv
@ 2024-12-22  1:01 ` Rutpiv
  2025-02-04  2:34 ` Rutpiv
  2025-02-11  4:54 ` [PR PATCH] [Updated] dwarffortress: update to 51.02, " Rutpiv
  2 siblings, 0 replies; 4+ messages in thread
From: Rutpiv @ 2024-12-22  1:01 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Rutpiv/void-packages dwarffortress
https://github.com/void-linux/void-packages/pull/53622

dwarffortress: update to 50.15, adopt; Dwarf-Therapist: update to 42.1.8, adopt.
#### 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)

---

**Summary of Changes:**  
The `dwarffortress` package required updates due to changes in its versioning system and file structure starting from version `0.47.05`. Additionally, I updated the `dwarftherapist` package, which depends on `dwarffortress`. Below are the details of the changes:  

1. **Dwarffortress Package Updates:**  
   - **Versioning Adjustments:**  
     - Simplified version handling to align with the new tagging system.  
     - Updated URLs from `http` to `https` for security.  
   - **Installation Adjustments:**  
     - Removed the now-unnecessary `post_extract` function.  
     - Updated `do_install` to ensure compliance with the new file structure and installation standards.  
   - **Wrapper Updates:**  
     - Reworked the wrapper script to match the updated directory tree and startup script.  
     - Added a backup function for the old `dwarffortress` directory. This preserves save data, even though saves from older versions are incompatible with newer releases.  
   - **Compatibility Considerations:**  
     - Verified compatibility between version `50.10` and the latest `50.15`. The wrapper remains stable due to no changes in the libraries across these versions.  
   - Adopted the package, as it was no longer maintained.  

2. **Dwarf-Therapist Package Updates:**   
   - Modified the `.desktop` file to include the `ptrace_cap_wrapper` in the execution command.  
     - This wrapper automates the setup required for `Dwarf-Therapist` to work on modern kernels by enabling the necessary permissions to modify the memory of a running `Dwarf Fortress` instance.  
     - Without this automation, players would need to manually disable the `kernel.yama.ptrace_scope` security feature or execute the application through the terminal (`ptrace_cap_wrapper dwarftherapist`).  
   - This change improves the user experience by eliminating the need for manual setup.
   - Adopted the package, as it was no longer maintained.  

By adopting both packages (`dwarffortress` and `dwarftherapist`), I’ve ensured that they are updated and functioning correctly with the latest standards. These changes streamline the player experience and provide better long-term compatibility. 

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

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

From 04b307acad183b395b14a9768af9121898de25eb Mon Sep 17 00:00:00 2001
From: Roger Freitas Pereira <roger_freitas@live.com>
Date: Sat, 21 Dec 2024 16:42:04 -0300
Subject: [PATCH 1/2] dwarffortress: update to 50.15, adopt.

---
 srcpkgs/dwarffortress/files/dwarffortress | 50 ++++++++++++++++-------
 srcpkgs/dwarffortress/template            | 27 ++++++------
 2 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/dwarffortress/files/dwarffortress b/srcpkgs/dwarffortress/files/dwarffortress
index e40fc75e3cec01..3d0992ede4e433 100644
--- a/srcpkgs/dwarffortress/files/dwarffortress
+++ b/srcpkgs/dwarffortress/files/dwarffortress
@@ -1,26 +1,29 @@
 #!/bin/sh
 ## dwarf fortress wrapper written and maintained by
 # Robert Stancil <robert.stancil@mavs.uta.edu>
-# 
+#
 # MIT License
 #
 # Copyright (c) 2019 Robert Stancil <robert.stancil@mavs.uta.edu>
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy 
-# of this software and associated documentation files (the "Software"), to deal 
-# in the Software without restriction, including without limitation the rights 
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
-# copies of the Software, and to permit persons to whom the Software is 
+# Modified by: Rutpiv <roger_freitas@live.com> in 2024 to adjust symlink
+# creation and preserve existing save data by backing up old directories.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice (including the next 
+# The above copyright notice and this permission notice (including the next
 # paragraph) shall be included in all copies or substantial portions of the Software.
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ##
 
@@ -48,6 +51,22 @@ if [ -z ${XDG_DATA_HOME:-$HOME/.local/share} ]; then
  exit
 fi
 
+# Check if an existing 'dwarffortress' directory with the old structure is found.
+# If found, create a backup of the directory before removing it.
+# The backup is stored as a tar.gz archive with a timestamp to prevent overwriting.
+if [ -d "${XDG_DATA_HOME:-$HOME/.local/share}/dwarffortress" ] &&
+	 [ -f "${XDG_DATA_HOME:-$HOME/.local/share}/dwarffortress/df" ]; then
+ echo "Existing old 'dwarffortress' directory found. Creating a backup..."
+
+ timestamp=$(date +%Y%m%d%H%M%S)
+ backup_file="${XDG_DATA_HOME:-$HOME/.local/share}/dwarffortress_backup_${timestamp}.tar.gz"
+ tar -czf "$backup_file" -C "${XDG_DATA_HOME:-$HOME/.local/share}" dwarffortress
+ echo "Backup created at $backup_file"
+
+ rm -rf "${XDG_DATA_HOME:-$HOME/.local/share}/dwarffortress"
+ echo "Old 'dwarffortress' directory removed."
+fi
+
 if [ ! -d ${XDG_DATA_HOME:-$HOME/.local/share}/dwarffortress ]; then
  _FORCE=yes
 fi
@@ -55,7 +74,10 @@ 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/
+ for lib in /usr/lib/dwarffortress/libs/*; do
+        ln -s "$lib" "${XDG_DATA_HOME:-$HOME/.local/share}/dwarffortress/"
+ done
+ ln -s /usr/bin/dwarfort ${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
diff --git a/srcpkgs/dwarffortress/template b/srcpkgs/dwarffortress/template
index 423e050f257817..ba0d02a17b3b0a 100644
--- a/srcpkgs/dwarffortress/template
+++ b/srcpkgs/dwarffortress/template
@@ -1,33 +1,30 @@
 # Template file for 'dwarffortress'
 pkgname=dwarffortress
-version=0.47.05
-revision=2
-_urlver=${version#*.}
+version=50.15
+revision=1
+_urlver=${version//./_}
 archs="x86_64"
 depends="gtk+ SDL SDL_ttf SDL_image virtual?libGL glu"
 short_desc="Control a dwarven outpost in a randomly generated world"
-maintainer="Robert Stancil <robert.stancil@mavs.uta.edu>"
+maintainer="Rutpiv <roger_freitas@live.com>"
 license="custom: Proprietary"
-homepage="http://www.bay12games.com/dwarves/"
-distfiles="http://www.bay12games.com/dwarves/df_${_urlver//./_}_linux.tar.bz2"
-checksum=ac74a6dbb7d7d9621f430405080322ab50c35f6632352ff2ea923f6dc5affca3
+homepage="https://www.bay12games.com/dwarves/"
+distfiles="https://www.bay12games.com/dwarves/df_${_urlver}_linux.tar.bz2"
+checksum=2a429c5df5e30fb7548d00df2ad5e268a7e889e44df30252631c8dea5881c14e
 
 nostrip_files="Dwarf_Fortress"
 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
+	vbin dwarfort
+	rm dwarfort
 	vmkdir /usr/share/dwarffortress
 	vmkdir /usr/lib/dwarffortress/libs
-	vcopy "libs/*" /usr/lib/dwarffortress/libs
-	rm -r libs
-	vcopy "*" /usr/share/dwarffortress/
+	vcopy lib* /usr/lib/dwarffortress/libs
+	rm lib*
+	vcopy * /usr/share/dwarffortress/
 	vlicense "readme.txt" dwarffortress.txt
 }

From ad5b0824007dac09c3d88af0f801be89070a4e54 Mon Sep 17 00:00:00 2001
From: Roger Freitas Pereira <roger_freitas@live.com>
Date: Sat, 21 Dec 2024 20:53:34 -0300
Subject: [PATCH 2/2] Dwarf-Therapist: update to 42.1.8, adopt.

---
 srcpkgs/Dwarf-Therapist/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Dwarf-Therapist/template b/srcpkgs/Dwarf-Therapist/template
index fd3eb5925f08b9..428031294faba6 100644
--- a/srcpkgs/Dwarf-Therapist/template
+++ b/srcpkgs/Dwarf-Therapist/template
@@ -1,16 +1,21 @@
 # Template file for 'Dwarf-Therapist'
 pkgname=Dwarf-Therapist
-version=41.2.1
+version=42.1.8
 revision=1
 build_style=cmake
 makedepends="qt5-declarative-devel libcap-devel hicolor-icon-theme"
 depends="dwarffortress"
 short_desc="Management tool designed to run side-by-side with Dwarf Fortress"
-maintainer="Robert Stancil <robert.stancil@mavs.uta.edu>"
+maintainer="Rutpiv <roger_freitas@live.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Dwarf-Therapist/Dwarf-Therapist/"
 distfiles="https://github.com/Dwarf-Therapist/Dwarf-Therapist/archive/v${version}.tar.gz"
-checksum=ec954daff6e03d9d44153ed3df90685de3a7a07431fd47639d83b2f5b3f62e4b
+checksum=8770deaa9508b51c78b822e606c69b3dd9e2950f6e97c6e5a2fe0002c9216dfe
+
+post_build() {
+	vsed -i dist/xdg/applications/dwarftherapist.desktop \
+			 -e 's|^Exec=dwarftherapist$|Exec=ptrace_cap_wrapper dwarftherapist|'
+}
 
 post_install() {
 	vbin dist/ptrace_scope/patch_df_ptracer

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR PATCH] [Updated] dwarffortress: update to 50.15, adopt; Dwarf-Therapist: update to 42.1.8, adopt.
  2024-12-22  0:56 [PR PATCH] dwarffortress: update to 50.15, adopt; dwarftherapist: update to 42.1.8, adopt Rutpiv
  2024-12-22  1:01 ` [PR PATCH] [Updated] dwarffortress: update to 50.15, adopt; Dwarf-Therapist: " Rutpiv
@ 2025-02-04  2:34 ` Rutpiv
  2025-02-11  4:54 ` [PR PATCH] [Updated] dwarffortress: update to 51.02, " Rutpiv
  2 siblings, 0 replies; 4+ messages in thread
From: Rutpiv @ 2025-02-04  2:34 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Rutpiv/void-packages dwarffortress
https://github.com/void-linux/void-packages/pull/53622

dwarffortress: update to 50.15, adopt; Dwarf-Therapist: update to 42.1.8, adopt.
#### 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)

---

**Summary of Changes:**  
The `dwarffortress` package required updates due to changes in its versioning system and file structure starting from version `0.47.05`. Additionally, I updated the `dwarftherapist` package, which depends on `dwarffortress`. Below are the details of the changes:  

1. **Dwarffortress Package Updates:**  
   - **Versioning Adjustments:**  
     - Simplified version handling to align with the new tagging system.  
     - Updated URLs from `http` to `https` for security.  
   - **Installation Adjustments:**  
     - Removed the now-unnecessary `post_extract` function.  
     - Updated `do_install` to ensure compliance with the new file structure and installation standards.  
   - **Wrapper Updates:**  
     - Reworked the wrapper script to match the updated directory tree and startup script.  
     - Added a backup function for the old `dwarffortress` directory. This preserves save data, even though saves from older versions are incompatible with newer releases.  
   - **Compatibility Considerations:**  
     - Verified compatibility between version `50.10` and the latest `50.15`. The wrapper remains stable due to no changes in the libraries across these versions.  
   - Adopted the package, as it was no longer maintained.  

2. **Dwarf-Therapist Package Updates:**   
   - Modified the `.desktop` file to include the `ptrace_cap_wrapper` in the execution command.  
     - This wrapper automates the setup required for `Dwarf-Therapist` to work on modern kernels by enabling the necessary permissions to modify the memory of a running `Dwarf Fortress` instance.  
     - Without this automation, players would need to manually disable the `kernel.yama.ptrace_scope` security feature or execute the application through the terminal (`ptrace_cap_wrapper dwarftherapist`).  
   - This change improves the user experience by eliminating the need for manual setup.
   - Adopted the package, as it was no longer maintained.  

By adopting both packages (`dwarffortress` and `dwarftherapist`), I’ve ensured that they are updated and functioning correctly with the latest standards. These changes streamline the player experience and provide better long-term compatibility. 

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

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

From e12f9c02c9ed9cdb8c0b6033a1dec953bbf16895 Mon Sep 17 00:00:00 2001
From: Roger Freitas Pereira <roger_freitas@live.com>
Date: Sat, 21 Dec 2024 16:42:04 -0300
Subject: [PATCH 1/2] dwarffortress: update to 51.02, adopt.

---
 srcpkgs/dwarffortress/files/dwarffortress | 50 ++++++++++++++++-------
 srcpkgs/dwarffortress/template            | 27 ++++++------
 2 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/dwarffortress/files/dwarffortress b/srcpkgs/dwarffortress/files/dwarffortress
index e40fc75e3cec01..3d0992ede4e433 100644
--- a/srcpkgs/dwarffortress/files/dwarffortress
+++ b/srcpkgs/dwarffortress/files/dwarffortress
@@ -1,26 +1,29 @@
 #!/bin/sh
 ## dwarf fortress wrapper written and maintained by
 # Robert Stancil <robert.stancil@mavs.uta.edu>
-# 
+#
 # MIT License
 #
 # Copyright (c) 2019 Robert Stancil <robert.stancil@mavs.uta.edu>
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy 
-# of this software and associated documentation files (the "Software"), to deal 
-# in the Software without restriction, including without limitation the rights 
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
-# copies of the Software, and to permit persons to whom the Software is 
+# Modified by: Rutpiv <roger_freitas@live.com> in 2024 to adjust symlink
+# creation and preserve existing save data by backing up old directories.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice (including the next 
+# The above copyright notice and this permission notice (including the next
 # paragraph) shall be included in all copies or substantial portions of the Software.
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ##
 
@@ -48,6 +51,22 @@ if [ -z ${XDG_DATA_HOME:-$HOME/.local/share} ]; then
  exit
 fi
 
+# Check if an existing 'dwarffortress' directory with the old structure is found.
+# If found, create a backup of the directory before removing it.
+# The backup is stored as a tar.gz archive with a timestamp to prevent overwriting.
+if [ -d "${XDG_DATA_HOME:-$HOME/.local/share}/dwarffortress" ] &&
+	 [ -f "${XDG_DATA_HOME:-$HOME/.local/share}/dwarffortress/df" ]; then
+ echo "Existing old 'dwarffortress' directory found. Creating a backup..."
+
+ timestamp=$(date +%Y%m%d%H%M%S)
+ backup_file="${XDG_DATA_HOME:-$HOME/.local/share}/dwarffortress_backup_${timestamp}.tar.gz"
+ tar -czf "$backup_file" -C "${XDG_DATA_HOME:-$HOME/.local/share}" dwarffortress
+ echo "Backup created at $backup_file"
+
+ rm -rf "${XDG_DATA_HOME:-$HOME/.local/share}/dwarffortress"
+ echo "Old 'dwarffortress' directory removed."
+fi
+
 if [ ! -d ${XDG_DATA_HOME:-$HOME/.local/share}/dwarffortress ]; then
  _FORCE=yes
 fi
@@ -55,7 +74,10 @@ 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/
+ for lib in /usr/lib/dwarffortress/libs/*; do
+        ln -s "$lib" "${XDG_DATA_HOME:-$HOME/.local/share}/dwarffortress/"
+ done
+ ln -s /usr/bin/dwarfort ${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
diff --git a/srcpkgs/dwarffortress/template b/srcpkgs/dwarffortress/template
index 423e050f257817..37db843512ab10 100644
--- a/srcpkgs/dwarffortress/template
+++ b/srcpkgs/dwarffortress/template
@@ -1,33 +1,30 @@
 # Template file for 'dwarffortress'
 pkgname=dwarffortress
-version=0.47.05
-revision=2
-_urlver=${version#*.}
+version=51.02
+revision=1
+_urlver=${version//./_}
 archs="x86_64"
 depends="gtk+ SDL SDL_ttf SDL_image virtual?libGL glu"
 short_desc="Control a dwarven outpost in a randomly generated world"
-maintainer="Robert Stancil <robert.stancil@mavs.uta.edu>"
+maintainer="Rutpiv <roger_freitas@live.com>"
 license="custom: Proprietary"
-homepage="http://www.bay12games.com/dwarves/"
-distfiles="http://www.bay12games.com/dwarves/df_${_urlver//./_}_linux.tar.bz2"
-checksum=ac74a6dbb7d7d9621f430405080322ab50c35f6632352ff2ea923f6dc5affca3
+homepage="https://www.bay12games.com/dwarves/"
+distfiles="https://www.bay12games.com/dwarves/df_${_urlver}_linux.tar.bz2"
+checksum=beab7a987ea2857da2aecee7ac2deccf6ab2ffaa3d229eee062758567ecdc3a7
 
 nostrip_files="Dwarf_Fortress"
 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
+	vbin dwarfort
+	rm dwarfort
 	vmkdir /usr/share/dwarffortress
 	vmkdir /usr/lib/dwarffortress/libs
-	vcopy "libs/*" /usr/lib/dwarffortress/libs
-	rm -r libs
-	vcopy "*" /usr/share/dwarffortress/
+	vcopy lib* /usr/lib/dwarffortress/libs
+	rm lib*
+	vcopy * /usr/share/dwarffortress/
 	vlicense "readme.txt" dwarffortress.txt
 }

From 6744ce28c41600615b658d5b02292eed8d5da972 Mon Sep 17 00:00:00 2001
From: Roger Freitas Pereira <roger_freitas@live.com>
Date: Sat, 21 Dec 2024 20:53:34 -0300
Subject: [PATCH 2/2] Dwarf-Therapist: update to 42.1.8, adopt.

---
 srcpkgs/Dwarf-Therapist/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Dwarf-Therapist/template b/srcpkgs/Dwarf-Therapist/template
index fd3eb5925f08b9..428031294faba6 100644
--- a/srcpkgs/Dwarf-Therapist/template
+++ b/srcpkgs/Dwarf-Therapist/template
@@ -1,16 +1,21 @@
 # Template file for 'Dwarf-Therapist'
 pkgname=Dwarf-Therapist
-version=41.2.1
+version=42.1.8
 revision=1
 build_style=cmake
 makedepends="qt5-declarative-devel libcap-devel hicolor-icon-theme"
 depends="dwarffortress"
 short_desc="Management tool designed to run side-by-side with Dwarf Fortress"
-maintainer="Robert Stancil <robert.stancil@mavs.uta.edu>"
+maintainer="Rutpiv <roger_freitas@live.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Dwarf-Therapist/Dwarf-Therapist/"
 distfiles="https://github.com/Dwarf-Therapist/Dwarf-Therapist/archive/v${version}.tar.gz"
-checksum=ec954daff6e03d9d44153ed3df90685de3a7a07431fd47639d83b2f5b3f62e4b
+checksum=8770deaa9508b51c78b822e606c69b3dd9e2950f6e97c6e5a2fe0002c9216dfe
+
+post_build() {
+	vsed -i dist/xdg/applications/dwarftherapist.desktop \
+			 -e 's|^Exec=dwarftherapist$|Exec=ptrace_cap_wrapper dwarftherapist|'
+}
 
 post_install() {
 	vbin dist/ptrace_scope/patch_df_ptracer

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR PATCH] [Updated] dwarffortress: update to 51.02, adopt; Dwarf-Therapist: update to 42.1.8, adopt.
  2024-12-22  0:56 [PR PATCH] dwarffortress: update to 50.15, adopt; dwarftherapist: update to 42.1.8, adopt Rutpiv
  2024-12-22  1:01 ` [PR PATCH] [Updated] dwarffortress: update to 50.15, adopt; Dwarf-Therapist: " Rutpiv
  2025-02-04  2:34 ` Rutpiv
@ 2025-02-11  4:54 ` Rutpiv
  2 siblings, 0 replies; 4+ messages in thread
From: Rutpiv @ 2025-02-11  4:54 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Rutpiv/void-packages dwarffortress
https://github.com/void-linux/void-packages/pull/53622

dwarffortress: update to 51.02, adopt; Dwarf-Therapist: update to 42.1.8, adopt.
#### 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)

---

**Summary of Changes:**  
The `dwarffortress` package required updates due to changes in its versioning system and file structure starting from version `0.47.05`. Additionally, I updated the `dwarftherapist` package, which depends on `dwarffortress`. Below are the details of the changes:  

1. **Dwarffortress Package Updates:**  
   - **Versioning Adjustments:**  
     - Simplified version handling to align with the new tagging system.  
     - Updated URLs from `http` to `https` for security.  
   - **Installation Adjustments:**  
     - Removed the now-unnecessary `post_extract` function.  
     - Updated `do_install` to ensure compliance with the new file structure and installation standards.  
   - **Wrapper Updates:**  
     - Reworked the wrapper script to match the updated directory tree and startup script.  
     - Added a backup function for the old `dwarffortress` directory. This preserves save data, even though saves from older versions are incompatible with newer releases.  
   - **Compatibility Considerations:**  
     - Verified compatibility between version `50.10` and the latest `50.15`. The wrapper remains stable due to no changes in the libraries across these versions.  
   - Adopted the package, as it was no longer maintained.  

2. **Dwarf-Therapist Package Updates:**   
   - Modified the `.desktop` file to include the `ptrace_cap_wrapper` in the execution command.  
     - This wrapper automates the setup required for `Dwarf-Therapist` to work on modern kernels by enabling the necessary permissions to modify the memory of a running `Dwarf Fortress` instance.  
     - Without this automation, players would need to manually disable the `kernel.yama.ptrace_scope` security feature or execute the application through the terminal (`ptrace_cap_wrapper dwarftherapist`).  
   - This change improves the user experience by eliminating the need for manual setup.
   - Adopted the package, as it was no longer maintained.  

By adopting both packages (`dwarffortress` and `dwarftherapist`), I’ve ensured that they are updated and functioning correctly with the latest standards. These changes streamline the player experience and provide better long-term compatibility. 

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

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

From b50b3ac36257169c7cfb48f5a3557c126a543bcc Mon Sep 17 00:00:00 2001
From: Roger Freitas Pereira <roger_freitas@live.com>
Date: Sat, 21 Dec 2024 16:42:04 -0300
Subject: [PATCH 1/2] dwarffortress: update to 51.02, adopt.

---
 srcpkgs/dwarffortress/files/dwarffortress | 50 ++++++++++++++++-------
 srcpkgs/dwarffortress/template            | 27 ++++++------
 2 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/dwarffortress/files/dwarffortress b/srcpkgs/dwarffortress/files/dwarffortress
index e40fc75e3cec01..3d0992ede4e433 100644
--- a/srcpkgs/dwarffortress/files/dwarffortress
+++ b/srcpkgs/dwarffortress/files/dwarffortress
@@ -1,26 +1,29 @@
 #!/bin/sh
 ## dwarf fortress wrapper written and maintained by
 # Robert Stancil <robert.stancil@mavs.uta.edu>
-# 
+#
 # MIT License
 #
 # Copyright (c) 2019 Robert Stancil <robert.stancil@mavs.uta.edu>
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy 
-# of this software and associated documentation files (the "Software"), to deal 
-# in the Software without restriction, including without limitation the rights 
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
-# copies of the Software, and to permit persons to whom the Software is 
+# Modified by: Rutpiv <roger_freitas@live.com> in 2024 to adjust symlink
+# creation and preserve existing save data by backing up old directories.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice (including the next 
+# The above copyright notice and this permission notice (including the next
 # paragraph) shall be included in all copies or substantial portions of the Software.
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ##
 
@@ -48,6 +51,22 @@ if [ -z ${XDG_DATA_HOME:-$HOME/.local/share} ]; then
  exit
 fi
 
+# Check if an existing 'dwarffortress' directory with the old structure is found.
+# If found, create a backup of the directory before removing it.
+# The backup is stored as a tar.gz archive with a timestamp to prevent overwriting.
+if [ -d "${XDG_DATA_HOME:-$HOME/.local/share}/dwarffortress" ] &&
+	 [ -f "${XDG_DATA_HOME:-$HOME/.local/share}/dwarffortress/df" ]; then
+ echo "Existing old 'dwarffortress' directory found. Creating a backup..."
+
+ timestamp=$(date +%Y%m%d%H%M%S)
+ backup_file="${XDG_DATA_HOME:-$HOME/.local/share}/dwarffortress_backup_${timestamp}.tar.gz"
+ tar -czf "$backup_file" -C "${XDG_DATA_HOME:-$HOME/.local/share}" dwarffortress
+ echo "Backup created at $backup_file"
+
+ rm -rf "${XDG_DATA_HOME:-$HOME/.local/share}/dwarffortress"
+ echo "Old 'dwarffortress' directory removed."
+fi
+
 if [ ! -d ${XDG_DATA_HOME:-$HOME/.local/share}/dwarffortress ]; then
  _FORCE=yes
 fi
@@ -55,7 +74,10 @@ 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/
+ for lib in /usr/lib/dwarffortress/libs/*; do
+        ln -s "$lib" "${XDG_DATA_HOME:-$HOME/.local/share}/dwarffortress/"
+ done
+ ln -s /usr/bin/dwarfort ${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
diff --git a/srcpkgs/dwarffortress/template b/srcpkgs/dwarffortress/template
index 423e050f257817..37db843512ab10 100644
--- a/srcpkgs/dwarffortress/template
+++ b/srcpkgs/dwarffortress/template
@@ -1,33 +1,30 @@
 # Template file for 'dwarffortress'
 pkgname=dwarffortress
-version=0.47.05
-revision=2
-_urlver=${version#*.}
+version=51.02
+revision=1
+_urlver=${version//./_}
 archs="x86_64"
 depends="gtk+ SDL SDL_ttf SDL_image virtual?libGL glu"
 short_desc="Control a dwarven outpost in a randomly generated world"
-maintainer="Robert Stancil <robert.stancil@mavs.uta.edu>"
+maintainer="Rutpiv <roger_freitas@live.com>"
 license="custom: Proprietary"
-homepage="http://www.bay12games.com/dwarves/"
-distfiles="http://www.bay12games.com/dwarves/df_${_urlver//./_}_linux.tar.bz2"
-checksum=ac74a6dbb7d7d9621f430405080322ab50c35f6632352ff2ea923f6dc5affca3
+homepage="https://www.bay12games.com/dwarves/"
+distfiles="https://www.bay12games.com/dwarves/df_${_urlver}_linux.tar.bz2"
+checksum=beab7a987ea2857da2aecee7ac2deccf6ab2ffaa3d229eee062758567ecdc3a7
 
 nostrip_files="Dwarf_Fortress"
 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
+	vbin dwarfort
+	rm dwarfort
 	vmkdir /usr/share/dwarffortress
 	vmkdir /usr/lib/dwarffortress/libs
-	vcopy "libs/*" /usr/lib/dwarffortress/libs
-	rm -r libs
-	vcopy "*" /usr/share/dwarffortress/
+	vcopy lib* /usr/lib/dwarffortress/libs
+	rm lib*
+	vcopy * /usr/share/dwarffortress/
 	vlicense "readme.txt" dwarffortress.txt
 }

From e580ce5a2581d56422b5f1501ecd7a2d5d09b1d8 Mon Sep 17 00:00:00 2001
From: Roger Freitas Pereira <roger_freitas@live.com>
Date: Sat, 21 Dec 2024 20:53:34 -0300
Subject: [PATCH 2/2] Dwarf-Therapist: update to 42.1.9, adopt.

---
 srcpkgs/Dwarf-Therapist/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Dwarf-Therapist/template b/srcpkgs/Dwarf-Therapist/template
index fd3eb5925f08b9..502ffd12418286 100644
--- a/srcpkgs/Dwarf-Therapist/template
+++ b/srcpkgs/Dwarf-Therapist/template
@@ -1,16 +1,21 @@
 # Template file for 'Dwarf-Therapist'
 pkgname=Dwarf-Therapist
-version=41.2.1
+version=42.1.9
 revision=1
 build_style=cmake
 makedepends="qt5-declarative-devel libcap-devel hicolor-icon-theme"
 depends="dwarffortress"
 short_desc="Management tool designed to run side-by-side with Dwarf Fortress"
-maintainer="Robert Stancil <robert.stancil@mavs.uta.edu>"
+maintainer="Rutpiv <roger_freitas@live.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Dwarf-Therapist/Dwarf-Therapist/"
 distfiles="https://github.com/Dwarf-Therapist/Dwarf-Therapist/archive/v${version}.tar.gz"
-checksum=ec954daff6e03d9d44153ed3df90685de3a7a07431fd47639d83b2f5b3f62e4b
+checksum=c591a434b722e1d0f862e21780fcd1a9ed81b3819d4961e6ecebe1d287859a7e
+
+post_build() {
+	vsed -i dist/xdg/applications/dwarftherapist.desktop \
+			 -e 's|^Exec=dwarftherapist$|Exec=ptrace_cap_wrapper dwarftherapist|'
+}
 
 post_install() {
 	vbin dist/ptrace_scope/patch_df_ptracer

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2025-02-11  4:54 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-12-22  0:56 [PR PATCH] dwarffortress: update to 50.15, adopt; dwarftherapist: update to 42.1.8, adopt Rutpiv
2024-12-22  1:01 ` [PR PATCH] [Updated] dwarffortress: update to 50.15, adopt; Dwarf-Therapist: " Rutpiv
2025-02-04  2:34 ` Rutpiv
2025-02-11  4:54 ` [PR PATCH] [Updated] dwarffortress: update to 51.02, " Rutpiv

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).