summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Cholasta2017-05-02 21:42:37 +0200
committerJan Cholasta2017-05-02 21:43:06 +0200
commit23c63426c1e6ea5072f50c23ce85f61086016516 (patch)
treee40c794990c5a26bfdde18b646d935c02483bdcc
parent2e37090f90ca15dd94576b13b20a068343484f72 (diff)
downloadaur-23c63426c1e6ea5072f50c23ce85f61086016516.tar.gz
gzdoom-3.0.0-2
* revert to using desktop-file-utils rather than xdg-utils
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD21
2 files changed, 9 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 532319afac2..8d06299a50b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = gzdoom
pkgdesc = Advanced Doom source port with OpenGL support
pkgver = 3.0.0
- pkgrel = 1
+ pkgrel = 2
url = http://www.zdoom.org/
arch = i686
arch = x86_64
@@ -10,10 +10,10 @@ pkgbase = gzdoom
license = GPL3
license = LGPL3
makedepends = cmake
+ makedepends = desktop-file-utils
makedepends = fluidsynth
makedepends = git
makedepends = gtk3
- makedepends = xdg-utils
depends = hicolor-icon-theme
depends = libgl
depends = libjpeg
diff --git a/PKGBUILD b/PKGBUILD
index d255086e707..3bed5d28d8c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
_name=gzdoom
pkgname=${_name}
pkgver=3.0.0
-pkgrel=1
+pkgrel=2
pkgdesc='Advanced Doom source port with OpenGL support'
arch=('i686' 'x86_64')
url='http://www.zdoom.org/'
@@ -15,10 +15,10 @@ depends=('hicolor-icon-theme'
'libgme'
'sdl2')
makedepends=('cmake'
+ 'desktop-file-utils'
'fluidsynth'
'git'
- 'gtk3'
- 'xdg-utils')
+ 'gtk3')
optdepends=('blasphemer-wad: Blasphemer (free Heretic) game data'
'chexquest3-wad: Chex Quest 3 game data'
'doom1-wad: Doom shareware game data'
@@ -69,17 +69,10 @@ package() {
install -D "$srcdir"/${_name}.sh "$pkgdir"/usr/bin/$_name
- install -d "$pkgdir"/usr/share/icons/hicolor
- (
- export XDG_DATA_DIRS="$pkgdir"/usr/share
- xdg-desktop-icon install --novendor \
- "$srcdir"/${_name}.desktop
- xdg-icon-resource install --noupdate \
- --novendor \
- --size 48 \
- src/posix/zdoom.xpm \
- $_name
- )
+ desktop-file-install --dir="$pkgdir"/usr/share/applications \
+ "$srcdir"/${_name}.desktop
+ install -D -m644 src/posix/zdoom.xpm \
+ "$pkgdir"/usr/share/icons/hicolor/48x48/apps/${_name}.xpm
install -d "$pkgdir"/usr/share/licenses
ln -s /usr/share/doc/$_name/licenses "$pkgdir"/usr/share/licenses/$pkgname