gzdoom-2.1.1-2

* Fix fmodex4.26.36 dependency
* Make gxmessage dependency optional, add alternatives
* Move cmake call from build() to prepare()
* Fix package rebuild
* Use linker option rather than patch to make stack not executable
* Move IWAD symlinks to /usr/lib, drop the related patch
* Remove install file as it was superseded by pacman hooks

6 files changed, 44 insertions, 215 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8fdf0a449b17..473b2d88aef1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = gzdoom
 	pkgdesc = Advanced Doom source port with OpenGL support
 	pkgver = 2.1.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.zdoom.org/
-	install = install
 	arch = i686
 	arch = x86_64
 	license = BSD
@@ -17,9 +16,8 @@ pkgbase = gzdoom
 	makedepends = imagemagick
 	makedepends = xdg-utils
 	depends = fluidsynth
-	depends = fmodex=4.26.36
+	depends = fmodex4.26.36
 	depends = gtk2
-	depends = gxmessage
 	depends = libgl
 	depends = libgme
 	depends = libsndfile
@@ -30,21 +28,20 @@ pkgbase = gzdoom
 	optdepends = chexquest3-wad: Chex Quest 3 game data
 	optdepends = doom1-wad: Doom shareware game data
 	optdepends = freedoom: FreeDoom game data
+	optdepends = gxmessage: crash dialog (GNOME)
 	optdepends = hacx-wad: HacX game data
 	optdepends = harmony-wad: Harmony game data
 	optdepends = heretic1-wad: Heretic shareware game data
 	optdepends = hexen1-wad: Hexen demo game data
+	optdepends = kdebase-kdialog: crash dialog (KDE)
 	optdepends = strife0-wad: Strife shareware game data
 	optdepends = square1-wad: The Adventures of Square, Episode 1 game data
 	optdepends = urbanbrawl-wad: Urban Brawl: Action Doom 2 game data
+	optdepends = xorg-xmessage: crash dialog (other)
 	source = gzdoom::git://github.com/coelckers/gzdoom.git#tag=g2.1.1
-	source = desktop.template
-	source = 0001-Mark-stack-as-not-executable-in-assembler-sources.patch
-	source = 0002-Include-SHARE_DIR-in-IWADSearch.Directories.patch
+	source = launcher.desktop
 	sha256sums = SKIP
-	sha256sums = f2c58925238fe0d01e630527c8c4431681ccaec2d763ba075429b747d1a98a8c
-	sha256sums = 695a17860f7f71789f085da02022f9926a098b570c4672c6c9bf23556caceb72
-	sha256sums = 23ded6a031724252d4ba442dabd4c79dcbec053594adc9fd6a91e8871ce69f85
+	sha256sums = 59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d
 	makedepends_i686 = nasm
 
 pkgname = gzdoom
diff --git a/0001-Mark-stack-as-not-executable-in-assembler-sources.patch b/0001-Mark-stack-as-not-executable-in-assembler-sources.patch
deleted file mode 100644
index a43289319aa8..000000000000
--- a/0001-Mark-stack-as-not-executable-in-assembler-sources.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From e3c21e9833c878e7edb60212dbf1f2fd03393fa5 Mon Sep 17 00:00:00 2001
-From: Jan Cholasta <grubber@grubber.cz>
-Date: Thu, 18 Feb 2016 10:56:03 +0100
-Subject: [PATCH] Mark stack as not executable in assembler sources
-
----
- src/asm_ia32/a.asm     | 10 ++++++++++
- src/asm_ia32/misc.asm  | 10 ++++++++++
- src/asm_ia32/tmap.asm  | 10 ++++++++++
- src/asm_ia32/tmap2.asm | 10 ++++++++++
- src/asm_ia32/tmap3.asm | 10 ++++++++++
- src/asm_x86_64/tmap3.s |  1 +
- 6 files changed, 51 insertions(+)
-
-diff --git a/src/asm_ia32/a.asm b/src/asm_ia32/a.asm
-index b4bc529..bbde26b 100644
---- a/src/asm_ia32/a.asm
-+++ b/src/asm_ia32/a.asm
-@@ -810,3 +810,13 @@ align 16
- GLOBAL _rtext_a_end

- _rtext_a_end:

- %endif

-+

-+%ifidn __OUTPUT_FORMAT__,elf

-+section .note.GNU-stack noalloc noexec nowrite progbits

-+%endif

-+%ifidn __OUTPUT_FORMAT__,elf32

-+section .note.GNU-stack noalloc noexec nowrite progbits

-+%endif

-+%ifidn __OUTPUT_FORMAT__,elf64

-+section .note.GNU-stack noalloc noexec nowrite progbits

