Update to 0.7.20

3 files changed, 29 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ac5d3f289e8f..8f68c83d8a0b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = freedoko
 	pkgdesc = Free implementation of the card game Doppelkopf
-	pkgver = 0.7.19
+	pkgver = 0.7.20
 	pkgrel = 1
 	url = http://free-doko.sourceforge.net/en/FreeDoko.html
 	arch = x86_64
@@ -12,10 +12,10 @@ pkgbase = freedoko
 	makedepends = rsync
 	depends = gtkmm3
 	depends = freealut
-	source = https://downloads.sourceforge.net/free-doko/FreeDoko_0.7.19.src.zip
-	source = freedoko-0.7.19-makefiles.patch
-	sha256sums = 1969619c35fd5f950dd817d5652780d76b82de0a283ea4d6b3e266a6a122e717
-	sha256sums = 3abf36eb77aa0490d5e80bdc3fe9796bef2ab6718caebebef168a53f8044dd1e
+	source = https://downloads.sourceforge.net/free-doko/FreeDoko_0.7.20.src.zip
+	source = freedoko-0.7.20-makefiles.patch
+	sha256sums = c326b260b6199c53db432ec05ca3978d7ad3e87f5f8b1ccfc673ae779eb21ad6
+	sha256sums = 60b28c6cbec994831844d45c43017b3cccb582120e50ce1a8c1e1a774fcfa160
 
 pkgname = freedoko
 
diff --git a/PKGBUILD b/PKGBUILD
index 8507e137d0cd..f0a493548c13 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Robert Knauer <robert@privatdemail.net>
 
 pkgname=freedoko
-pkgver=0.7.19
+pkgver=0.7.20
 pkgrel=1
 pkgdesc="Free implementation of the card game Doppelkopf"
 arch=('x86_64')
@@ -11,17 +11,20 @@ license=('GPL')
 depends=('gtkmm3' 'freealut')
 makedepends=('asciidoc' 'texlive-latexextra' 'w3m' 'dos2unix' 'rsync')
 source=("https://downloads.sourceforge.net/free-doko/FreeDoko_$pkgver.src.zip"
-        "freedoko-0.7.19-makefiles.patch")
-sha256sums=('1969619c35fd5f950dd817d5652780d76b82de0a283ea4d6b3e266a6a122e717'
-            '3abf36eb77aa0490d5e80bdc3fe9796bef2ab6718caebebef168a53f8044dd1e')
+        "freedoko-0.7.20-makefiles.patch")
+sha256sums=('c326b260b6199c53db432ec05ca3978d7ad3e87f5f8b1ccfc673ae779eb21ad6'
+            '60b28c6cbec994831844d45c43017b3cccb582120e50ce1a8c1e1a774fcfa160')
 
 prepare() {
   cd FreeDoko_$pkgver
-  patch -p1 -i ../freedoko-0.7.19-makefiles.patch
+  patch -p1 -i ../freedoko-0.7.20-makefiles.patch
 }
 
 build() {
   cd FreeDoko_$pkgver
+
+  export CXXFLAGS+=' -std=c++17'
+
   make compile
   make documentation
 }
diff --git a/freedoko-0.7.19-makefiles.patch b/freedoko-0.7.20-makefiles.patch
index eb396676e6ed..f87b135107dd 100644
--- a/freedoko-0.7.19-makefiles.patch
+++ b/freedoko-0.7.20-makefiles.patch
@@ -1,6 +1,6 @@
-diff -ru FreeDoko_0.7.19-orig/data/Makefile FreeDoko_0.7.19/data/Makefile
---- FreeDoko_0.7.19-orig/data/Makefile	2019-01-01 14:39:11.907798611 +0100
-+++ FreeDoko_0.7.19/data/Makefile	2019-01-01 14:40:19.512521996 +0100
+diff -ru FreeDoko_0.7.20-orig/data/Makefile FreeDoko_0.7.20/data/Makefile
+--- FreeDoko_0.7.20-orig/data/Makefile	2019-04-06 15:52:49.530999521 +0200
++++ FreeDoko_0.7.20/data/Makefile	2019-04-06 15:53:08.818252409 +0200
 @@ -32,8 +32,7 @@
  	for d in cardsets iconsets backgrounds sounds; do \
  	  $(MAKE) -C $$d install; \
@@ -11,9 +11,9 @@ diff -ru FreeDoko_0.7.19-orig/data/Makefile FreeDoko_0.7.19/data/Makefile
  endif
  
  ifeq ($(SHELLTYPE), sh)
