Update to 0.7

6 files changed, 58 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a381a797a6ad..25a515b716f0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
 pkgbase = galois
 	pkgdesc = A falling blocks game with blocks of various shapes and sizes
-	pkgver = 0.6
+	pkgver = 0.7
 	pkgrel = 1
 	url = https://www.nongnu.org/galois
 	arch = x86_64
 	license = GPL3
 	depends = gtkmm3
 	depends = libxml++
-	source = https://download.savannah.gnu.org/releases/galois/source/galois-0.6.tar.gz
-	source = galois-0.6-install-path.patch
-	source = galois-0.6-full-relro.patch
-	source = galois-0.6-libxml++3.0.patch
-	sha256sums = de4743c9407afb33a186cd3a3cbf472d790901c41a009bd1775dcf59b466b346
-	sha256sums = c4247271776f7b5df2b6bb92911c25a9ba3c30796171de5cd7dc1bd78e5a800d
-	sha256sums = 24c833ad3f898968938bf39768093f257e8badfb84058ada6c6f36df2e7c554d
-	sha256sums = 1bce72dfb66dcaa06e7c76c506c97595d9528914d6e4bd47beb8f2cfdaa97e3c
+	source = https://download.savannah.gnu.org/releases/galois/source/galois-0.7.tar.gz
+	source = galois-0.7-install-path.patch
+	source = galois-0.7-full-relro.patch
+	source = galois-0.7-libxml++3.0.patch
+	sha512sums = 8d480b9e5746dfe00c4684ae179697e82d5c259ae092bb18c29733e69752175e584f978ce315b9b1bb2868d7b3e6b261dabef91741523ed108f912e9bfc52b1f
+	sha512sums = 5f35dcdbd113441ac64637576c973dc5b2bab772ee058f4fa061b2ba500c36e02db383dc919d4be9077e1dfba258cd51620e484763a367f3f979766f24c213a0
+	sha512sums = 6e7897d8fe64aea5397b8596169e12f52e5c97f7c89ca98b339dbeadd5affba37ce6151eef727ed3807aac4c16407560d433a817d71d0cc1955a8efb271ebfa8
+	sha512sums = b8ca1a9dd34f9e74b377bd413837d438515f65a205795307e09f462df2c7241dc1ea46e518b6225792618f35313c43712964a65ef5ab469de5f99a0512cd3aa3
 
 pkgname = galois
 
diff --git a/PKGBUILD b/PKGBUILD
index 6d5ae1e0ce3e..07c76bbc0311 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,30 @@
 # Maintainer:
-# Contributor: Michael Straube <michael.straube@posteo.de>
+# Contributor: Michael Straube <michaelfstraube@gmail.com>
 # Contributor: Frederic Bezies <fredbezies at gmail dot com>
 # Contributor: kusakata <shohei atmark kusakata period com>
 
 pkgname=galois
-pkgver=0.6
+pkgver=0.7
 pkgrel=1
 pkgdesc='A falling blocks game with blocks of various shapes and sizes'
 arch=('x86_64')
 url="https://www.nongnu.org/galois"
 license=('GPL3')
 depends=('gtkmm3' 'libxml++')