-+%endif

-diff --git a/src/asm_ia32/misc.asm b/src/asm_ia32/misc.asm
-index 69e7238..ddd94ec 100644
---- a/src/asm_ia32/misc.asm
-+++ b/src/asm_ia32/misc.asm
-@@ -198,3 +198,13 @@ BestColor_MMX:
- 		pop		ebx

- 		emms

- 		ret

-+

-+%ifidn __OUTPUT_FORMAT__,elf

-+section .note.GNU-stack noalloc noexec nowrite progbits

-+%endif

-+%ifidn __OUTPUT_FORMAT__,elf32

-+section .note.GNU-stack noalloc noexec nowrite progbits

-+%endif

-+%ifidn __OUTPUT_FORMAT__,elf64

-+section .note.GNU-stack noalloc noexec nowrite progbits

-+%endif

-diff --git a/src/asm_ia32/tmap.asm b/src/asm_ia32/tmap.asm
-index 00e6333..539d74d 100644
---- a/src/asm_ia32/tmap.asm
-+++ b/src/asm_ia32/tmap.asm
-@@ -1891,3 +1891,13 @@ _ASM_PatchPitch:
- 		selfmod rtext_start, rtext_end

- 		call	setpitch3

- 		jmp		setvlinebpl_

-+

-+%ifidn __OUTPUT_FORMAT__,elf

-+section .note.GNU-stack noalloc noexec nowrite progbits

-+%endif

-+%ifidn __OUTPUT_FORMAT__,elf32

-+section .note.GNU-stack noalloc noexec nowrite progbits

-+%endif

-+%ifidn __OUTPUT_FORMAT__,elf64

-+section .note.GNU-stack noalloc noexec nowrite progbits

-+%endif

-diff --git a/src/asm_ia32/tmap2.asm b/src/asm_ia32/tmap2.asm
-index e1f1668..39603fb 100644
---- a/src/asm_ia32/tmap2.asm
-+++ b/src/asm_ia32/tmap2.asm
-@@ -638,3 +638,13 @@ rtext_end:
- GLOBAL _rtext_tmap2_end

- _rtext_tmap2_end:

- %endif

-+

-+%ifidn __OUTPUT_FORMAT__,elf

-+section .note.GNU-stack noalloc noexec nowrite progbits

-+%endif

-+%ifidn __OUTPUT_FORMAT__,elf32

-+section .note.GNU-stack noalloc noexec nowrite progbits

-+%endif

-+%ifidn __OUTPUT_FORMAT__,elf64

-+section .note.GNU-stack noalloc noexec nowrite progbits

-+%endif

-diff --git a/src/asm_ia32/tmap3.asm b/src/asm_ia32/tmap3.asm
-index 3161ff3..39233eb 100644
---- a/src/asm_ia32/tmap3.asm
-+++ b/src/asm_ia32/tmap3.asm
-@@ -342,3 +342,13 @@ shift12:	shr	ecx,16
- GLOBAL _rtext_tmap3_end

- _rtext_tmap3_end:

- %endif

-+

-+%ifidn __OUTPUT_FORMAT__,elf

-+section .note.GNU-stack noalloc noexec nowrite progbits

-+%endif

-+%ifidn __OUTPUT_FORMAT__,elf32

-+section .note.GNU-stack noalloc noexec nowrite progbits

-+%endif

-+%ifidn __OUTPUT_FORMAT__,elf64

-+section .note.GNU-stack noalloc noexec nowrite progbits

-+%endif

-diff --git a/src/asm_x86_64/tmap3.s b/src/asm_x86_64/tmap3.s
-index 867d11c..e27f05f 100644
---- a/src/asm_x86_64/tmap3.s
-+++ b/src/asm_x86_64/tmap3.s
-@@ -139,3 +139,4 @@ vltepilog:
- 		.align 16
- 
- 
-+		.section	.note.GNU-stack,"",@progbits
--- 
-2.7.1
-
diff --git a/0002-Include-SHARE_DIR-in-IWADSearch.Directories.patch b/0002-Include-SHARE_DIR-in-IWADSearch.Directories.patch
deleted file mode 100644
index fdd3810b19bc..000000000000
--- a/0002-Include-SHARE_DIR-in-IWADSearch.Directories.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 8323d748f52fe27ff1ba9fdc615ad23ff267db10 Mon Sep 17 00:00:00 2001
-From: Jan Cholasta <grubber@grubber.cz>
-Date: Thu, 18 Feb 2016 13:34:59 +0100
-Subject: [PATCH] Include SHARE_DIR in IWADSearch.Directories
-
----
- src/gameconfigfile.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/gameconfigfile.cpp b/src/gameconfigfile.cpp
-index 3d396d9..c258b2d 100644
---- a/src/gameconfigfile.cpp
-+++ b/src/gameconfigfile.cpp
-@@ -133,6 +133,7 @@ FGameConfigFile::FGameConfigFile ()
- 		SetValueForKey ("Path", "$PROGDIR", true);

