Update patch (changes in Makefile)

3 files changed, 24 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fd3ff60d8aaf..c07f5155e3d9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = freedoko-git
 	pkgdesc = Free version of the german card game Doppelkopf - git version
-	pkgver = 0.7.16.r186.g628f0a7f
+	pkgver = 0.7.16.r190.gb44d3e1d
 	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 = 2119e7a492ca958b9649a2fff623c6a9bb8f63b2d49152d0c98c469ede47e45f
+	sha256sums = 70019b53b80ff01d666259c0d995a27a5bcca23d433337a887a6e9e7e6ce2df3
 
 pkgname = freedoko-git
 
diff --git a/PKGBUILD b/PKGBUILD
index aa42f7e562e3..98bb1ffa08d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Robert Knauer <robert@privatdemail.net>
 
 pkgname=freedoko-git
-pkgver=0.7.16.r186.g628f0a7f
+pkgver=0.7.16.r190.gb44d3e1d
 pkgrel=1
 pkgdesc="Free version of the german card game Doppelkopf - git version"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ provides=('freedoko')
 source=("git+https://gitlab.com/dknof/FreeDoko.git"
         "freedoko-git-archlinux.patch")
 sha256sums=('SKIP'
-            '2119e7a492ca958b9649a2fff623c6a9bb8f63b2d49152d0c98c469ede47e45f')
+            '70019b53b80ff01d666259c0d995a27a5bcca23d433337a887a6e9e7e6ce2df3')
 
 pkgver() {
   cd FreeDoko
diff --git a/freedoko-git-archlinux.patch b/freedoko-git-archlinux.patch
index 79e518c9cd25..1213759d6bdb 100644
--- a/freedoko-git-archlinux.patch
+++ b/freedoko-git-archlinux.patch
@@ -1,22 +1,22 @@
-diff -ru freedoko-svn-orig/Makefile freedoko-svn/Makefile
---- freedoko-svn-orig/Makefile	2017-01-12 12:10:43.620252109 +0100
-+++ freedoko-svn/Makefile	2017-01-12 12:13:57.116240026 +0100
+diff -ru FreeDoko-orig/Makefile FreeDoko/Makefile
+--- FreeDoko-orig/Makefile	2017-06-13 10:46:43.240013128 +0200
++++ FreeDoko/Makefile	2017-06-13 10:51:15.007148812 +0200
 @@ -78,8 +78,12 @@
  .PHONY: compile
  compile:
  # compile FreeDoko
 -	$(MAKE) Version
--	$(MAKE) -C src/ FreeDoko
+-	$(MAKE) -C src/ $(PROGRAM)
 +	$(MAKE) \
 +	  "USE_UI_TEXT=false" \
 +	  "USE_UI_GTKMM=true" \
 +	  "USE_NETWORK=true" \
 +	  "CPPFLAGS+= -DRELEASE -DVERSION_DESCRIPTION='\"$(OPERATING_SYSTEM_NAME) binary\"' -DPUBLIC_DATA_DIRECTORY_VALUE='\"$(DATA_DIRECTORY)\"' -DMANUAL_DIRECTORY_VALUE='\"$(HELP_DIRECTORY)/manual\"'" \
-+	  -C src/ FreeDoko
++	  -C src/ $(PROGRAM)
  	@echo "---"
  	@echo "* Program 'FreeDoko' created"
  
-@@ -289,22 +293,11 @@
+@@ -280,22 +284,11 @@
  ifeq ($(OPERATING_SYSTEM), Linux)
  .PHONY: install
  install :
@@ -40,7 +40,7 @@ diff -ru freedoko-svn-orig/Makefile freedoko-svn/Makefile
  	cd $(DESTDIR)$(BIN_DIRECTORY) && ln -sf FreeDoko freedoko
  #	Copying the data files
  	echo "Copying the data files"
-@@ -321,15 +314,13 @@
+@@ -312,15 +305,13 @@
  	a2x -f manpage doc/freedoko.asciidoc
  	mkdir -p $(DESTDIR)$(MAN_DIRECTORY)
  	cp doc/freedoko.6 $(DESTDIR)$(MAN_DIRECTORY)/
@@ -58,9 +58,9 @@ diff -ru freedoko-svn-orig/Makefile freedoko-svn/Makefile
  
  .PHONY: uninstall
  uninstall :
-diff -ru freedoko-svn-orig/Makefile.install.directories freedoko-svn/Makefile.install.directories
---- freedoko-svn-orig/Makefile.install.directories	2017-01-12 12:10:43.620252109 +0100
-+++ freedoko-svn/Makefile.install.directories	2017-01-12 12:12:19.404933897 +0100
+diff -ru FreeDoko-orig/Makefile.install.directories FreeDoko/Makefile.install.directories
+--- FreeDoko-orig/Makefile.install.directories	2017-06-13 10:46:43.240013128 +0200
++++ FreeDoko/Makefile.install.directories	2017-06-13 10:52:04.639959037 +0200
 @@ -4,13 +4,13 @@
  # the different directories for the files
  
@@ -103,9 +103,9 @@ diff -ru freedoko-svn-orig/Makefile.install.directories freedoko-svn/Makefile.in
  
  
  # release
-diff -ru freedoko-svn-orig/bin/FreeDoko.desktop freedoko-svn/bin/FreeDoko.desktop
---- freedoko-svn-orig/bin/FreeDoko.desktop	2017-01-12 12:10:48.156824827 +0100
-+++ freedoko-svn/bin/FreeDoko.desktop	2017-01-12 12:11:22.139454212 +0100
+diff -ru FreeDoko-orig/bin/FreeDoko.desktop FreeDoko/bin/FreeDoko.desktop
+--- FreeDoko-orig/bin/FreeDoko.desktop	2017-06-13 10:46:43.240013128 +0200
++++ FreeDoko/bin/FreeDoko.desktop	2017-06-13 10:52:24.906412104 +0200
 @@ -6,7 +6,7 @@
  Comment=game of Doppelkopf
  Comment[de]=Doppelkopf-Spiel
@@ -115,9 +115,9 @@ diff -ru freedoko-svn-orig/bin/FreeDoko.desktop freedoko-svn/bin/FreeDoko.deskto
  Path=
  Icon=FreeDoko
  Categories=Application;Game;CardGame;
-diff -ru freedoko-svn-orig/data/Makefile freedoko-svn/data/Makefile
---- freedoko-svn-orig/data/Makefile	2017-01-12 12:10:41.893621198 +0100
-+++ freedoko-svn/data/Makefile	2017-01-12 12:11:37.355805565 +0100
+diff -ru FreeDoko-orig/data/Makefile FreeDoko/data/Makefile
+--- FreeDoko-orig/data/Makefile	2017-06-13 10:46:43.870006488 +0200
++++ FreeDoko/data/Makefile	2017-06-13 10:52:51.502798457 +0200
 @@ -40,8 +40,7 @@
  	for d in cardsets iconsets backgrounds sounds; do \
  	  $(MAKE) -C $$d install; \
@@ -128,10 +128,10 @@ diff -ru freedoko-svn-orig/data/Makefile freedoko-svn/data/Makefile
  endif
  
  ifeq ($(SHELLTYPE), sh)
-diff -ru freedoko-svn-orig/doc/Makefile freedoko-svn/doc/Makefile
---- freedoko-svn-orig/doc/Makefile	2017-01-12 12:10:44.033576883 +0100
-+++ freedoko-svn/doc/Makefile	2017-01-12 12:11:55.618760369 +0100
-@@ -36,8 +36,7 @@
+diff -ru FreeDoko-orig/doc/Makefile FreeDoko/doc/Makefile
+--- FreeDoko-orig/doc/Makefile	2017-06-13 10:46:44.733330723 +0200
++++ FreeDoko/doc/Makefile	2017-06-13 10:53:14.319224649 +0200
+@@ -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