gzdoom-git-2.4pre.58.ge188047d7-1

* Add optional dependency on gtk3, remove dependency on gtk2
* Add missing libjpeg dependency
* Add missing hicolor-icon-theme dependency
* Use `make install` in package()

2 files changed, 18 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bf79eb46546b..4fc9cb51600a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gzdoom-git
 	pkgdesc = Advanced Doom source port with OpenGL support (git version)
-	pkgver = 2.3pre.1078.g8708c69f8
+	pkgver = 2.4pre.58.ge188047d7
 	pkgrel = 1
 	url = http://www.zdoom.org/
 	arch = i686
@@ -14,11 +14,13 @@ pkgbase = gzdoom-git
 	makedepends = desktop-file-utils
 	makedepends = fluidsynth
 	makedepends = git
+	makedepends = gtk3
 	makedepends = imagemagick
 	makedepends = openal
 	makedepends = xdg-utils
-	depends = gtk2
+	depends = hicolor-icon-theme
 	depends = libgl
+	depends = libjpeg
 	depends = libgme
 	depends = libsndfile
 	depends = mpg123
@@ -30,6 +32,7 @@ pkgbase = gzdoom-git
 	optdepends = freedm: FreeDM game data
 	optdepends = freedoom1: Freedoom: Phase 1 game data
 	optdepends = freedoom2: Freedoom: Phase 2 game data
+	optdepends = gtk3: IWAD selection dialog
 	optdepends = gxmessage: crash dialog (GNOME)
 	optdepends = hacx-wad: HacX game data
 	optdepends = harmony-wad: Harmony game data
diff --git a/PKGBUILD b/PKGBUILD
index 1ffa3eccd816..ffbd8742c1af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,15 +7,16 @@ _fmodex=
 
 _name=gzdoom
 pkgname=${_name}-git
-pkgver=2.3pre.1078.g8708c69f8
+pkgver=2.4pre.58.ge188047d7
 pkgrel=1
 pkgdesc='Advanced Doom source port with OpenGL support  (git version)'
 arch=('i686' 'x86_64')
 url='http://www.zdoom.org/'
 license=('BSD' 'custom:BUILD' 'custom:doom' 'custom:dumb' 'LGPL')
 depends=(${_fmodex:+$(LC_ALL=C pacman -Q $_fmodex | sed -r 's/ /=/;s/-.*$//')}
-         'gtk2'
+         'hicolor-icon-theme'
          'libgl'
+         'libjpeg'
          'libgme'
          'libsndfile'
          'mpg123'
@@ -24,6 +25,7 @@ makedepends=('cmake'
              'desktop-file-utils'
              'fluidsynth'
              'git'
+             'gtk3'
              'imagemagick'
              'openal'
              'xdg-utils')
@@ -34,6 +36,7 @@ optdepends=('blasphemer-wad: Blasphemer (free Heretic) game data'
             'freedm: FreeDM game data'
             'freedoom1: Freedoom: Phase 1 game data'
             'freedoom2: Freedoom: Phase 2 game data'
+            'gtk3: IWAD selection dialog'
             'gxmessage: crash dialog (GNOME)'
             'hacx-wad: HacX game data'
             'harmony-wad: Harmony game data'
@@ -80,6 +83,9 @@ build() {
           -DCMAKE_C_FLAGS="$CFLAGS -DSHARE_DIR=\\\"/usr/share/${_name}\\\"" \
           -DCMAKE_CXX_FLAGS="$CXXFLAGS -DSHARE_DIR=\\\"/usr/share/${_name}\\\"" \
           -DCMAKE_EXE_LINKER_FLAGS="$LDFLAGS -Wl,-z,noexecstack" \
+          -DCMAKE_INSTALL_PREFIX=/usr \
+          -DINSTALL_PATH=lib/$_name \
+          -DINSTALL_PK3_PATH=share/$_name \
           .
     make
 
@@ -88,8 +94,6 @@ build() {
 exec /usr/lib/${_name}/${_name} "\$@"
 EOF
 
-    sed -n '/\*\*-/,/\*\*-/p' 'src/version.h' >'bsd.txt'
-
     cp "${srcdir}/launcher.desktop" "${_name}.desktop"
 
     mkdir -p 'icons'
@@ -103,22 +107,15 @@ package() {
 
     install -D "${_name}.sh" "${pkgdir}/usr/bin/${_name}"
 
-    mkdir -p "${pkgdir}/usr/lib/${_name}"
-    install "${_name}" "${pkgdir}/usr/lib/${_name}/"
-    install -m644 "${_name}.pk3" "${pkgdir}/usr/lib/${_name}/"
+    make install DESTDIR="$pkgdir"
+
+    ln -s /usr/share/$_name/${_name}.pk3 "$pkgdir"/usr/lib/$_name/${_name}.pk3
     if [[ -n "${_fmodex}" ]]; then
         install 'liboutput_sdl.so' "${pkgdir}/usr/lib/${_name}/"
     fi
 
-    mkdir -p "${pkgdir}/usr/share/${_name}"
-    install -m644 'brightmaps.pk3' "${pkgdir}/usr/share/${_name}/"
-    install -m644 'lights.pk3' "${pkgdir}/usr/share/${_name}/"
-
-    mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
-    install -m644 'bsd.txt' "${pkgdir}/usr/share/licenses/${pkgname}/bsd.txt"
-    install -m644 'docs/BUILDLIC.TXT' "${pkgdir}/usr/share/licenses/${pkgname}/buildlic.txt"
-    install -m644 'docs/doomlic.txt' "${pkgdir}/usr/share/licenses/${pkgname}/doomlic.txt"
-    install -m644 'dumb/licence.txt' "${pkgdir}/usr/share/licenses/${pkgname}/dumb.txt"
+    mkdir -p "$pkgdir"/usr/share/licenses
+    ln -s /usr/share/doc/$_name/licenses "$pkgdir"/usr/share/licenses/$pkgname
 
     desktop-file-install --dir="${pkgdir}/usr/share/applications" "${_name}.desktop"