From f4170e52bd5243de3b840924c357a6c840052486 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Thu, 9 Jul 2020 16:03:14 -0700
Subject: Updated to 109.6

---
 PKGBUILD       | 48 +++++++++++++++++++++++++++++-------------------
 input.cpp.diff | 11 +++++++++++
 2 files changed, 40 insertions(+), 19 deletions(-)
 create mode 100644 input.cpp.diff

diff --git a/PKGBUILD b/PKGBUILD
index 2c4ad98..3ca2d14 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,31 +12,41 @@ url='https://www.gnu.org/software/freedink/'
 pkgdesc='Humorous top-down adventure and role-playing game.'
 arch=('x86_64')
 license=('GPL3')
-depends=('freedink-data' 'libzip' 'bzip2' 'zlib' 'fontconfig' 'freetype2'
-         'sdl2_image' 'sdl2_mixer' 'sdl2_ttf' 'sdl2_gfx' 'sdl2' 'expat'
-         'libutil-linux' 'libpng' 'harfbuzz' 'glib2' 'graphite' 'pcre')
-makedepends=('automake' 'autoconf' 'check' 'help2man' 'make' 'cxxtest' 'glm' 'xorg-server-xvfb')
-source=("https://ftp.gnu.org/gnu/freedink/${pkgname}-${pkgver}.tar.gz")
-sha512sums=('9de4155e65c1af58166e30f3f642fed2111eeff2cfccedcd51ea7715e91795d9c9f89d4fa30a801e9a998b7d734682b7d2588ef1ebaba464764c3c3156b6a7ad')
+depends=('freedink-data' 'fontconfig' 'timidity++'
+         'sdl2' 'sdl2_gfx' 'sdl2_image' 'sdl2_mixer' 'sdl2_ttf')
+makedepends=('cxxtest' 'glm' 'help2man')
+source=("https://ftp.gnu.org/gnu/freedink/${pkgname}-${pkgver}.tar.gz"{,.sig}
+        input.cpp.diff)
+sha512sums=('9de4155e65c1af58166e30f3f642fed2111eeff2cfccedcd51ea7715e91795d9c9f89d4fa30a801e9a998b7d734682b7d2588ef1ebaba464764c3c3156b6a7ad'
+            'SKIP'
+            '8d0450756f41293b42da2341e6488fcca2ca621ecd6056d1490f44d03b531c144d49112a4fcda92d1c87eda1102a0f400c8cdf59c309d0c64d76d357a06e35dd')
+validpgpkeys=('42273C1AE37FC4347CF079128FF1CB6E8D89059F') # Sylvain Beucler
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/input.cpp.diff"
+}
 
 build () {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr
-	make
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
 }
 
-check () {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+#check () {
+#  cd "${srcdir}/${pkgname}-${pkgver}"
 
-	# This is just a trivial check.
-	xvfb-run -a -n 96 -s "-screen 0 1600x1200x24" make check
+  # This is just a trivial check.
+#  xvfb-run -a -n 96 -s "-screen 0 1600x1200x24" make check
 
-	# This for the packaging of the source code in a snap shot package
-	# NOT the installed build artifacts.
-	#make distcheck
-}
+  # This for the packaging of the source code in a snap shot package
+  # NOT the installed build artifacts.
+  #make distcheck
+#}
 
 package () {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  export CFLAGS="$CFLAGS -O3 -flto=4 -fno-stack-protector-strong -fno-stack-clash-protection"
+  export CXXFLAGS="$CXXFLAGS -O3 -flto=4 -fno-stack-protector-strong -fno-stack-clash-protection"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/input.cpp.diff b/input.cpp.diff
new file mode 100644
index 0000000..2840091
--- /dev/null
+++ b/input.cpp.diff
@@ -0,0 +1,11 @@
+--- a/src/input.cpp
++++ b/src/input.cpp
+@@ -91,7 +91,7 @@
+ 
+   // TODO: don't attempt to simulate mouse events from touch events -
+   // fake mouse events often are de-centered
+-  SDL_SetHint(SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH, "0");
++  // SDL_SetHint(SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH, "0");
+ 
+   /* Touch devices */
+   {
-- 
cgit v1.2.1