diff options
| author | Jan Cholasta | 2015-05-21 08:02:08 +0200 |
|---|---|---|
| committer | Jan Cholasta | 2015-05-21 09:16:11 +0200 |
| commit | 401ca4018e654b7680d1042cc3b65a99dd8d46bf (patch) | |
| tree | f90d31c03d8ed5e62331d9faf4b3682357e588aa | |
| parent | 5f49675acf46bc66e74c778fae26de2dc4e2ed4e (diff) | |
| download | aur-401ca4018e654b7680d1042cc3b65a99dd8d46bf.tar.gz | |
Update gzdoom-git
The config-update-fix.patch was removed, as it conflicts with the upstream
fix of the same issue.
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 5 | ||||
| -rw-r--r-- | config-update-fix.patch | 12 |
3 files changed, 2 insertions, 19 deletions
@@ -1,6 +1,6 @@ pkgbase = gzdoom-git pkgdesc = Doom source port based on ZDoom with an OpenGL renderer (git version). - pkgver = 1.9pre.r1589.ga95edc3 + pkgver = 1.9pre.r2136.ga59824c pkgrel = 1 url = http://www.osnanet.de/c.oelckers/gzdoom/ arch = i686 @@ -30,12 +30,10 @@ pkgbase = gzdoom-git provides = gzdoom conflicts = gzdoom source = gzdoom::git://github.com/coelckers/gzdoom.git - source = config-update-fix.patch source = doom-share-dir.patch source = stack-noexec.patch source = gzdoom.desktop md5sums = SKIP - md5sums = d1df774110f513225760b83fcb271171 md5sums = ed6c7d1175146bedac3f5a59d09d8f4b md5sums = b83081e982b742010df0afe36b4d49b6 md5sums = 3f5920d839086c9ad04ed1338c3fb546 @@ -1,7 +1,7 @@ # Maintainer: Jan Cholasta <grubber at grubber cz> pkgname=gzdoom-git -pkgver=1.9pre.r1589.ga95edc3 +pkgver=1.9pre.r2136.ga59824c pkgrel=1 pkgdesc="Doom source port based on ZDoom with an OpenGL renderer (git version)." arch=('i686' 'x86_64') @@ -22,12 +22,10 @@ optdepends=('blasphemer: Blasphemer (free Heretic) game data' provides=('gzdoom') conflicts=('gzdoom') source=(gzdoom::git://github.com/coelckers/gzdoom.git \ - config-update-fix.patch \ doom-share-dir.patch \ stack-noexec.patch \ gzdoom.desktop) md5sums=('SKIP' - 'd1df774110f513225760b83fcb271171' 'ed6c7d1175146bedac3f5a59d09d8f4b' 'b83081e982b742010df0afe36b4d49b6' '3f5920d839086c9ad04ed1338c3fb546') @@ -44,7 +42,6 @@ pkgver() { prepare() { cd gzdoom - patch -p1 <"$srcdir/config-update-fix.patch" patch -p1 <"$srcdir/doom-share-dir.patch" patch -p1 <"$srcdir/stack-noexec.patch" diff --git a/config-update-fix.patch b/config-update-fix.patch deleted file mode 100644 index b8d95d170b79..000000000000 --- a/config-update-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur gzdoom.orig/src/m_specialpaths.cpp gzdoom/src/m_specialpaths.cpp ---- gzdoom.orig/src/m_specialpaths.cpp 2014-05-14 11:14:18.348734942 +0200 -+++ gzdoom/src/m_specialpaths.cpp 2014-05-14 11:21:04.005405244 +0200 -@@ -497,7 +497,7 @@ - // This can be removed after a release or two - // Transfer the old zdoom directory to the new location - bool moved = false; -- FString oldpath = NicePath("~/.zdoom/"); -+ FString oldpath = NicePath("~/.gzdoom/"); - if (stat (oldpath, &extrainfo) != -1) - { - if (rename(oldpath, path) == -1) |