gzdoom-git-4.4pre+300+g8c1db978b-1

3 files changed, 25 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ffe9b5505982..b57d95b1821e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gzdoom-git
 	pkgdesc = Advanced Doom source port with OpenGL support (git version)
-	pkgver = 4.4pre+105+g15d4fb8fc
+	pkgver = 4.4pre+300+g8c1db978b
 	pkgrel = 1
 	url = http://www.zdoom.org/
 	arch = i686
@@ -42,7 +42,7 @@ pkgbase = gzdoom-git
 	source = 0001-Fix-file-paths.patch
 	sha256sums = SKIP
 	sha256sums = 59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d
-	sha256sums = fb91388572f388d14983ea49f153b6fed36288b283faf6745a25427282c9a20f
+	sha256sums = fc96a19bccf9b53f23865d29632e6fab14386bde2e95ff9523d91b1c5fde6309
 	optdepends_x86_64 = vulkan-driver: Vulkan renderer
 	optdepends_x86_64 = vulkan-icd-loader: Vulkan renderer
 
diff --git a/0001-Fix-file-paths.patch b/0001-Fix-file-paths.patch
index 83c5a9e0f1ff..f87860eed411 100644
--- a/0001-Fix-file-paths.patch
+++ b/0001-Fix-file-paths.patch
@@ -1,14 +1,29 @@
-From 9def07d1ab571430ee97c3db3022b5ba647b3f21 Mon Sep 17 00:00:00 2001
+From d52c1fbe2904fb301cc902e3f5523f9ea8f712ce 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/gameconfigfile.cpp          | 14 ++------------
- src/posix/sdl/i_main.cpp        | 14 +-------------
- src/sound/music/i_soundfont.cpp |  4 +---
+ src/common/audio/music/i_soundfont.cpp |  4 +---
+ src/gameconfigfile.cpp                 | 14 ++------------
+ src/posix/sdl/i_main.cpp               | 14 +-------------
  3 files changed, 4 insertions(+), 28 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/gameconfigfile.cpp b/src/gameconfigfile.cpp
 index a04264dbe..55e66bc4c 100644
 --- a/src/gameconfigfile.cpp
@@ -49,7 +64,7 @@ index a04264dbe..55e66bc4c 100644
  	}
  
 diff --git a/src/posix/sdl/i_main.cpp b/src/posix/sdl/i_main.cpp
-index 9004dc0a3..a88dfcf18 100644
+index ed0e26450..baca003d7 100644
 --- a/src/posix/sdl/i_main.cpp
 +++ b/src/posix/sdl/i_main.cpp
 @@ -187,19 +187,7 @@ int main (int argc, char **argv)
@@ -73,21 +88,6 @@ index 9004dc0a3..a88dfcf18 100644
  	
  	I_StartupJoysticks();
  
-diff --git a/src/sound/music/i_soundfont.cpp b/src/sound/music/i_soundfont.cpp
-index 400f92cb6..41896ae32 100644
---- a/src/sound/music/i_soundfont.cpp
-+++ b/src/sound/music/i_soundfont.cpp
-@@ -231,9 +231,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[] = {
 -- 
-2.25.0
+2.26.0
 
diff --git a/PKGBUILD b/PKGBUILD
index d0af044beaf6..9cb4414882b0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jan Cholasta <grubber at grubber cz>
 
 pkgname=gzdoom-git
-pkgver=4.4pre+105+g15d4fb8fc
+pkgver=4.4pre+300+g8c1db978b
 pkgrel=1
 pkgdesc='Advanced Doom source port with OpenGL support (git version)'
 arch=('i686' 'x86_64')
@@ -41,7 +41,7 @@ source=('gzdoom::git://github.com/coelckers/gzdoom.git'
         '0001-Fix-file-paths.patch')
 sha256sums=('SKIP'
             '59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d'
-            'fb91388572f388d14983ea49f153b6fed36288b283faf6745a25427282c9a20f')
+            'fc96a19bccf9b53f23865d29632e6fab14386bde2e95ff9523d91b1c5fde6309')
 
 pkgver() {
     cd gzdoom