Update patch

3 files changed, 17 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2d1b359b34fa..f3de99190122 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = freedoko-git
 	pkgdesc = Free implementation of the card game Doppelkopf (git version)
-	pkgver = 0.7.16.r303.g8501c111
+	pkgver = 0.7.16.r309.ga2bb6e50
 	pkgrel = 1
 	url = http://free-doko.sourceforge.net/en/FreeDoko.html
 	arch = i686
@@ -19,7 +19,7 @@ pkgbase = freedoko-git
 	source = git+https://gitlab.com/dknof/FreeDoko.git
 	source = freedoko-git-archlinux.patch
 	sha256sums = SKIP
-	sha256sums = 4618a4dd37e24eb6704d791ddbb0d874808ce95abb2fb694584c407b8a845cbc
+	sha256sums = 32daa2d355b71b990df59dd2f975aea15bb0a1445f5f4d3874bf21824c71b59d
 
 pkgname = freedoko-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 89a86c2934b4..0c0060f6a682 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Robert Knauer <robert@privatdemail.net>
 
 pkgname=freedoko-git
-pkgver=0.7.16.r303.g8501c111
+pkgver=0.7.16.r309.ga2bb6e50
 pkgrel=1
 pkgdesc="Free implementation of the card game Doppelkopf (git version)"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ provides=('freedoko')
 source=("git+https://gitlab.com/dknof/FreeDoko.git"
         "freedoko-git-archlinux.patch")
 sha256sums=('SKIP'
-            '4618a4dd37e24eb6704d791ddbb0d874808ce95abb2fb694584c407b8a845cbc')
+            '32daa2d355b71b990df59dd2f975aea15bb0a1445f5f4d3874bf21824c71b59d')
 
 pkgver() {
   cd FreeDoko
diff --git a/freedoko-git-archlinux.patch b/freedoko-git-archlinux.patch
index aeefd5353130..17422ad03712 100644
--- a/freedoko-git-archlinux.patch
+++ b/freedoko-git-archlinux.patch
@@ -1,6 +1,6 @@
 diff -ru --no-dereference -x .git FreeDoko-orig/Makefile FreeDoko/Makefile
---- FreeDoko-orig/Makefile	2017-09-03 22:32:18.328192513 +0200
-+++ FreeDoko/Makefile	2017-09-03 22:36:21.661087423 +0200
+--- FreeDoko-orig/Makefile	2017-09-07 10:42:18.409517998 +0200
++++ FreeDoko/Makefile	2017-09-07 10:46:34.252094150 +0200
 @@ -320,8 +320,7 @@
  	echo "Copying the program"
  	mkdir -p $(DESTDIR)$(BIN_DIRECTORY)
@@ -11,7 +11,7 @@ diff -ru --no-dereference -x .git FreeDoko-orig/Makefile FreeDoko/Makefile
  	cd $(DESTDIR)$(BIN_DIRECTORY) && ln -sf FreeDoko freedoko
  #	Copying the data files
  	echo "Copying the data files"
-@@ -341,18 +340,16 @@
+@@ -341,15 +340,13 @@
  	a2x -f manpage doc/freedoko.adoc
  	mkdir -p $(DESTDIR)$(MAN_DIRECTORY)
  	cp doc/freedoko.6 $(DESTDIR)$(MAN_DIRECTORY)/
@@ -27,16 +27,11 @@ diff -ru --no-dereference -x .git FreeDoko-orig/Makefile FreeDoko/Makefile
 -	chmod 640 $(DESTDIR)$(ICON_DIRECTORY)/FreeDoko.png
 +	chmod 644 $(DESTDIR)$(ICON_DIRECTORY)/FreeDoko.png
  #	copy the desktop file
--	mkdir -p "$(DESKTOP_FILE_DIRECTORY)"
--	sed "s|Exec=.*$$|Exec=$(BIN_DIRECTORY)/FreeDoko|" bin/FreeDoko.desktop > "$(DESKTOP_FILE_DIRECTORY)/FreeDoko.desktop"
-+	mkdir -p "$(DESTDIR)$(DESKTOP_FILE_DIRECTORY)"
-+	sed "s|Exec=.*$$|Exec=$(BIN_DIRECTORY)/FreeDoko|" bin/FreeDoko.desktop > "$(DESTDIR)$(DESKTOP_FILE_DIRECTORY)/FreeDoko.desktop"
- #	all finished
- 	echo "Installation erfolgreich"
- 
+ 	mkdir -p "$(DESTDIR)$(DESKTOP_FILE_DIRECTORY)"
+ 	sed "s|Exec=.*$$|Exec=$(BIN_DIRECTORY)/FreeDoko|" bin/FreeDoko.desktop > "$(DESTDIR)$(DESKTOP_FILE_DIRECTORY)/FreeDoko.desktop"
 diff -ru --no-dereference -x .git FreeDoko-orig/Makefile.install.directories FreeDoko/Makefile.install.directories
---- FreeDoko-orig/Makefile.install.directories	2017-09-03 22:32:18.328192513 +0200
-+++ FreeDoko/Makefile.install.directories	2017-09-03 22:32:52.587635577 +0200
+--- FreeDoko-orig/Makefile.install.directories	2017-09-07 10:42:18.409517998 +0200
++++ FreeDoko/Makefile.install.directories	2017-09-07 10:46:34.255427430 +0200
 @@ -4,14 +4,14 @@
  # the different directories for the files
  
@@ -84,8 +79,8 @@ diff -ru --no-dereference -x .git FreeDoko-orig/Makefile.install.directories Fre
  
  # release
 diff -ru --no-dereference -x .git FreeDoko-orig/data/Makefile FreeDoko/data/Makefile
---- FreeDoko-orig/data/Makefile	2017-09-03 22:32:19.114846280 +0200
-+++ FreeDoko/data/Makefile	2017-09-03 22:37:22.290203717 +0200
+--- FreeDoko-orig/data/Makefile	2017-09-07 10:42:19.272837440 +0200
++++ FreeDoko/data/Makefile	2017-09-07 10:46:34.255427430 +0200
 @@ -32,8 +32,7 @@
  	for d in cardsets iconsets backgrounds sounds; do \
  	  $(MAKE) -C $$d install; \
@@ -97,8 +92,8 @@ diff -ru --no-dereference -x .git FreeDoko-orig/data/Makefile FreeDoko/data/Make
  
  ifeq ($(SHELLTYPE), sh)
 diff -ru --no-dereference -x .git FreeDoko-orig/doc/Makefile FreeDoko/doc/Makefile
---- FreeDoko-orig/doc/Makefile	2017-09-03 22:32:21.034814819 +0200
-+++ FreeDoko/doc/Makefile	2017-09-03 22:37:03.963802226 +0200
+--- FreeDoko-orig/doc/Makefile	2017-09-07 10:42:20.392819421 +0200
++++ FreeDoko/doc/Makefile	2017-09-07 10:46:34.255427430 +0200
 @@ -34,8 +34,7 @@
  	fi
  	cp -a Bugs GPL Roadmap hpux.required_libs-ia64.txt $(DESTDIR)$(HELP_DIRECTORY)/
@@ -110,8 +105,8 @@ diff -ru --no-dereference -x .git FreeDoko-orig/doc/Makefile FreeDoko/doc/Makefi
  endif
  
 diff -ru --no-dereference -x .git FreeDoko-orig/src/Makefile FreeDoko/src/Makefile
---- FreeDoko-orig/src/Makefile	2017-09-03 22:32:23.874768343 +0200
-+++ FreeDoko/src/Makefile	2017-09-03 22:32:52.587635577 +0200
+--- FreeDoko-orig/src/Makefile	2017-09-07 10:42:21.352803977 +0200
++++ FreeDoko/src/Makefile	2017-09-07 10:46:34.255427430 +0200
 @@ -282,7 +282,6 @@
  		-DMANUAL_DIRECTORY_VALUE='\"$(HELP_DIRECTORY)/manual\"' \
  		-DLOCALE_DIRECTORY='\"$(LOCALE_DIRECTORY)\"'" \