Update patch

3 files changed, 19 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f3de99190122..110f97eabde7 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.r309.ga2bb6e50
+	pkgver = 0.7.16.r401.g90d107fe
 	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 = 32daa2d355b71b990df59dd2f975aea15bb0a1445f5f4d3874bf21824c71b59d
+	sha256sums = c167cd37fdbdb466374fb331d4b2136be61fcce7943be336df62f3fce8d1f775
 
 pkgname = freedoko-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 2b7129155141..888092149a0c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,21 @@
 # Maintainer: Michael Straube <straubem@gmx.de>
 # Contributor: Robert Knauer <robert@privatdemail.net>
 
-# For building in a clean chroot you first must install texlive-core to the chroot. (FS#52038)
-# e.g.: extra-x86_64-build -- -I /var/cache/pacman/pkg/texlive-core-2017.44918-1-any.pkg.tar.xz
-
 pkgname=freedoko-git
-pkgver=0.7.16.r309.ga2bb6e50
+pkgver=0.7.16.r401.g90d107fe
 pkgrel=1
 pkgdesc="Free implementation of the card game Doppelkopf (git version)"
 arch=('i686' 'x86_64')
 url="http://free-doko.sourceforge.net/en/FreeDoko.html"
 license=('GPL')
-#depends=('gtkmm3' 'gnet' 'freealut')
-depends=('gtkmm3' 'freealut') # network currently disabled upstream
+depends=('gtkmm3' 'freealut')
 makedepends=('git' 'asciidoc' 'texlive-latexextra' 'w3m' 'dos2unix' 'rsync')
 conflicts=('freedoko')
 provides=('freedoko')
 source=("git+https://gitlab.com/dknof/FreeDoko.git"
         "freedoko-git-archlinux.patch")
 sha256sums=('SKIP'
-            '32daa2d355b71b990df59dd2f975aea15bb0a1445f5f4d3874bf21824c71b59d')
+            'c167cd37fdbdb466374fb331d4b2136be61fcce7943be336df62f3fce8d1f775')
 
 pkgver() {
   cd FreeDoko
diff --git a/freedoko-git-archlinux.patch b/freedoko-git-archlinux.patch
index 17422ad03712..cb7bb976c057 100644
--- a/freedoko-git-archlinux.patch
+++ b/freedoko-git-archlinux.patch
@@ -1,8 +1,8 @@
 diff -ru --no-dereference -x .git FreeDoko-orig/Makefile FreeDoko/Makefile
---- FreeDoko-orig/Makefile	2017-09-07 10:42:18.409517998 +0200
-+++ FreeDoko/Makefile	2017-09-07 10:46:34.252094150 +0200
+--- FreeDoko-orig/Makefile	2017-12-21 12:23:41.698040970 +0100
++++ FreeDoko/Makefile	2017-12-21 12:45:55.334319344 +0100
 @@ -320,8 +320,7 @@
- 	echo "Copying the program"
+ 	echo "Kopiere das Programm"
  	mkdir -p $(DESTDIR)$(BIN_DIRECTORY)
  	cp src/FreeDoko $(DESTDIR)$(BIN_DIRECTORY)
 -	-chgrp games $(DESTDIR)$(BIN_DIRECTORY)/FreeDoko
@@ -10,7 +10,7 @@ diff -ru --no-dereference -x .git FreeDoko-orig/Makefile FreeDoko/Makefile
 +	chmod 755 $(DESTDIR)$(BIN_DIRECTORY)/FreeDoko
  	cd $(DESTDIR)$(BIN_DIRECTORY) && ln -sf FreeDoko freedoko
  #	Copying the data files
- 	echo "Copying the data files"
+ 	echo "Kopiere die Daten"
 @@ -341,15 +340,13 @@
  	a2x -f manpage doc/freedoko.adoc
  	mkdir -p $(DESTDIR)$(MAN_DIRECTORY)
@@ -20,18 +20,18 @@ diff -ru --no-dereference -x .git FreeDoko-orig/Makefile FreeDoko/Makefile
 +	chmod 644 $(DESTDIR)$(MAN_DIRECTORY)/freedoko.6
  	cd $(DESTDIR)$(MAN_DIRECTORY)/ && ln -sf freedoko.6 FreeDoko.6
  #	copy the icon
- 	echo "copy the icon"
+ 	echo "Kopiere das Icon"
  	mkdir -p $(DESTDIR)$(ICON_DIRECTORY)
  	cp src/FreeDoko.png $(DESTDIR)$(ICON_DIRECTORY)/
 -	-chgrp games $(DESTDIR)$(ICON_DIRECTORY)/FreeDoko.png
 -	chmod 640 $(DESTDIR)$(ICON_DIRECTORY)/FreeDoko.png
 +	chmod 644 $(DESTDIR)$(ICON_DIRECTORY)/FreeDoko.png
  #	copy the desktop file
+ 	echo "Kopiere den Desktop-Starter"
  	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-07 10:42:18.409517998 +0200
-+++ FreeDoko/Makefile.install.directories	2017-09-07 10:46:34.255427430 +0200
+--- FreeDoko-orig/Makefile.install.directories	2017-12-21 12:23:41.698040970 +0100
++++ FreeDoko/Makefile.install.directories	2017-12-21 12:45:55.337652597 +0100
 @@ -4,14 +4,14 @@
  # the different directories for the files
  
@@ -79,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-07 10:42:19.272837440 +0200
-+++ FreeDoko/data/Makefile	2017-09-07 10:46:34.255427430 +0200
+--- FreeDoko-orig/data/Makefile	2017-12-21 12:23:43.571336580 +0100
++++ FreeDoko/data/Makefile	2017-12-21 12:45:55.337652597 +0100
 @@ -32,8 +32,7 @@
  	for d in cardsets iconsets backgrounds sounds; do \
  	  $(MAKE) -C $$d install; \
@@ -92,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-07 10:42:20.392819421 +0200
-+++ FreeDoko/doc/Makefile	2017-09-07 10:46:34.255427430 +0200
+--- FreeDoko-orig/doc/Makefile	2017-12-21 12:23:45.951288614 +0100
++++ FreeDoko/doc/Makefile	2017-12-21 12:46:14.477194179 +0100
 @@ -34,8 +34,7 @@
  	fi
  	cp -a Bugs GPL Roadmap hpux.required_libs-ia64.txt $(DESTDIR)$(HELP_DIRECTORY)/
@@ -105,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-07 10:42:21.352803977 +0200
-+++ FreeDoko/src/Makefile	2017-09-07 10:46:34.255427430 +0200
+--- FreeDoko-orig/src/Makefile	2017-12-21 12:23:47.497924084 +0100
++++ FreeDoko/src/Makefile	2017-12-21 12:45:55.340985851 +0100
 @@ -282,7 +282,6 @@
  		-DMANUAL_DIRECTORY_VALUE='\"$(HELP_DIRECTORY)/manual\"' \
  		-DLOCALE_DIRECTORY='\"$(LOCALE_DIRECTORY)\"'" \