Update patch

4 files changed, 56 insertions, 124 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aee2d35e4b72..dcf0cdc6c14d 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.20.r0.g355bd7ba8
+	pkgver = 0.7.20.r34.g9b745a89e
 	pkgrel = 1
 	url = http://free-doko.sourceforge.net
 	arch = x86_64
@@ -16,9 +16,9 @@ pkgbase = freedoko-git
 	provides = freedoko
 	conflicts = freedoko
 	source = git+https://gitlab.com/dknof/FreeDoko.git
-	source = freedoko-git-makefiles.patch
+	source = freedoko-install-directories.patch
 	sha256sums = SKIP
-	sha256sums = 405927bdcdf22ba06c044cd616af0eb4977a7b0df39d932a7fc7f2128ff33a6a
+	sha256sums = 3bd03f2d57327b97ea1ab22ff210381f0ff60d8b1db794f07cda5ef01d7e7df4
 
 pkgname = freedoko-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 456f1783f640..b6e675e2445e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Robert Knauer <robert@privatdemail.net>
 
 pkgname=freedoko-git
-pkgver=0.7.20.r0.g355bd7ba8
+pkgver=0.7.20.r34.g9b745a89e
 pkgrel=1
 pkgdesc="Free implementation of the card game Doppelkopf (git version)"
 arch=('x86_64')