- #else

- 		SetValueForKey ("Path", "~/" GAME_DIR, true);

-+		SetValueForKey ("Path", SHARE_DIR, true);

- 		// Arch Linux likes them in /usr/share/doom

- 		// Debian likes them in /usr/share/games/doom

- 		// I assume other distributions don't do anything radically different

--- 
-2.7.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 02307b4b2bef..97f51592f2ca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,21 +2,21 @@
 # Contributor: Christoph Zeiler <rabyte*gmail>
 
 # Build with the recommended fmodex version:
-_fmodex=4.26.36
+_fmodex=fmodex4.26.36
 # Build with the currently installed fmodex version:
-#_fmodex=$(LC_ALL=C pacman -Q fmodex | grep -Po '(?<= ).+(?=-)')
+#_fmodex=$(LC_ALL=C pacman -Q fmodex | sed -r 's/ /=/;s/-.*$//')
 # Build without fmodex:
 #_fmodex=
 
 # Build with OpenAL:
-_openal=1
+_openal=openal
 # Build without OpenAL:
 #_openal=
 
 _name=gzdoom
 pkgname=${_name}
 pkgver=2.1.1
-pkgrel=1
+pkgrel=2
 _label='GZDoom'
 _desc='Advanced Doom source port with OpenGL support'
 pkgdesc="${_desc}"
