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/4] 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 " 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/4] 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/4] 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.