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 | |
| parent | a69a38dbcda1a0dc81d0e06c526af6761ad258dc (diff) | |
| download | aur-24495b91df1080830fc2d3aa0c949ae4a81ec116.tar.gz | |
gzdoom-git-4.5pre+149+gec3cd68c1-1
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | 0001-Fix-file-paths.patch | 22 | ||||
| -rw-r--r-- | PKGBUILD | 6 |
3 files changed, 9 insertions, 25 deletions
@@ -1,6 +1,6 @@ pkgbase = gzdoom-git - pkgdesc = Advanced Doom source port with OpenGL support (git version) - pkgver = 4.5pre+136+gb11298afd + pkgdesc = Feature centric port for all Doom engine games (git version) + pkgver = 4.5pre+149+gec3cd68c1 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 = ee6629e35d0422dff628cf715244a8a444b9cb9fac4e11f2b852ee7f23f4d587 + sha256sums = 9b6c37c6fc90080ceb4162673f23187210b083af7cd61294ece2711790eac186 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 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 @@ -1,9 +1,9 @@ # Maintainer: Jan Cholasta <grubber at grubber cz> pkgname=gzdoom-git -pkgver=4.5pre+136+gb11298afd +pkgver=4.5pre+149+gec3cd68c1 pkgrel=1 -pkgdesc='Advanced Doom source port with OpenGL support (git version)' +pkgdesc='Feature centric port for all Doom engine games (git version)' arch=('i686' 'x86_64') url='http://www.zdoom.org/' license=('BSD' 'GPL3' 'LGPL3') @@ -41,7 +41,7 @@ source=('gzdoom::git://github.com/coelckers/gzdoom.git' '0001-Fix-file-paths.patch') sha256sums=('SKIP' '59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d' - 'ee6629e35d0422dff628cf715244a8a444b9cb9fac4e11f2b852ee7f23f4d587') + '9b6c37c6fc90080ceb4162673f23187210b083af7cd61294ece2711790eac186') pkgver() { cd gzdoom |