* [PR PATCH] gzdoom: add patch for correct pk3 file search location by default.
@ 2023-10-07 11:14 SpidFightFR
2023-10-08 8:38 ` [PR PATCH] [Updated] " SpidFightFR
` (8 more replies)
0 siblings, 9 replies; 10+ messages in thread
From: SpidFightFR @ 2023-10-07 11:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 870 bytes --]
There is a new 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: 1823 bytes --]
From c014f22e1a3ccbb63f0b69809be4438160619bb7 Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight.one@gmail.com>
Date: Sat, 7 Oct 2023 10:34:06 +0000
Subject: [PATCH] gzdoom: add patch for correct pk3 file search location by
default.
---
srcpkgs/gzdoom/patches/pk3location.patch | 13 +++++++++++++
srcpkgs/gzdoom/template | 2 +-
2 files changed, 14 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..c7cbf2e751d87
--- /dev/null
+++ b/srcpkgs/gzdoom/patches/pk3location.patch
@@ -0,0 +1,13 @@
+diff --git a/src/gameconfigfile.cpp b/src/gameconfigfile.cpp
+index 0b3931e..86bb3f8 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);
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"
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] gzdoom: add patch for correct pk3 file search location by default.
2023-10-07 11:14 [PR PATCH] gzdoom: add patch for correct pk3 file search location by default SpidFightFR
@ 2023-10-08 8:38 ` SpidFightFR
2023-10-08 9:07 ` SpidFightFR
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: SpidFightFR @ 2023-10-08 8:38 UTC (permalink / raw)
To: ml
[-- 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"
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] gzdoom: add patch for correct pk3 file search location by default.
2023-10-07 11:14 [PR PATCH] gzdoom: add patch for correct pk3 file search location by default SpidFightFR
2023-10-08 8:38 ` [PR PATCH] [Updated] " SpidFightFR
@ 2023-10-08 9:07 ` SpidFightFR
2023-10-09 21:57 ` loosefish-scapegrace
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: SpidFightFR @ 2023-10-08 9:07 UTC (permalink / raw)
To: ml
[-- 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: 2274 bytes --]
From f1d9959cd9e1ec572e08e6fcec8462cfdd0c1fab Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight.one@gmail.com>
Date: Sun, 8 Oct 2023 08:58:06 +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..f7132103af64b
--- /dev/null
+++ b/srcpkgs/gzdoom/patches/pk3location.patch
@@ -0,0 +1,22 @@
+diff --git a/src/gameconfigfile.cpp b/src/gameconfigfile.cpp
+index 0b3931e..974aa72 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
++ 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);
+@@ -141,6 +143,8 @@ FGameConfigFile::FGameConfigFile ()
+ SetValueForKey ("Path", "$PROGDIR", true);
+ #else
+ SetValueForKey ("Path", "$HOME/" GAME_DIR, true);
++ // Adds the correct locations of the pk3file for Voidlinux
++ SetValueForKey ("Path", "/usr/local/share/gzdoom", true);
+ SetValueForKey ("Path", "$HOME/.local/share/games/doom", true);
+ SetValueForKey ("Path", SHARE_DIR, true);
+ SetValueForKey ("Path", "/usr/local/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"
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: gzdoom: add patch for correct pk3 file search location by default.
2023-10-07 11:14 [PR PATCH] gzdoom: add patch for correct pk3 file search location by default SpidFightFR
2023-10-08 8:38 ` [PR PATCH] [Updated] " SpidFightFR
2023-10-08 9:07 ` SpidFightFR
@ 2023-10-09 21:57 ` loosefish-scapegrace
2023-10-10 6:44 ` SpidFightFR
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: loosefish-scapegrace @ 2023-10-09 21:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 230 bytes --]
New comment by loosefish-scapegrace on void-packages repository
https://github.com/void-linux/void-packages/pull/46503#issuecomment-1753939358
Comment:
shouldn't that be `/usr/share/gzdoom` instead of `/usr/local/share/gzdoom`?
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: gzdoom: add patch for correct pk3 file search location by default.
2023-10-07 11:14 [PR PATCH] gzdoom: add patch for correct pk3 file search location by default SpidFightFR
` (2 preceding siblings ...)
2023-10-09 21:57 ` loosefish-scapegrace
@ 2023-10-10 6:44 ` SpidFightFR
2023-10-10 6:51 ` [PR PATCH] [Updated] " SpidFightFR
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: SpidFightFR @ 2023-10-10 6:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 196 bytes --]
New comment by SpidFightFR on void-packages repository
https://github.com/void-linux/void-packages/pull/46503#issuecomment-1754508346
Comment:
Yeah my bad you're right lemme fix that real quick
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] gzdoom: add patch for correct pk3 file search location by default.
2023-10-07 11:14 [PR PATCH] gzdoom: add patch for correct pk3 file search location by default SpidFightFR
` (3 preceding siblings ...)
2023-10-10 6:44 ` SpidFightFR
@ 2023-10-10 6:51 ` SpidFightFR
2023-10-10 6:52 ` SpidFightFR
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: SpidFightFR @ 2023-10-10 6:51 UTC (permalink / raw)
To: ml
[-- 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: 2181 bytes --]
From 91d1e29b4e0a352077234d6ebdd90bd6a2ff8c24 Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight.one@gmail.com>
Date: Tue, 10 Oct 2023 06:41:55 +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..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..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"
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: gzdoom: add patch for correct pk3 file search location by default.
2023-10-07 11:14 [PR PATCH] gzdoom: add patch for correct pk3 file search location by default SpidFightFR
` (4 preceding siblings ...)
2023-10-10 6:51 ` [PR PATCH] [Updated] " SpidFightFR
@ 2023-10-10 6:52 ` SpidFightFR
2023-10-26 12:58 ` SpidFightFR
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: SpidFightFR @ 2023-10-10 6:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 187 bytes --]
New comment by SpidFightFR on void-packages repository
https://github.com/void-linux/void-packages/pull/46503#issuecomment-1754527319
Comment:
it's fixed now. thanks for the heads up !
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: gzdoom: add patch for correct pk3 file search location by default.
2023-10-07 11:14 [PR PATCH] gzdoom: add patch for correct pk3 file search location by default SpidFightFR
` (5 preceding siblings ...)
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
8 siblings, 0 replies; 10+ messages in thread
From: SpidFightFR @ 2023-10-26 12:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 299 bytes --]
New comment by SpidFightFR on void-packages repository
https://github.com/void-linux/void-packages/pull/46503#issuecomment-1781073454
Comment:
Do we have any update on this PR ? that would be pretty handy to have it in Voidlinux, cuz the default GZDoom doesn't quite work all the time by default.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Closed]: gzdoom: add patch for correct pk3 file search location by default.
2023-10-07 11:14 [PR PATCH] gzdoom: add patch for correct pk3 file search location by default SpidFightFR
` (7 preceding siblings ...)
2023-11-18 18:25 ` SpidFightFR
@ 2023-11-18 18:25 ` SpidFightFR
8 siblings, 0 replies; 10+ messages in thread
From: SpidFightFR @ 2023-11-18 18:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 705 bytes --]
There's a closed pull request on the void-packages repository
gzdoom: add patch for correct pk3 file search location by default.
https://github.com/void-linux/void-packages/pull/46503
Description:
<!-- 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 !
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: gzdoom: add patch for correct pk3 file search location by default.
2023-10-07 11:14 [PR PATCH] gzdoom: add patch for correct pk3 file search location by default SpidFightFR
` (6 preceding siblings ...)
2023-10-26 12:58 ` SpidFightFR
@ 2023-11-18 18:25 ` SpidFightFR
2023-11-18 18:25 ` [PR PATCH] [Closed]: " SpidFightFR
8 siblings, 0 replies; 10+ messages in thread
From: SpidFightFR @ 2023-11-18 18:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 215 bytes --]
New comment by SpidFightFR on void-packages repository
https://github.com/void-linux/void-packages/pull/46503#issuecomment-1817589741
Comment:
Issue dealt in https://github.com/void-linux/void-packages/pull/47299
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-11-18 18:25 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-07 11:14 [PR PATCH] gzdoom: add patch for correct pk3 file search location by default SpidFightFR
2023-10-08 8:38 ` [PR PATCH] [Updated] " SpidFightFR
2023-10-08 9:07 ` 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
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).