@@ -13,9 +13,9 @@ makedepends=('git' 'asciidoc' 'texlive-latexextra' 'w3m' 'dos2unix' 'rsync')
 conflicts=('freedoko')
 provides=('freedoko')
 source=("git+https://gitlab.com/dknof/FreeDoko.git"
-        "freedoko-git-makefiles.patch")
+        "freedoko-install-directories.patch")
 sha256sums=('SKIP'
-            '405927bdcdf22ba06c044cd616af0eb4977a7b0df39d932a7fc7f2128ff33a6a')
+            '3bd03f2d57327b97ea1ab22ff210381f0ff60d8b1db794f07cda5ef01d7e7df4')
 
 pkgver() {
   cd FreeDoko
@@ -24,7 +24,8 @@ pkgver() {
 
 prepare() {
   cd FreeDoko
-  patch -p1 -i ../freedoko-git-makefiles.patch
+  patch -p1 -i ../freedoko-install-directories.patch
+  sed -i '/$(MAKE) strip/d' src/Makefile
 }
 
 build() {
diff --git a/freedoko-git-makefiles.patch b/freedoko-git-makefiles.patch
deleted file mode 100644
index bd3aa357d633..000000000000
--- a/freedoko-git-makefiles.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-diff -ru --no-dereference -x .git FreeDoko-orig/data/Makefile FreeDoko/data/Makefile
---- FreeDoko-orig/data/Makefile	2019-04-06 15:41:35.144336808 +0200
-+++ FreeDoko/data/Makefile	2019-04-06 15:42:03.503886091 +0200
-@@ -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	2019-04-06 15:41:35.236388320 +0200
-+++ FreeDoko/doc/Makefile	2019-04-06 15:42:24.735191139 +0200
-@@ -34,8 +34,7 @@
- 	fi
- 	cp Bugs GPL Roadmap $(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	2019-04-06 15:41:35.072296495 +0200
-+++ FreeDoko/Makefile	2019-04-06 15:43:29.103576620 +0200
-@@ -316,8 +316,7 @@
- 	echo "Kopiere das Programm"
- 	mkdir -p $(DESTDIR)$(BIN_DIRECTORY)
- 	cp src/FreeDoko $(DESTDIR)$(BIN_DIRECTORY)
--	-chgrp games $(DESTDIR)$(BIN_DIRECTORY)/FreeDoko
--	chmod 750 $(DESTDIR)$(BIN_DIRECTORY)/FreeDoko
-+	chmod 755 $(DESTDIR)$(BIN_DIRECTORY)/FreeDoko
- 	cd $(DESTDIR)$(BIN_DIRECTORY) && ln -sf FreeDoko freedoko
- #	Copying the data files
- 	echo "Kopiere die Daten"
-@@ -337,15 +336,13 @@
- 	a2x -f manpage doc/freedoko.adoc
- 	mkdir -p $(DESTDIR)$(MAN_DIRECTORY)
- 	cp doc/freedoko.6 $(DESTDIR)$(MAN_DIRECTORY)/
--	-chgrp games $(DESTDIR)$(MAN_DIRECTORY)/freedoko.6
--	chmod 640 $(DESTDIR)$(MAN_DIRECTORY)/freedoko.6
-+	chmod 644 $(DESTDIR)$(MAN_DIRECTORY)/freedoko.6
- 	cd $(DESTDIR)$(MAN_DIRECTORY)/ && ln -sf freedoko.6 FreeDoko.6
- #	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)"
-diff -ru --no-dereference -x .git FreeDoko-orig/Makefile.install.directories FreeDoko/Makefile.install.directories
---- FreeDoko-orig/Makefile.install.directories	2019-04-06 15:41:35.072296495 +0200
-+++ FreeDoko/Makefile.install.directories	2019-04-06 15:43:50.776816204 +0200
-@@ -4,14 +4,14 @@
- # the different directories for the files
- 
- # installing in /usr/local
--MAIN_DIRECTORY         = /usr/local
--BIN_DIRECTORY          = $(MAIN_DIRECTORY)/games
--DATA_DIRECTORY         = $(MAIN_DIRECTORY)/share/games/FreeDoko
--HELP_DIRECTORY         = $(MAIN_DIRECTORY)/share/doc/FreeDoko
--MAN_DIRECTORY          = $(MAIN_DIRECTORY)/share/man/man6
--ICON_DIRECTORY         = $(MAIN_DIRECTORY)/share/pixmaps
--LOCALE_DIRECTORY       = $(MAIN_DIRECTORY)/share/locale
--DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications
-+#MAIN_DIRECTORY         = /usr/local
-+#BIN_DIRECTORY          = $(MAIN_DIRECTORY)/games
-+#DATA_DIRECTORY         = $(MAIN_DIRECTORY)/share/games/FreeDoko
-+#HELP_DIRECTORY         = $(MAIN_DIRECTORY)/share/doc/FreeDoko
-+#MAN_DIRECTORY          = $(MAIN_DIRECTORY)/share/man/man6
-+#ICON_DIRECTORY         = $(MAIN_DIRECTORY)/share/pixmaps
-+#LOCALE_DIRECTORY       = $(MAIN_DIRECTORY)/share/locale
-+#DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications
- 
- # debian
- #MAIN_DIRECTORY         = /usr
-@@ -54,14 +54,14 @@
- #DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications
- 
- # Arch Linux
--#MAIN_DIRECTORY         = /usr
--#BIN_DIRECTORY          = $(MAIN_DIRECTORY)/bin
--#DATA_DIRECTORY         = $(MAIN_DIRECTORY)/share/freedoko
--#HELP_DIRECTORY         = $(MAIN_DIRECTORY)/share/doc/freedoko
--#MAN_DIRECTORY          = $(MAIN_DIRECTORY)/share/man/man6
--#ICON_DIRECTORY         = $(MAIN_DIRECTORY)/share/pixmaps
--#LOCALE_DIRECTORY       = $(MAIN_DIRECTORY)/share/locale
--#DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications
-+MAIN_DIRECTORY         = /usr
-+BIN_DIRECTORY          = $(MAIN_DIRECTORY)/bin
-+DATA_DIRECTORY         = $(MAIN_DIRECTORY)/share/freedoko
-+HELP_DIRECTORY         = $(MAIN_DIRECTORY)/share/doc/freedoko
-+MAN_DIRECTORY          = $(MAIN_DIRECTORY)/share/man/man6
-+ICON_DIRECTORY         = $(MAIN_DIRECTORY)/share/pixmaps
-+LOCALE_DIRECTORY       = $(MAIN_DIRECTORY)/share/locale
-+DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications
- 
- # Void Linux
- #MAIN_DIRECTORY         = /usr
-diff -ru --no-dereference -x .git FreeDoko-orig/src/Makefile FreeDoko/src/Makefile
---- FreeDoko-orig/src/Makefile	2019-04-06 15:41:35.288417436 +0200
-+++ FreeDoko/src/Makefile	2019-04-06 15:44:22.530368921 +0200
-@@ -263,7 +263,6 @@
- 		-DMANUAL_DIRECTORY_VALUE='\"$(HELP_DIRECTORY)/manual\"' \
- 		-DLOCALE_DIRECTORY='\"$(LOCALE_DIRECTORY)\"'" \
- 	  $(PROGRAM)
--	$(MAKE) strip
- 
- # strip the program from all symbols
- .PHONY: strip
diff --git a/freedoko-install-directories.patch b/freedoko-install-directories.patch
new file mode 100644
index 000000000000..18254f16fa91
--- /dev/null
+++ b/freedoko-install-directories.patch
@@ -0,0 +1,48 @@
+--- FreeDoko-orig/Makefile.install.directories	2019-05-25 14:37:35.282880167 +0200
++++ FreeDoko/Makefile.install.directories	2019-05-25 14:38:00.213169401 +0200
+@@ -4,14 +4,14 @@
+ # the different directories for the files
+ 
+ # installing in /usr/local
+-MAIN_DIRECTORY         = /usr/local
+-BIN_DIRECTORY          = $(MAIN_DIRECTORY)/games
+-DATA_DIRECTORY         = $(MAIN_DIRECTORY)/share/games/FreeDoko
+-HELP_DIRECTORY         = $(MAIN_DIRECTORY)/share/doc/FreeDoko
+-MAN_DIRECTORY          = $(MAIN_DIRECTORY)/share/man/man6
+-ICON_DIRECTORY         = $(MAIN_DIRECTORY)/share/pixmaps
+-LOCALE_DIRECTORY       = $(MAIN_DIRECTORY)/share/locale
+-DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications
++#MAIN_DIRECTORY         = /usr/local
++#BIN_DIRECTORY          = $(MAIN_DIRECTORY)/games
++#DATA_DIRECTORY         = $(MAIN_DIRECTORY)/share/games/FreeDoko
++#HELP_DIRECTORY         = $(MAIN_DIRECTORY)/share/doc/FreeDoko
++#MAN_DIRECTORY          = $(MAIN_DIRECTORY)/share/man/man6
++#ICON_DIRECTORY         = $(MAIN_DIRECTORY)/share/pixmaps
++#LOCALE_DIRECTORY       = $(MAIN_DIRECTORY)/share/locale
++#DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications
+ 
+ # debian
+ #MAIN_DIRECTORY         = /usr
+@@ -54,14 +54,14 @@
+ #DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications
+ 
+ # Arch Linux
+-#MAIN_DIRECTORY         = /usr
+-#BIN_DIRECTORY          = $(MAIN_DIRECTORY)/bin
+-#DATA_DIRECTORY         = $(MAIN_DIRECTORY)/share/freedoko
+-#HELP_DIRECTORY         = $(MAIN_DIRECTORY)/share/doc/freedoko
+-#MAN_DIRECTORY          = $(MAIN_DIRECTORY)/share/man/man6
+-#ICON_DIRECTORY         = $(MAIN_DIRECTORY)/share/pixmaps
+-#LOCALE_DIRECTORY       = $(MAIN_DIRECTORY)/share/locale
+-#DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications
++MAIN_DIRECTORY         = /usr
++BIN_DIRECTORY          = $(MAIN_DIRECTORY)/bin
++DATA_DIRECTORY         = $(MAIN_DIRECTORY)/share/freedoko
++HELP_DIRECTORY         = $(MAIN_DIRECTORY)/share/doc/freedoko
++MAN_DIRECTORY          = $(MAIN_DIRECTORY)/share/man/man6
++ICON_DIRECTORY         = $(MAIN_DIRECTORY)/share/pixmaps
++LOCALE_DIRECTORY       = $(MAIN_DIRECTORY)/share/locale
++DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications
+ 
+ # Void Linux
+ #MAIN_DIRECTORY         = /usr