-diff -ru FreeDoko_0.7.19-orig/doc/Makefile FreeDoko_0.7.19/doc/Makefile
---- FreeDoko_0.7.19-orig/doc/Makefile	2019-01-01 14:39:11.952825404 +0100
-+++ FreeDoko_0.7.19/doc/Makefile	2019-01-01 14:40:19.512521996 +0100
+diff -ru FreeDoko_0.7.20-orig/doc/Makefile FreeDoko_0.7.20/doc/Makefile
+--- FreeDoko_0.7.20-orig/doc/Makefile	2019-04-06 15:52:49.571042684 +0200
++++ FreeDoko_0.7.20/doc/Makefile	2019-04-06 15:53:30.725104614 +0200
 @@ -34,8 +34,7 @@
  	fi
  	cp Bugs GPL Roadmap $(DESTDIR)$(HELP_DIRECTORY)/
@@ -24,9 +24,9 @@ diff -ru FreeDoko_0.7.19-orig/doc/Makefile FreeDoko_0.7.19/doc/Makefile
  	cd $(DESTDIR)$(DATA_DIRECTORY) && ln -sf $(HELP_DIRECTORY)/ doc
  endif
  
-diff -ru FreeDoko_0.7.19-orig/Makefile FreeDoko_0.7.19/Makefile
---- FreeDoko_0.7.19-orig/Makefile	2019-01-01 14:39:11.906798016 +0100
-+++ FreeDoko_0.7.19/Makefile	2019-01-01 14:40:19.512521996 +0100
+diff -ru FreeDoko_0.7.20-orig/Makefile FreeDoko_0.7.20/Makefile
+--- FreeDoko_0.7.20-orig/Makefile	2019-04-06 15:52:49.530999521 +0200
++++ FreeDoko_0.7.20/Makefile	2019-04-06 15:54:35.429702271 +0200
 @@ -316,8 +316,7 @@
  	echo "Kopiere das Programm"
  	mkdir -p $(DESTDIR)$(BIN_DIRECTORY)
@@ -55,9 +55,9 @@ diff -ru FreeDoko_0.7.19-orig/Makefile FreeDoko_0.7.19/Makefile
  #	copy the desktop file
  	echo "Kopiere den Desktop-Starter"
  	mkdir -p "$(DESTDIR)$(DESKTOP_FILE_DIRECTORY)"
-diff -ru FreeDoko_0.7.19-orig/Makefile.install.directories FreeDoko_0.7.19/Makefile.install.directories
---- FreeDoko_0.7.19-orig/Makefile.install.directories	2019-01-01 14:39:11.906798016 +0100
-+++ FreeDoko_0.7.19/Makefile.install.directories	2019-01-01 14:40:19.512521996 +0100
+diff -ru FreeDoko_0.7.20-orig/Makefile.install.directories FreeDoko_0.7.20/Makefile.install.directories
+--- FreeDoko_0.7.20-orig/Makefile.install.directories	2019-04-06 15:52:49.530999521 +0200
++++ FreeDoko_0.7.20/Makefile.install.directories	2019-04-06 15:54:52.087625236 +0200
 @@ -4,14 +4,14 @@
  # the different directories for the files
  
@@ -104,10 +104,10 @@ diff -ru FreeDoko_0.7.19-orig/Makefile.install.directories FreeDoko_0.7.19/Makef
  
  # Void Linux
  #MAIN_DIRECTORY         = /usr
-diff -ru FreeDoko_0.7.19-orig/src/Makefile FreeDoko_0.7.19/src/Makefile
---- FreeDoko_0.7.19-orig/src/Makefile	2019-01-01 14:39:11.963831954 +0100
-+++ FreeDoko_0.7.19/src/Makefile	2019-01-01 14:40:19.512521996 +0100
-@@ -262,7 +262,6 @@
+diff -ru FreeDoko_0.7.20-orig/src/Makefile FreeDoko_0.7.20/src/Makefile
+--- FreeDoko_0.7.20-orig/src/Makefile	2019-04-06 15:52:49.583055634 +0200
++++ FreeDoko_0.7.20/src/Makefile	2019-04-06 15:53:57.625173952 +0200
+@@ -263,7 +263,6 @@
  		-DMANUAL_DIRECTORY_VALUE='\"$(HELP_DIRECTORY)/manual\"' \
  		-DLOCALE_DIRECTORY='\"$(LOCALE_DIRECTORY)\"'" \
  	  $(PROGRAM)