Update patch

3 files changed, 37 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 98ea131f3b4c..af2a1f58b4f9 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.18.r132.gb74bec78b
+	pkgver = 0.7.18.r151.g89d5f1d0f
 	pkgrel = 1
 	url = http://free-doko.sourceforge.net
 	arch = x86_64
@@ -18,7 +18,7 @@ pkgbase = freedoko-git
 	source = git+https://gitlab.com/dknof/FreeDoko.git
 	source = freedoko-git-makefiles.patch
 	sha256sums = SKIP
-	sha256sums = 8274a493a07d38e7a3bd8f2b8a7b1c6a921403221297e99eea96a535e69c52e3
+	sha256sums = f5df5ab9524d4689d09085e6f1e2c582d3fae80ac70d7d95ca19567fcd0d249e
 
 pkgname = freedoko-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 8a202360df72..d818ac89d7ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Robert Knauer <robert@privatdemail.net>
 
 pkgname=freedoko-git
-pkgver=0.7.18.r132.gb74bec78b
+pkgver=0.7.18.r151.g89d5f1d0f
 pkgrel=1
 pkgdesc="Free implementation of the card game Doppelkopf (git version)"
 arch=('x86_64')
@@ -15,7 +15,7 @@ provides=('freedoko')
 source=("git+https://gitlab.com/dknof/FreeDoko.git"
         "freedoko-git-makefiles.patch")
 sha256sums=('SKIP'
-            '8274a493a07d38e7a3bd8f2b8a7b1c6a921403221297e99eea96a535e69c52e3')
+            'f5df5ab9524d4689d09085e6f1e2c582d3fae80ac70d7d95ca19567fcd0d249e')
 
 pkgver() {
   cd FreeDoko
@@ -36,5 +36,4 @@ build() {
 package() {
   cd FreeDoko
   make DESTDIR="$pkgdir" install
-  rm "$pkgdir"/usr/share/doc/freedoko/{de/Windows.txt,en/Windows,hpux*}
 }
diff --git a/freedoko-git-makefiles.patch b/freedoko-git-makefiles.patch
index be60f9a6f67e..0c2a2fc8a216 100644
--- a/freedoko-git-makefiles.patch
+++ b/freedoko-git-makefiles.patch
@@ -1,6 +1,32 @@
+diff -ru --no-dereference -x .git FreeDoko-orig/data/Makefile FreeDoko/data/Makefile
+--- FreeDoko-orig/data/Makefile	2018-11-28 21:40:33.335108068 +0100
++++ FreeDoko/data/Makefile	2018-11-28 21:42:11.934615301 +0100
+@@ -32,8 +32,7 @@
+ 	for d in cardsets iconsets backgrounds sounds; do \
+ 	  $(MAKE) -C $$d install; \
+ 	done
+-	-chgrp games $(DESTDIR)$(DATA_DIRECTORY) && chgrp -R games $(DESTDIR)$(DATA_DIRECTORY)
+-	chmod -R o-rwx,g+rX,g-w $(DESTDIR)$(DATA_DIRECTORY)
++	chmod -R o-rwx,g+rX,g-w,+rX $(DESTDIR)$(DATA_DIRECTORY)
+ endif
+ 
+ ifeq ($(SHELLTYPE), sh)
+diff -ru --no-dereference -x .git FreeDoko-orig/doc/Makefile FreeDoko/doc/Makefile
+--- FreeDoko-orig/doc/Makefile	2018-11-28 21:40:34.299008167 +0100
++++ FreeDoko/doc/Makefile	2018-11-28 21:42:11.934615301 +0100
+@@ -34,8 +34,7 @@
+ 	fi
+ 	cp -a Bugs GPL Roadmap hpux.required_libs-ia64.txt $(DESTDIR)$(HELP_DIRECTORY)/
+ 	for d in de en; do $(MAKE) -C $$d install; done
+-	-chgrp games $(DESTDIR)$(HELP_DIRECTORY) && chgrp -R games $(DESTDIR)$(HELP_DIRECTORY)
+-	chmod -R o-rwx,g+rX,g-w $(DESTDIR)$(HELP_DIRECTORY)
++	chmod -R o-rwx,g+rX,g-w,+rX $(DESTDIR)$(HELP_DIRECTORY)
+ 	cd $(DESTDIR)$(DATA_DIRECTORY) && ln -sf $(HELP_DIRECTORY)/ doc
+ endif
+ 
 diff -ru --no-dereference -x .git FreeDoko-orig/Makefile FreeDoko/Makefile
---- FreeDoko-orig/Makefile	2018-01-09 11:35:40.845184810 +0100
-+++ FreeDoko/Makefile	2018-01-09 11:37:02.943311456 +0100
+--- FreeDoko-orig/Makefile	2018-11-28 21:40:33.094966765 +0100
++++ FreeDoko/Makefile	2018-11-28 21:42:11.931277709 +0100
 @@ -316,8 +316,7 @@
  	echo "Kopiere das Programm"
  	mkdir -p $(DESTDIR)$(BIN_DIRECTORY)
@@ -30,8 +56,8 @@ diff -ru --no-dereference -x .git FreeDoko-orig/Makefile FreeDoko/Makefile
  	echo "Kopiere den Desktop-Starter"
  	mkdir -p "$(DESTDIR)$(DESKTOP_FILE_DIRECTORY)"
 diff -ru --no-dereference -x .git FreeDoko-orig/Makefile.install.directories FreeDoko/Makefile.install.directories
---- FreeDoko-orig/Makefile.install.directories	2018-01-09 11:35:40.845184810 +0100
-+++ FreeDoko/Makefile.install.directories	2018-01-09 11:37:27.016100663 +0100
+--- FreeDoko-orig/Makefile.install.directories	2018-11-28 21:40:33.094966765 +0100
++++ FreeDoko/Makefile.install.directories	2018-11-28 21:42:11.931277709 +0100
 @@ -4,14 +4,14 @@
  # the different directories for the files
  
@@ -78,36 +104,10 @@ diff -ru --no-dereference -x .git FreeDoko-orig/Makefile.install.directories Fre
  
  # Void Linux
  #MAIN_DIRECTORY         = /usr
-diff -ru --no-dereference -x .git FreeDoko-orig/data/Makefile FreeDoko/data/Makefile
---- FreeDoko-orig/data/Makefile	2018-01-09 11:35:41.508502890 +0100
-+++ FreeDoko/data/Makefile	2018-01-09 11:35:59.458090895 +0100
-@@ -32,8 +32,7 @@
- 	for d in cardsets iconsets backgrounds sounds; do \
- 	  $(MAKE) -C $$d install; \
- 	done
--	-chgrp games $(DESTDIR)$(DATA_DIRECTORY) && chgrp -R games $(DESTDIR)$(DATA_DIRECTORY)
--	chmod -R o-rwx,g+rX,g-w $(DESTDIR)$(DATA_DIRECTORY)
-+	chmod -R o-rwx,g+rX,g-w,+rX $(DESTDIR)$(DATA_DIRECTORY)
- endif
- 
- ifeq ($(SHELLTYPE), sh)
-diff -ru --no-dereference -x .git FreeDoko-orig/doc/Makefile FreeDoko/doc/Makefile
---- FreeDoko-orig/doc/Makefile	2018-01-09 11:35:42.411815455 +0100
-+++ FreeDoko/doc/Makefile	2018-01-09 11:36:17.161019281 +0100
-@@ -34,8 +34,7 @@
- 	fi
- 	cp -a Bugs GPL Roadmap hpux.required_libs-ia64.txt $(DESTDIR)$(HELP_DIRECTORY)/
- 	for d in de en; do $(MAKE) -C $$d install; done
--	-chgrp games $(DESTDIR)$(HELP_DIRECTORY) && chgrp -R games $(DESTDIR)$(HELP_DIRECTORY)
--	chmod -R o-rwx,g+rX,g-w $(DESTDIR)$(HELP_DIRECTORY)
-+	chmod -R o-rwx,g+rX,g-w,+rX $(DESTDIR)$(HELP_DIRECTORY)
- 	cd $(DESTDIR)$(DATA_DIRECTORY) && ln -sf $(HELP_DIRECTORY)/ doc
- endif
- 
 diff -ru --no-dereference -x .git FreeDoko-orig/src/Makefile FreeDoko/src/Makefile
---- FreeDoko-orig/src/Makefile	2018-02-03 13:08:27.308068751 +0100
-+++ FreeDoko/src/Makefile	2018-02-03 13:17:38.273976791 +0100
-@@ -264,7 +264,6 @@
+--- FreeDoko-orig/src/Makefile	2018-11-28 21:40:34.689237244 +0100
++++ FreeDoko/src/Makefile	2018-11-28 21:42:11.934615301 +0100
+@@ -262,7 +262,6 @@
  		-DMANUAL_DIRECTORY_VALUE='\"$(HELP_DIRECTORY)/manual\"' \
  		-DLOCALE_DIRECTORY='\"$(LOCALE_DIRECTORY)\"'" \
  	  $(PROGRAM)