-source=("https://download.savannah.gnu.org/releases/galois/source/galois-$pkgver.tar.gz"
-        "galois-0.6-install-path.patch"
-        "galois-0.6-full-relro.patch"
-        "galois-0.6-libxml++3.0.patch")
-
-sha256sums=('de4743c9407afb33a186cd3a3cbf472d790901c41a009bd1775dcf59b466b346'
-            'c4247271776f7b5df2b6bb92911c25a9ba3c30796171de5cd7dc1bd78e5a800d'
-            '24c833ad3f898968938bf39768093f257e8badfb84058ada6c6f36df2e7c554d'
-            '1bce72dfb66dcaa06e7c76c506c97595d9528914d6e4bd47beb8f2cfdaa97e3c')
+source=("https://download.savannah.gnu.org/releases/$pkgname/source/$pkgname-$pkgver.tar.gz"
+        "galois-0.7-install-path.patch"
+        "galois-0.7-full-relro.patch"
+        "galois-0.7-libxml++3.0.patch")
+sha512sums=('8d480b9e5746dfe00c4684ae179697e82d5c259ae092bb18c29733e69752175e584f978ce315b9b1bb2868d7b3e6b261dabef91741523ed108f912e9bfc52b1f'
+            '5f35dcdbd113441ac64637576c973dc5b2bab772ee058f4fa061b2ba500c36e02db383dc919d4be9077e1dfba258cd51620e484763a367f3f979766f24c213a0'
+            '6e7897d8fe64aea5397b8596169e12f52e5c97f7c89ca98b339dbeadd5affba37ce6151eef727ed3807aac4c16407560d433a817d71d0cc1955a8efb271ebfa8'
+            'b8ca1a9dd34f9e74b377bd413837d438515f65a205795307e09f462df2c7241dc1ea46e518b6225792618f35313c43712964a65ef5ab469de5f99a0512cd3aa3')
 
 prepare() {
   cd $pkgname-$pkgver
-  patch -p1 -i ../galois-0.6-install-path.patch
-  patch -p1 -i ../galois-0.6-full-relro.patch
-  patch -p1 -i ../galois-0.6-libxml++3.0.patch
+  patch -Np1 -i ../galois-0.7-install-path.patch
+  patch -Np1 -i ../galois-0.7-full-relro.patch
+  patch -Np1 -i ../galois-0.7-libxml++3.0.patch
 }
 
 build() {
diff --git a/galois-0.6-full-relro.patch b/galois-0.6-full-relro.patch
deleted file mode 100644
index 7d4c27f2bd28..000000000000
--- a/galois-0.6-full-relro.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- galois-0.6/src/makefile.in.orig	2019-09-15 09:49:53.260122196 +0200
-+++ galois-0.6/src/makefile.in	2019-09-15 09:50:17.580404164 +0200
-@@ -41,7 +41,7 @@
- default: galois
- all : ${EXE}
- galois : ${OBJS}
--	${CXX} ${CXXFLAGS} ${OBJS} -o $@ ${GTKMM_LIBS} ${XMLPP_LIBS}
-+	${CXX} ${CXXFLAGS} ${LDFLAGS} ${OBJS} -o $@ ${GTKMM_LIBS} ${XMLPP_LIBS}
- 
- # other targets
- clean :
diff --git a/galois-0.7-full-relro.patch b/galois-0.7-full-relro.patch
new file mode 100644
index 000000000000..2d1c3703e990
--- /dev/null
+++ b/galois-0.7-full-relro.patch
@@ -0,0 +1,11 @@
+--- galois-0.7/src/makefile.in.orig	2020-09-16 21:03:55.135600462 +0200
++++ galois-0.7/src/makefile.in	2020-09-16 21:11:50.432582306 +0200
+@@ -42,7 +42,7 @@
+ default: galois
+ all : ${EXE}
+ galois : ${OBJS}
+-	${CXX} ${CXXFLAGS} ${OBJS} -o $@ ${GTKMM_LIBS} ${XMLPP_LIBS} \
++	${CXX} ${CXXFLAGS} ${LDFLAGS} ${OBJS} -o $@ ${GTKMM_LIBS} ${XMLPP_LIBS} \
+         ${THREAD_LIBS}
+ 
+ # other targets
diff --git a/galois-0.6-install-path.patch b/galois-0.7-install-path.patch
index 0f3e2c2dcd9a..a64507bc3d07 100644
--- a/galois-0.6-install-path.patch
+++ b/galois-0.7-install-path.patch
@@ -1,6 +1,6 @@
---- galois-0.4/src/makefile.in.orig	2016-02-06 20:53:18.701336710 +0100
-+++ galois-0.4/src/makefile.in	2016-02-06 20:53:41.444173725 +0100
-@@ -50,10 +50,10 @@
+--- galois-0.7/src/makefile.in.orig	2020-09-16 21:03:55.135600462 +0200
++++ galois-0.7/src/makefile.in	2020-09-16 21:04:28.670153046 +0200
+@@ -52,10 +52,10 @@
  	- rm -f ${AC}
  
  install : galois
@@ -14,9 +14,8 @@
  
  # dependencies
  area.o : area.h grid.h group.h
-
---- galois-0.4/misc/galois.desktop.in.orig	2016-02-06 20:52:37.265574946 +0100
-+++ galois-0.4/misc/galois.desktop.in	2016-02-06 20:52:49.085316730 +0100
+--- galois-0.7/misc/galois.desktop.in.orig	2020-09-16 21:04:56.768101564 +0200
++++ galois-0.7/misc/galois.desktop.in	2020-09-16 21:05:12.823403378 +0200
 @@ -17,7 +17,7 @@
  # @configure_input@
  
diff --git a/galois-0.6-libxml++3.0.patch b/galois-0.7-libxml++3.0.patch
index f6c6953ac33f..c034f8e07ff6 100644
--- a/galois-0.6-libxml++3.0.patch
+++ b/galois-0.7-libxml++3.0.patch
@@ -1,6 +1,6 @@
-diff -ru galois-0.6-orig/configure galois-0.6/configure
---- galois-0.6-orig/configure	2019-09-15 10:22:36.593016489 +0200
-+++ galois-0.6/configure	2019-09-15 10:22:53.446550978 +0200
+diff -ru galois-0.7-orig/configure galois-0.7/configure
+--- galois-0.7-orig/configure	2020-09-16 21:16:06.245182646 +0200
++++ galois-0.7/configure	2020-09-16 21:37:46.142606075 +0200
 @@ -2495,12 +2495,12 @@
      pkg_cv_libxmlplusplus_CFLAGS="$libxmlplusplus_CFLAGS"
   elif test -n "$PKG_CONFIG"; then
@@ -51,9 +51,9 @@ diff -ru galois-0.6-orig/configure galois-0.6/configure
  
  $libxmlplusplus_PKG_ERRORS
  
-diff -ru galois-0.6-orig/configure.ac galois-0.6/configure.ac
---- galois-0.6-orig/configure.ac	2019-09-15 10:22:36.593016489 +0200
-+++ galois-0.6/configure.ac	2019-09-15 10:22:53.446550978 +0200
+diff -ru galois-0.7-orig/configure.ac galois-0.7/configure.ac
+--- galois-0.7-orig/configure.ac	2020-09-16 21:16:06.245182646 +0200
++++ galois-0.7/configure.ac	2020-09-16 21:37:38.982854339 +0200
 @@ -21,5 +21,5 @@
  AC_CONFIG_FILES([misc/galois.desktop])
  AC_PROG_CXX
@@ -61,9 +61,9 @@ diff -ru galois-0.6-orig/configure.ac galois-0.6/configure.ac
 -PKG_CHECK_MODULES([libxmlplusplus], [libxml++-2.6])
 +PKG_CHECK_MODULES([libxmlplusplus], [libxml++-3.0])
  AC_OUTPUT
-diff -ru galois-0.6-orig/src/makefile.in galois-0.6/src/makefile.in
---- galois-0.6-orig/src/makefile.in	2019-09-15 10:22:36.589683116 +0200
-+++ galois-0.6/src/makefile.in	2019-09-15 10:22:53.446550978 +0200
+diff -ru galois-0.7-orig/src/makefile.in galois-0.7/src/makefile.in
+--- galois-0.7-orig/src/makefile.in	2020-09-16 21:16:06.251845979 +0200
++++ galois-0.7/src/makefile.in	2020-09-16 21:37:27.661850909 +0200
 @@ -23,8 +23,8 @@
  PKG_CONFIG = @PKG_CONFIG@
  GTKMM_CFLAGS = `${PKG_CONFIG} --cflags gtkmm-3.0`
@@ -72,13 +72,13 @@ diff -ru galois-0.6-orig/src/makefile.in galois-0.6/src/makefile.in
 -XMLPP_LIBS = `${PKG_CONFIG} --libs libxml++-2.6`
 +XMLPP_CFLAGS = `${PKG_CONFIG} --cflags libxml++-3.0`
 +XMLPP_LIBS = `${PKG_CONFIG} --libs libxml++-3.0`
+ THREAD_LIBS = -pthread
  
  EXE = galois
- AC = makefile
-diff -ru galois-0.6-orig/src/preferences.cc galois-0.6/src/preferences.cc
---- galois-0.6-orig/src/preferences.cc	2019-09-15 10:22:36.593016489 +0200
-+++ galois-0.6/src/preferences.cc	2019-09-15 10:22:53.446550978 +0200
-@@ -388,12 +388,12 @@
+diff -ru galois-0.7-orig/src/preferences.cc galois-0.7/src/preferences.cc
+--- galois-0.7-orig/src/preferences.cc	2020-09-16 21:16:06.245182646 +0200
++++ galois-0.7/src/preferences.cc	2020-09-16 21:37:58.976186194 +0200
+@@ -385,12 +385,12 @@
        reader->read();
        // skip whitespace and comments
        while (reader->get_node_type() ==
@@ -94,7 +94,7 @@ diff -ru galois-0.6-orig/src/preferences.cc galois-0.6/src/preferences.cc
  	  reader->get_name() != "galois_config")
  	return false;
  
-@@ -403,16 +403,16 @@
+@@ -400,16 +400,16 @@
  	  reader->read();
  	  // skip whitespace and comments
  	  while (reader->get_node_type() ==
@@ -115,7 +115,7 @@ diff -ru galois-0.6-orig/src/preferences.cc galois-0.6/src/preferences.cc
  	    return false;
  
  	  // read and apply properties
-@@ -425,17 +425,17 @@
+@@ -422,17 +422,17 @@
  		  reader->read();
  		  // skip whitespace and comments
  		  while (reader->get_node_type() ==
@@ -137,7 +137,7 @@ diff -ru galois-0.6-orig/src/preferences.cc galois-0.6/src/preferences.cc
  		      reader->get_name() != "control_key")
  		    return false;
  
-@@ -461,17 +461,17 @@
+@@ -458,17 +458,17 @@
  		  reader->read();
  		  // skip whitespace and comments
  		  while (reader->get_node_type() ==
@@ -159,9 +159,9 @@ diff -ru galois-0.6-orig/src/preferences.cc galois-0.6/src/preferences.cc
  		      reader->get_name() != "control_key")
  		    return false;
  
-diff -ru galois-0.6-orig/src/scores.cc galois-0.6/src/scores.cc
---- galois-0.6-orig/src/scores.cc	2019-09-15 10:22:36.593016489 +0200
-+++ galois-0.6/src/scores.cc	2019-09-15 10:22:53.446550978 +0200
+diff -ru galois-0.7-orig/src/scores.cc galois-0.7/src/scores.cc
+--- galois-0.7-orig/src/scores.cc	2020-09-16 21:16:06.251845979 +0200
++++ galois-0.7/src/scores.cc	2020-09-16 21:37:58.976186194 +0200
 @@ -420,12 +420,12 @@
        reader->read();
        // skip whitespace and comments