summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Cholasta2018-02-25 06:20:06 +0100
committerJan Cholasta2018-02-25 06:20:06 +0100
commitad35eb970a82a54fb3881916f7a71415aecfdd33 (patch)
tree49aeeda62ddd04f96a81ed16e6a3d0cde2acfa50
parent7b9acab789df73255e9d4fdfa4fafe2464a573df (diff)
downloadaur-ad35eb970a82a54fb3881916f7a71415aecfdd33.tar.gz
gzdoom-3.2.5-3
* add upstream fix for gzdoom.pk3 not found with default configuration
-rw-r--r--.SRCINFO4
-rw-r--r--0002-Added-SHARE_DIR-search-path-back.patch25
-rw-r--r--PKGBUILD9
3 files changed, 34 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6d002478a1b..02bf55d45a2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = gzdoom
pkgdesc = Advanced Doom source port with OpenGL support
pkgver = 3.2.5
- pkgrel = 2
+ pkgrel = 3
url = http://www.zdoom.org/
arch = i686
arch = x86_64
@@ -46,9 +46,11 @@ pkgbase = gzdoom
source = gzdoom::git://github.com/coelckers/gzdoom.git#tag=g3.2.5
source = gzdoom.desktop
source = 0001-Fix-path-to-FluidR3-soundfont.patch
+ source = 0002-Added-SHARE_DIR-search-path-back.patch
sha256sums = SKIP
sha256sums = 59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d
sha256sums = 94834c91230c5c3743d47fc83b7d143d827e11e10b528a7d4f2b96e577c1123d
+ sha256sums = 0f7401c77b615f5ce5484da2d65776ee7c989b0160953778adfceb3c631d29dd
pkgname = gzdoom
diff --git a/0002-Added-SHARE_DIR-search-path-back.patch b/0002-Added-SHARE_DIR-search-path-back.patch
new file mode 100644
index 00000000000..e30f08c02f9
--- /dev/null
+++ b/0002-Added-SHARE_DIR-search-path-back.patch
@@ -0,0 +1,25 @@
+From 2b9a2b11ba49f9033565d9a6d9b508f5ef7a9cc1 Mon Sep 17 00:00:00 2001
+From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
+Date: Sat, 24 Feb 2018 17:50:13 +0200
+Subject: [PATCH] Added SHARE_DIR search path back
+
+https://github.com/coelckers/gzdoom/pull/377#issuecomment-368235506
+---
+ src/gameconfigfile.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/gameconfigfile.cpp b/src/gameconfigfile.cpp
+index f6fc12dfa..6e731d2bc 100644
+--- a/src/gameconfigfile.cpp
++++ b/src/gameconfigfile.cpp
+@@ -149,6 +149,7 @@ FGameConfigFile::FGameConfigFile ()
+ SetValueForKey ("Path", "$PROGDIR", true);
+ #else
+ SetValueForKey ("Path", "~/" GAME_DIR, true);
++ SetValueForKey ("Path", SHARE_DIR, true);
+ SetValueForKey ("Path", "/usr/local/share/doom", true);
+ SetValueForKey ("Path", "/usr/local/share/games/doom", true);
+ SetValueForKey ("Path", "/usr/share/doom", true);
+--
+2.16.2
+
diff --git a/PKGBUILD b/PKGBUILD
index a136a52b553..6682c518f40 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
_name=gzdoom
pkgname=${_name}
pkgver=3.2.5
-pkgrel=2
+pkgrel=3
pkgdesc='Advanced Doom source port with OpenGL support'
arch=('i686' 'x86_64')
url='http://www.zdoom.org/'
@@ -45,15 +45,18 @@ optdepends=('blasphemer-wad: Blasphemer (free Heretic) game data'
replaces=("${_name}1")
source=("${_name}::git://github.com/coelckers/${_name}.git#tag=g${pkgver}"
"${_name}.desktop"
- '0001-Fix-path-to-FluidR3-soundfont.patch')
+ '0001-Fix-path-to-FluidR3-soundfont.patch'
+ '0002-Added-SHARE_DIR-search-path-back.patch')
sha256sums=('SKIP'
'59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d'
- '94834c91230c5c3743d47fc83b7d143d827e11e10b528a7d4f2b96e577c1123d')
+ '94834c91230c5c3743d47fc83b7d143d827e11e10b528a7d4f2b96e577c1123d'
+ '0f7401c77b615f5ce5484da2d65776ee7c989b0160953778adfceb3c631d29dd')
prepare() {
cd $_name
patch -p1 -i"$srcdir"/0001-Fix-path-to-FluidR3-soundfont.patch
+ patch -p1 -i"$srcdir"/0002-Added-SHARE_DIR-search-path-back.patch
}
build() {