gzdoom-git-4.11pre+8+gde65d1b96-1

1 files changed, 10 insertions, 36 deletions

diff --git a/0001-Fix-file-paths.patch b/0001-Fix-file-paths.patch
index cc8adb641d4a..5df3f66c809e 100644
--- a/0001-Fix-file-paths.patch
+++ b/0001-Fix-file-paths.patch
@@ -1,43 +1,17 @@
-From 99e82d0644fee9a21e967b7b8708ff253e7528d5 Mon Sep 17 00:00:00 2001
+From 749acb5c34edad113b083e37df034887674aad3e Mon Sep 17 00:00:00 2001
 From: Jan Cholasta <jan@cholasta.net>
 Date: Tue, 25 Feb 2020 12:53:07 +0100
 Subject: [PATCH] Fix file paths
 
 ---
- src/common/platform/posix/sdl/i_main.cpp | 14 +-------------
- src/gameconfigfile.cpp                   | 10 ++--------
- 2 files changed, 3 insertions(+), 21 deletions(-)
+ src/gameconfigfile.cpp | 10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
 
-diff --git a/src/common/platform/posix/sdl/i_main.cpp b/src/common/platform/posix/sdl/i_main.cpp
-index a28b90f01..7299029fd 100644
---- a/src/common/platform/posix/sdl/i_main.cpp
-+++ b/src/common/platform/posix/sdl/i_main.cpp
-@@ -175,19 +175,7 @@ int main (int argc, char **argv)
- 	Args = new FArgs(argc, argv);
- 
- 	// Should we even be doing anything with progdir on Unix systems?
--	char program[PATH_MAX];
--	if (realpath (argv[0], program) == NULL)
--		strcpy (program, argv[0]);
--	char *slash = strrchr (program, '/');
--	if (slash != NULL)
--	{
--		*(slash + 1) = '\0';
--		progdir = program;
--	}
--	else
--	{
--		progdir = "./";
--	}
-+	progdir = "/usr/lib/gzdoom/";
- 
- 	I_StartupJoysticks();
- 
 diff --git a/src/gameconfigfile.cpp b/src/gameconfigfile.cpp
-index 17898f3ae..7bfb63205 100644
+index 82b8071b60..a6584fa6f5 100644
 --- a/src/gameconfigfile.cpp
 +++ b/src/gameconfigfile.cpp
-@@ -119,8 +119,6 @@ FGameConfigFile::FGameConfigFile ()
+@@ -121,8 +121,6 @@ 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
@@ -46,7 +20,7 @@ index 17898f3ae..7bfb63205 100644
  		SetValueForKey ("Path", "/usr/share/doom", true);
  		SetValueForKey ("Path", "/usr/share/games/doom", true);
  #endif
-@@ -141,8 +139,6 @@ FGameConfigFile::FGameConfigFile ()
+@@ -143,8 +141,6 @@ FGameConfigFile::FGameConfigFile ()
  		SetValueForKey ("Path", "$HOME/" GAME_DIR, true);
  		SetValueForKey ("Path", "$HOME/.local/share/games/doom", true);
  		SetValueForKey ("Path", SHARE_DIR, true);
@@ -55,7 +29,7 @@ index 17898f3ae..7bfb63205 100644
  		SetValueForKey ("Path", "/usr/share/doom", true);
  		SetValueForKey ("Path", "/usr/share/games/doom", true);
  #endif
-@@ -170,10 +166,8 @@ FGameConfigFile::FGameConfigFile ()
+@@ -172,10 +168,8 @@ FGameConfigFile::FGameConfigFile ()
  		SetValueForKey("Path", "$HOME/" GAME_DIR "/fm_banks", true);
  		SetValueForKey("Path", "$HOME/.local/share/games/doom/soundfonts", true);
  		SetValueForKey("Path", "$HOME/.local/share/games/doom/fm_banks", true);
@@ -63,11 +37,11 @@ index 17898f3ae..7bfb63205 100644
 -		SetValueForKey("Path", "/usr/local/share/doom/fm_banks", true);
 -		SetValueForKey("Path", "/usr/local/share/games/doom/soundfonts", true);
 -		SetValueForKey("Path", "/usr/local/share/games/doom/fm_banks", true);
-+		SetValueForKey("Path", "/usr/share/" GAMENAMELOWERCASE "/soundfonts", true);
-+		SetValueForKey("Path", "/usr/share/" GAMENAMELOWERCASE "/fm_banks", true);
++		SetValueForKey("Path", "$PROGDIR/soundfonts", true);
++		SetValueForKey("Path", "$PROGDIR/fm_banks", true);
  		SetValueForKey("Path", "/usr/share/doom/soundfonts", true);
  		SetValueForKey("Path", "/usr/share/doom/fm_banks", true);
  		SetValueForKey("Path", "/usr/share/games/doom/soundfonts", true);
 -- 
-2.34.1
+2.38.1