From: SpidFightFR <SpidFightFR@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] gzdoom: update to version 4.11.3 + patch fixing missing pk3files.
Date: Sat, 18 Nov 2023 19:13:30 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-47299@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 769 bytes --]
There is a new pull request by SpidFightFR against master on the void-packages repository
https://github.com/SpidFightFR/void-packages update-gzdoom-plus-patch
https://github.com/void-linux/void-packages/pull/47299
gzdoom: update to version 4.11.3 + patch fixing missing pk3files.
<!-- 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, (x64-GlibC)
Hey everyone!
This PR focuses on updating GZDoom, to v4.11.3, but it also brings a patch to fix gzdoom not being able to find pk3 files.
A patch file from https://github.com/void-linux/void-packages/pull/47299.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-gzdoom-plus-patch-47299.patch --]
[-- Type: text/x-diff, Size: 2720 bytes --]
From 79412b121635e137ddd25c6779380e55a282da96 Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight@swisscows.email>
Date: Sat, 18 Nov 2023 19:01:34 +0100
Subject: [PATCH] gzdoom: update to version 4.11.3 + patch fixing missing
pk3files.
---
srcpkgs/gzdoom/patches/pk3location.patch | 22 ++++++++++++++++++++++
srcpkgs/gzdoom/template | 6 +++---
2 files changed, 25 insertions(+), 3 deletions(-)
create mode 100755 srcpkgs/gzdoom/patches/pk3location.patch
diff --git a/srcpkgs/gzdoom/patches/pk3location.patch b/srcpkgs/gzdoom/patches/pk3location.patch
new file mode 100755
index 0000000000000..accf180f468d5
--- /dev/null
+++ b/srcpkgs/gzdoom/patches/pk3location.patch
@@ -0,0 +1,22 @@
+diff --git a/src/gameconfigfile.cpp b/src/gameconfigfile.cpp
+index 0b3931e..c6856cc 100644
+--- a/src/gameconfigfile.cpp
++++ b/src/gameconfigfile.cpp
+@@ -124,6 +124,8 @@ FGameConfigFile::FGameConfigFile ()
+ SetValueForKey ("Path", "/usr/local/share/doom", true);
+ SetValueForKey ("Path", "/usr/local/share/games/doom", true);
+ SetValueForKey ("Path", "/usr/share/doom", true);
++ // Adds the correct locations of the pk3file for Voidlinux
++ SetValueForKey ("Path", "/usr/share/gzdoom", true);
+ SetValueForKey ("Path", "/usr/share/games/doom", true);
+ #endif
+ }
+@@ -146,6 +148,8 @@ FGameConfigFile::FGameConfigFile ()
+ SetValueForKey ("Path", "/usr/local/share/doom", true);
+ SetValueForKey ("Path", "/usr/local/share/games/doom", true);
+ SetValueForKey ("Path", "/usr/share/doom", true);
++ // Adds the correct locations of the pk3file for Voidlinux
++ SetValueForKey ("Path", "/usr/share/gzdoom", true);
+ SetValueForKey ("Path", "/usr/share/games/doom", true);
+ #endif
+ SetValueForKey ("Path", "$DOOMWADDIR", true);
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 37b30f359fde1..f0b6cb813e08c 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,6 +1,6 @@
# Template file for 'gzdoom'
pkgname=gzdoom
-version=4.11.0
+version=4.11.3
revision=1
archs="~i686* ~arm*"
build_style=cmake
@@ -14,8 +14,8 @@ homepage="https://www.zdoom.org"
# WARNING: watch out for new submodules
distfiles="https://github.com/ZDoom/gzdoom/archive/g${version}.tar.gz
https://github.com/ZDoom/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb"
-checksum="44a0aee6fa6b9cc2f5956bb98252708720b03ddf264821c487ce6af07cb204d7
- 23cec6b75612e106aa32dbf1e44dcddb5cce73d7476ab58da1af9429bcafeed4"
+checksum="5943dba50da20ff94f1fcc415132672d42a15917c571b1c2b7ceefe14935f5d5
+ 4c544d243dc15fc22000a3b6eabd83fd70f87ea63205a14ff04254c092f74642"
skip_extraction="${pkgname}_${version}_amd64.deb"
nocross=yes
next reply other threads:[~2023-11-18 18:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-18 18:13 SpidFightFR [this message]
2023-11-18 19:38 ` [PR PATCH] [Merged]: " Johnnynator
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-47299@inbox.vuxu.org \
--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).