@@ -24,14 +24,13 @@ arch=('i686' 'x86_64')
 url='http://www.zdoom.org/'
 license=('BSD' 'custom:BUILD' 'custom:doom' 'custom:dumb' 'LGPL')
 depends=('fluidsynth'
-         ${_fmodex:+"fmodex=$_fmodex"}
+         ${_fmodex}
          'gtk2'
-         'gxmessage'
          'libgl'
          'libgme'
          ${_openal:+'libsndfile'}
          ${_openal:+'mpg123'}
-         ${_openal:+'openal'}
+         ${_openal}
          'sdl2')
 makedepends=('cmake'
              'desktop-file-utils'
@@ -43,52 +42,31 @@ optdepends=('blasphemer-wad: Blasphemer (free Heretic) game data'
             'chexquest3-wad: Chex Quest 3 game data'
             'doom1-wad: Doom shareware game data'
             'freedoom: FreeDoom game data'
+            'gxmessage: crash dialog (GNOME)'
             'hacx-wad: HacX game data'
             'harmony-wad: Harmony game data'
             'heretic1-wad: Heretic shareware game data'
             'hexen1-wad: Hexen demo game data'
+            'kdebase-kdialog: crash dialog (KDE)'
             'strife0-wad: Strife shareware game data'
             'square1-wad: The Adventures of Square, Episode 1 game data'
-            'urbanbrawl-wad: Urban Brawl: Action Doom 2 game data')
-install=install
+            'urbanbrawl-wad: Urban Brawl: Action Doom 2 game data'
+            'xorg-xmessage: crash dialog (other)')
 source=("${_name}::git://github.com/coelckers/${_name}.git#tag=g${pkgver}"
-        'desktop.template'
-        '0001-Mark-stack-as-not-executable-in-assembler-sources.patch'
-        '0002-Include-SHARE_DIR-in-IWADSearch.Directories.patch')
+        'launcher.desktop')
 _srcsubdir="${_name}"
 sha256sums=('SKIP'
-            'f2c58925238fe0d01e630527c8c4431681ccaec2d763ba075429b747d1a98a8c'
-            '695a17860f7f71789f085da02022f9926a098b570c4672c6c9bf23556caceb72'
-            '23ded6a031724252d4ba442dabd4c79dcbec053594adc9fd6a91e8871ce69f85')
+            '59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d')
 
 prepare() {
     cd "${_srcsubdir}"
 
-    local _file
-    for _file in "${source[@]}"; do
-        if [[ "${_file}" == *.patch ]]; then
-            patch -p1 <"${srcdir}/${_file}"
-        fi
-    done
-}
-
-build() {
-    cd "${_srcsubdir}"
-
-    cat >"${_name}.sh" <<EOF
-#!/bin/sh
-exec /usr/lib/${_name}/${_name} "\$@"
-EOF
-
-    local _nofmod _noopenal _fmodincdir
+    local _nofmod _noopenal _fmodincdir _fmodlib
 
     if [[ -n "${_fmodex}" ]]; then
         _nofmod=OFF
-
-        _fmodincdir="/usr/include/fmodex-${_fmodex}"
-        if [[ ! -e "${_fmodincdir}" ]]; then
-            _fmodincdir='/usr/include/fmodex'
-        fi
+        _fmodincdir=$(LC_ALL=C pacman -Ql ${_fmodex%=*} | grep -Eo '/usr/include/fmodex[^/]*/$')
+        _fmodlib=$(LC_ALL=C pacman -Ql ${_fmodex%=*} | grep -Eo '/usr/lib/libfmodex-[^/]*\.so$')
     else
         _nofmod=ON
     fi
@@ -103,23 +81,29 @@ EOF
           -DNO_OPENAL=${_noopenal} \
           -DGME_INCLUDE_DIR='/usr/include/gme' \
           -DFMOD_INCLUDE_DIR="${_fmodincdir}" \
-          -DFMOD_LIBRARY="/usr/lib/libfmodex-${_fmodex}.so" \
+          -DFMOD_LIBRARY="${_fmodlib}" \
           -DFORCE_INTERNAL_GME=OFF \
           -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" \
           .
+}
+
+build() {
+    cd "${_srcsubdir}"
+
+    cat >"${_name}.sh" <<EOF
+#!/bin/sh
+exec /usr/lib/${_name}/${_name} "\$@"
+EOF
+
     make
 
     sed -n '/\*\*-/,/\*\*-/p' 'src/version.h' >'bsd.txt'
 
-    cp "${srcdir}/desktop.template" "${_name}.desktop"
-    desktop-file-edit --set-name="${_label}" \
-                      --set-generic-name="${_desc}" \
-                      --set-icon="${_name}" \
-                      --set-key=Exec --set-value="${_name} %F" \
-                      "${_name}.desktop"
+    cp "${srcdir}/launcher.desktop" "${_name}.desktop"
 
-    mkdir 'icons'
+    mkdir -p 'icons'
     convert 'src/win32/icon1.ico[2]' 'icons/48.png'
     convert 'src/win32/icon1.ico[3]' 'icons/32.png'
     convert 'src/win32/icon1.ico[4]' 'icons/16.png'
@@ -136,14 +120,14 @@ package() {
     if [[ -n "${_fmodex}" ]]; then
         install 'liboutput_sdl.so' "${pkgdir}/usr/lib/${_name}/"
     fi
+    ln -s '/usr/share/doom/doom.wad' "${pkgdir}/usr/lib/${_name}/freedoomu.wad"
+    ln -s '/usr/share/doom/doom2.wad' "${pkgdir}/usr/lib/${_name}/freedoom.wad"
+    ln -s '/usr/share/doom/heretic.wad' "${pkgdir}/usr/lib/${_name}/blasphemer.wad"
+    ln -s '/usr/share/doom/hexen.wad' "${pkgdir}/usr/lib/${_name}/hexendemo.wad"
 
     mkdir -p "${pkgdir}/usr/share/${_name}"
     install -m644 'brightmaps.pk3' "${pkgdir}/usr/share/${_name}/"
     install -m644 'lights.pk3' "${pkgdir}/usr/share/${_name}/"
-    ln -s '/usr/share/doom/doom.wad' "${pkgdir}/usr/share/${_name}/freedoomu.wad"
-    ln -s '/usr/share/doom/doom2.wad' "${pkgdir}/usr/share/${_name}/freedoom.wad"
-    ln -s '/usr/share/doom/heretic.wad' "${pkgdir}/usr/share/${_name}/blasphemer.wad"
-    ln -s '/usr/share/doom/hexen.wad' "${pkgdir}/usr/share/${_name}/hexendemo.wad"
 
     mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
     install -m644 'bsd.txt' "${pkgdir}/usr/share/licenses/${pkgname}/bsd.txt"
diff --git a/install b/install
deleted file mode 100644
index a3292a2070bc..000000000000
--- a/install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-    if [[ -x usr/bin/xdg-icon-resource ]]; then
-        usr/bin/xdg-icon-resource forceupdate
-    fi
-    if [[ -x usr/bin/update-desktop-database ]]; then
-        usr/bin/update-desktop-database -q
-    fi
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/desktop.template b/launcher.desktop
index 172a5d7cae83..4de1fa826af6 100644
--- a/desktop.template
+++ b/launcher.desktop
@@ -1,6 +1,10 @@
 [Desktop Entry]
 Type=Application
 Version=1.0
+Name=GZDoom
+GenericName=Advanced Doom source port with OpenGL support
+Icon=gzdoom
+Exec=gzdoom %F
 Terminal=false
 MimeType=application/x-doom-wad;
 Categories=Game;ActionGame;