From: SpidFightFR <SpidFightFR@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] gzdoom: add patch for correct pk3 file search location by default.
Date: Sun, 08 Oct 2023 10:38:11 +0200 [thread overview]
Message-ID: <20231008083811.j1fHZR23JJackUC_FvW0PamMcMGmiwDOzygB74OQLJc@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46503@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 875 bytes --]
There is an updated pull request by SpidFightFR against master on the void-packages repository
https://github.com/SpidFightFR/void-packages update-gzdoom
https://github.com/void-linux/void-packages/pull/46503
gzdoom: add patch for correct pk3 file search location by default.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (GlibC)
Heya guys ! As promised [here](https://github.com/void-linux/void-packages/issues/46386#issuecomment-1743488596), i made a tiny patch for GZDoom to search it's own `.pk3` files by default.
This should solve the issue for anyone having this issue !
A patch file from https://github.com/void-linux/void-packages/pull/46503.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-gzdoom-46503.patch --]
[-- Type: text/x-diff, Size: 2385 bytes --]
From 1a683e5188dad70c87c2094fdfd625d8c711a0ed Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight.one@gmail.com>
Date: Sun, 8 Oct 2023 08:26:02 +0000
Subject: [PATCH] gzdoom: add patch for correct pk3 file search location by
default.
---
srcpkgs/gzdoom/patches/pk3location.patch | 22 ++++++++++++++++++++++
srcpkgs/gzdoom/template | 2 +-
2 files changed, 23 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gzdoom/patches/pk3location.patch
diff --git a/srcpkgs/gzdoom/patches/pk3location.patch b/srcpkgs/gzdoom/patches/pk3location.patch
new file mode 100644
index 0000000000000..6bde3b8841144
--- /dev/null
+++ b/srcpkgs/gzdoom/patches/pk3location.patch
@@ -0,0 +1,22 @@
+diff --git a/src/gameconfigfile.cpp b/src/gameconfigfile.cpp
+index 0b3931e..d3f3863 100644
+--- a/src/gameconfigfile.cpp
++++ b/src/gameconfigfile.cpp
+@@ -121,6 +121,8 @@ FGameConfigFile::FGameConfigFile ()
+ // Arch Linux likes them in /usr/share/doom
+ // Debian likes them in /usr/share/games/doom
+ // I assume other distributions don't do anything radically different
++ // Adds the correct locations of the pk3file for Voidlinux - Patch by SpidFightFR
++ SetValueForKey ("Path", "/usr/local/share/gzdoom", true);
+ SetValueForKey ("Path", "/usr/local/share/doom", true);
+ SetValueForKey ("Path", "/usr/local/share/games/doom", true);
+ SetValueForKey ("Path", "/usr/share/doom", true);
+@@ -143,6 +145,8 @@ FGameConfigFile::FGameConfigFile ()
+ SetValueForKey ("Path", "$HOME/" GAME_DIR, true);
+ SetValueForKey ("Path", "$HOME/.local/share/games/doom", true);
+ SetValueForKey ("Path", SHARE_DIR, true);
++ // Adds the correct locations of the pk3file for Voidlinux - Patch by SpidFightFR
++ SetValueForKey ("Path", "/usr/local/share/gzdoom", true);
+ SetValueForKey ("Path", "/usr/local/share/doom", true);
+ SetValueForKey ("Path", "/usr/local/share/games/doom", true);
+ SetValueForKey ("Path", "/usr/share/doom", true);
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 37b30f359fde1..d6928d148a436 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,7 +1,7 @@
# Template file for 'gzdoom'
pkgname=gzdoom
version=4.11.0
-revision=1
+revision=2
archs="~i686* ~arm*"
build_style=cmake
configure_args="-DINSTALL_PK3_PATH=share/gzdoom -DDYN_GTK=OFF -DDYN_OPENAL=OFF"
next prev parent reply other threads:[~2023-10-08 8:38 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-07 11:14 [PR PATCH] " SpidFightFR
2023-10-08 8:38 ` SpidFightFR [this message]
2023-10-08 9:07 ` [PR PATCH] [Updated] " SpidFightFR
2023-10-09 21:57 ` loosefish-scapegrace
2023-10-10 6:44 ` SpidFightFR
2023-10-10 6:51 ` [PR PATCH] [Updated] " SpidFightFR
2023-10-10 6:52 ` SpidFightFR
2023-10-26 12:58 ` SpidFightFR
2023-11-18 18:25 ` SpidFightFR
2023-11-18 18:25 ` [PR PATCH] [Closed]: " SpidFightFR
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231008083811.j1fHZR23JJackUC_FvW0PamMcMGmiwDOzygB74OQLJc@z \
--to=spidfightfr@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).