Update to 0.5

4 files changed, 44 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0b2b1bcc6ddb..ad3789471ef7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = galois
 	pkgdesc = A computer game of the "falling blocks" type, but with unique features
-	pkgver = 0.4
-	pkgrel = 6
+	pkgver = 0.5
+	pkgrel = 1
 	url = http://www.nongnu.org/galois
 	arch = i686
 	arch = x86_64
 	license = GPL3
-	depends = gtkmm
+	depends = gtkmm3
 	depends = libxml++
-	source = https://download.savannah.gnu.org/releases/galois/source/galois-0.4.tar.gz
-	source = galois-install-path.patch
-	source = galois-libxml++3.0.patch
-	sha256sums = a168ae6514da1eda5afd761fa4eeaf510d79988d450a716a0c41ce978d99e447
+	source = https://download.savannah.gnu.org/releases/galois/source/galois-0.5.tar.gz
+	source = galois-0.5-install-path.patch
+	source = galois-0.5-libxml++3.0.patch
+	sha256sums = 94eecd9f1038df5fd19b14ca5b2634bd00d0cd9c534a50a996558d8ac29fb394
 	sha256sums = c4247271776f7b5df2b6bb92911c25a9ba3c30796171de5cd7dc1bd78e5a800d
-	sha256sums = fa58f17e43daf524073d7aaa700655f1b24fe929b7457e07e04e51916072bcc7
+	sha256sums = 3d5302c362cadfb1e350153e373dfce9bfbefaf83fc3427069ce0cc071f84b86
 
 pkgname = galois
 
diff --git a/PKGBUILD b/PKGBUILD
index 5c8429441111..b058895b607a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,24 +3,24 @@
 # Contributor: kusakata <shohei atmark kusakata period com>
 
 pkgname=galois
-pkgver=0.4
-pkgrel=6
+pkgver=0.5
+pkgrel=1
 pkgdesc='A computer game of the "falling blocks" type, but with unique features'
 arch=('i686' 'x86_64')
 url="http://www.nongnu.org/galois"
 license=('GPL3')
