diff options
| author | Jan Cholasta | 2020-09-23 07:29:21 +0200 |
|---|---|---|
| committer | Jan Cholasta | 2020-09-23 07:32:25 +0200 |
| commit | 24495b91df1080830fc2d3aa0c949ae4a81ec116 (patch) | |
| tree | ad846f26049033164274d62099cb336dd300006e /0001-Fix-file-paths.patch | |
| parent | a69a38dbcda1a0dc81d0e06c526af6761ad258dc (diff) | |
| download | aur-24495b91df1080830fc2d3aa0c949ae4a81ec116.tar.gz | |
gzdoom-git-4.5pre+149+gec3cd68c1-1
Diffstat (limited to '0001-Fix-file-paths.patch')
| -rw-r--r-- | 0001-Fix-file-paths.patch | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/0001-Fix-file-paths.patch b/0001-Fix-file-paths.patch index 0d4124f1d201..bd229c9d53ed 100644 --- a/0001-Fix-file-paths.patch +++ b/0001-Fix-file-paths.patch @@ -1,29 +1,13 @@ -From 401bce4a69d773cbacc28df57004155204dbe707 Mon Sep 17 00:00:00 2001 +From ae97c9c15f3ee0d63573a319afda1e15fbe40cce 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/audio/music/i_soundfont.cpp | 4 +--- src/common/platform/posix/sdl/i_main.cpp | 14 +------------- src/gameconfigfile.cpp | 14 ++------------ - 3 files changed, 4 insertions(+), 28 deletions(-) + 2 files changed, 3 insertions(+), 25 deletions(-) -diff --git a/src/common/audio/music/i_soundfont.cpp b/src/common/audio/music/i_soundfont.cpp -index a8b4e9fdf..911b8e308 100644 ---- a/src/common/audio/music/i_soundfont.cpp -+++ b/src/common/audio/music/i_soundfont.cpp -@@ -232,9 +232,7 @@ FPatchSetReader::FPatchSetReader(const char *filename) - #ifndef _WIN32 - mCaseSensitivePaths = true; - const char *paths[] = { -- "/usr/local/lib/timidity", -- "/etc/timidity", -- "/etc" -+ "/etc/timidity++" - }; - #else - const char *paths[] = { diff --git a/src/common/platform/posix/sdl/i_main.cpp b/src/common/platform/posix/sdl/i_main.cpp index 7fc179a51..f39a38440 100644 --- a/src/common/platform/posix/sdl/i_main.cpp @@ -89,5 +73,5 @@ index 7f7e55a21..8dfd6a9b3 100644 } -- -2.27.0 +2.28.0 |