-depends=('gtkmm' 'libxml++')
+depends=('gtkmm3' 'libxml++')
 source=("https://download.savannah.gnu.org/releases/galois/source/galois-$pkgver.tar.gz"
-        "galois-install-path.patch"
-        "galois-libxml++3.0.patch")
-sha256sums=('a168ae6514da1eda5afd761fa4eeaf510d79988d450a716a0c41ce978d99e447'
+        "galois-0.5-install-path.patch"
+        "galois-0.5-libxml++3.0.patch")
+sha256sums=('94eecd9f1038df5fd19b14ca5b2634bd00d0cd9c534a50a996558d8ac29fb394'
             'c4247271776f7b5df2b6bb92911c25a9ba3c30796171de5cd7dc1bd78e5a800d'
-            'fa58f17e43daf524073d7aaa700655f1b24fe929b7457e07e04e51916072bcc7')
+            '3d5302c362cadfb1e350153e373dfce9bfbefaf83fc3427069ce0cc071f84b86')
 
 prepare() {
   cd $pkgname-$pkgver
-  patch -p1 -i ../galois-install-path.patch
-  patch -p1 -i ../galois-libxml++3.0.patch
+  patch -p1 -i ../galois-0.5-install-path.patch
+  patch -p1 -i ../galois-0.5-libxml++3.0.patch
 }
 
 build() {
diff --git a/galois-install-path.patch b/galois-0.5-install-path.patch
index 0f3e2c2dcd9a..0f3e2c2dcd9a 100644
--- a/galois-install-path.patch
+++ b/galois-0.5-install-path.patch
diff --git a/galois-libxml++3.0.patch b/galois-0.5-libxml++3.0.patch
index b8a48d854691..4abc54090386 100644
--- a/galois-libxml++3.0.patch
+++ b/galois-0.5-libxml++3.0.patch
@@ -1,7 +1,7 @@
-diff -ru galois-0.4-orig/configure galois-0.4/configure
---- galois-0.4-orig/configure	2017-02-18 22:20:37.407286450 +0100
-+++ galois-0.4/configure	2017-02-18 22:22:33.054893114 +0100
-@@ -2483,12 +2483,12 @@
+diff -ru galois-0.5-orig/configure galois-0.5/configure
+--- galois-0.5-orig/configure	2017-12-21 17:35:20.778204557 +0100
++++ galois-0.5/configure	2017-12-21 17:46:16.889355223 +0100
+@@ -2495,12 +2495,12 @@
      pkg_cv_libxmlplusplus_CFLAGS="$libxmlplusplus_CFLAGS"
   elif test -n "$PKG_CONFIG"; then
      if test -n "$PKG_CONFIG" && \
@@ -17,7 +17,7 @@ diff -ru galois-0.4-orig/configure galois-0.4/configure
  		      test "x$?" != "x0" && pkg_failed=yes
  else
    pkg_failed=yes
-@@ -2500,12 +2500,12 @@
+@@ -2512,12 +2512,12 @@
      pkg_cv_libxmlplusplus_LIBS="$libxmlplusplus_LIBS"
   elif test -n "$PKG_CONFIG"; then
      if test -n "$PKG_CONFIG" && \
@@ -33,7 +33,7 @@ diff -ru galois-0.4-orig/configure galois-0.4/configure
  		      test "x$?" != "x0" && pkg_failed=yes
  else
    pkg_failed=yes
-@@ -2526,14 +2526,14 @@
+@@ -2538,14 +2538,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -51,23 +51,23 @@ diff -ru galois-0.4-orig/configure galois-0.4/configure
  
  $libxmlplusplus_PKG_ERRORS
  
-diff -ru galois-0.4-orig/configure.ac galois-0.4/configure.ac
---- galois-0.4-orig/configure.ac	2017-02-18 22:20:37.410619714 +0100
-+++ galois-0.4/configure.ac	2017-02-18 22:22:35.078184621 +0100
+diff -ru galois-0.5-orig/configure.ac galois-0.5/configure.ac
+--- galois-0.5-orig/configure.ac	2017-12-21 17:35:20.778204557 +0100
++++ galois-0.5/configure.ac	2017-12-21 17:46:16.889355223 +0100
 @@ -21,5 +21,5 @@
  AC_CONFIG_FILES([misc/galois.desktop])
  AC_PROG_CXX
- PKG_CHECK_MODULES([gtkmm], [gtkmm-2.4])
+ PKG_CHECK_MODULES([gtkmm], [gtkmm-3.0])
 -PKG_CHECK_MODULES([libxmlplusplus], [libxml++-2.6])
 +PKG_CHECK_MODULES([libxmlplusplus], [libxml++-3.0])
  AC_OUTPUT
-diff -ru galois-0.4-orig/src/makefile.in galois-0.4/src/makefile.in
---- galois-0.4-orig/src/makefile.in	2017-02-18 22:20:37.397286657 +0100
-+++ galois-0.4/src/makefile.in	2017-02-18 22:22:41.658048611 +0100
+diff -ru galois-0.5-orig/src/makefile.in galois-0.5/src/makefile.in
+--- galois-0.5-orig/src/makefile.in	2017-12-21 17:35:20.774871284 +0100
++++ galois-0.5/src/makefile.in	2017-12-21 17:46:16.889355223 +0100
 @@ -23,8 +23,8 @@
  PKG_CONFIG = @PKG_CONFIG@
- GTKMM_CFLAGS = `${PKG_CONFIG} --cflags gtkmm-2.4`
- GTKMM_LIBS = `${PKG_CONFIG} --libs gtkmm-2.4`
+ GTKMM_CFLAGS = `${PKG_CONFIG} --cflags gtkmm-3.0`
+ GTKMM_LIBS = `${PKG_CONFIG} --libs gtkmm-3.0`
 -XMLPP_CFLAGS = `${PKG_CONFIG} --cflags libxml++-2.6`
 -XMLPP_LIBS = `${PKG_CONFIG} --libs libxml++-2.6`
 +XMLPP_CFLAGS = `${PKG_CONFIG} --cflags libxml++-3.0`
@@ -75,10 +75,10 @@ diff -ru galois-0.4-orig/src/makefile.in galois-0.4/src/makefile.in
  
  EXE = galois
  AC = makefile
-diff -ru galois-0.4-orig/src/preferences.cc galois-0.4/src/preferences.cc
---- galois-0.4-orig/src/preferences.cc	2017-02-18 22:20:37.400619921 +0100
-+++ galois-0.4/src/preferences.cc	2017-02-18 22:21:23.812992093 +0100
-@@ -409,12 +409,12 @@
+diff -ru galois-0.5-orig/src/preferences.cc galois-0.5/src/preferences.cc
+--- galois-0.5-orig/src/preferences.cc	2017-12-21 17:35:20.778204557 +0100
++++ galois-0.5/src/preferences.cc	2017-12-21 17:49:38.005564783 +0100
+@@ -383,12 +383,12 @@
        reader->read();
        // skip whitespace and comments
        while (reader->get_node_type() ==
@@ -94,7 +94,7 @@ diff -ru galois-0.4-orig/src/preferences.cc galois-0.4/src/preferences.cc
  	  reader->get_name() != "galois_config")
  	return false;
  
-@@ -424,16 +424,16 @@
+@@ -398,16 +398,16 @@
  	  reader->read();
  	  // skip whitespace and comments
  	  while (reader->get_node_type() ==
@@ -115,7 +115,7 @@ diff -ru galois-0.4-orig/src/preferences.cc galois-0.4/src/preferences.cc
  	    return false;
  
  	  // read and apply properties
-@@ -446,17 +446,17 @@
+@@ -420,17 +420,17 @@
  		  reader->read();
  		  // skip whitespace and comments
  		  while (reader->get_node_type() ==
@@ -137,7 +137,7 @@ diff -ru galois-0.4-orig/src/preferences.cc galois-0.4/src/preferences.cc
  		      reader->get_name() != "control_key")
  		    return false;
  
-@@ -482,17 +482,17 @@
+@@ -456,17 +456,17 @@
  		  reader->read();
  		  // skip whitespace and comments
  		  while (reader->get_node_type() ==
@@ -159,10 +159,10 @@ diff -ru galois-0.4-orig/src/preferences.cc galois-0.4/src/preferences.cc
  		      reader->get_name() != "control_key")
  		    return false;
  
-diff -ru galois-0.4-orig/src/scores.cc galois-0.4/src/scores.cc
---- galois-0.4-orig/src/scores.cc	2017-02-18 22:20:37.397286657 +0100
-+++ galois-0.4/src/scores.cc	2017-02-18 22:21:23.812992093 +0100
-@@ -423,12 +423,12 @@
+diff -ru galois-0.5-orig/src/scores.cc galois-0.5/src/scores.cc
+--- galois-0.5-orig/src/scores.cc	2017-12-21 17:35:20.774871284 +0100
++++ galois-0.5/src/scores.cc	2017-12-21 17:51:00.384008315 +0100
+@@ -414,12 +414,12 @@
        reader->read();
        // skip whitespace and comments
        while (reader->get_node_type() ==
@@ -178,7 +178,7 @@ diff -ru galois-0.4-orig/src/scores.cc galois-0.4/src/scores.cc
  	  reader->get_name() != "galois_scores")
  	return false;
  
-@@ -439,16 +439,16 @@
+@@ -430,16 +430,16 @@
  	  reader->read();
  	  // skip whitespace and comments
  	  while (reader->get_node_type() ==