Update to 0.7

1 files changed, 201 insertions, 0 deletions

diff --git a/galois-0.7-libxml++3.0.patch b/galois-0.7-libxml++3.0.patch
new file mode 100644
index 000000000000..c034f8e07ff6
--- /dev/null
+++ b/galois-0.7-libxml++3.0.patch
@@ -0,0 +1,201 @@
+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
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml++-2.6\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libxml++-2.6") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml++-3.0\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "libxml++-3.0") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_libxmlplusplus_CFLAGS=`$PKG_CONFIG --cflags "libxml++-2.6" 2>/dev/null`
++  pkg_cv_libxmlplusplus_CFLAGS=`$PKG_CONFIG --cflags "libxml++-3.0" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -2512,12 +2512,12 @@
+     pkg_cv_libxmlplusplus_LIBS="$libxmlplusplus_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml++-2.6\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libxml++-2.6") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml++-3.0\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "libxml++-3.0") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_libxmlplusplus_LIBS=`$PKG_CONFIG --libs "libxml++-2.6" 2>/dev/null`
++  pkg_cv_libxmlplusplus_LIBS=`$PKG_CONFIG --libs "libxml++-3.0" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -2538,14 +2538,14 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        libxmlplusplus_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml++-2.6" 2>&1`
++	        libxmlplusplus_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml++-3.0" 2>&1`
+         else
+-	        libxmlplusplus_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml++-2.6" 2>&1`
++	        libxmlplusplus_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml++-3.0" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$libxmlplusplus_PKG_ERRORS" >&5
+ 
+-	as_fn_error $? "Package requirements (libxml++-2.6) were not met:
++	as_fn_error $? "Package requirements (libxml++-3.0) were not met:
+ 
+ $libxmlplusplus_PKG_ERRORS
+ 
+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
+ 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.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`
+ 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`
++XMLPP_LIBS = `${PKG_CONFIG} --libs libxml++-3.0`
+ THREAD_LIBS = -pthread
+ 
+ EXE = galois
+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() ==
+-	     xmlpp::TextReader::SignificantWhitespace ||
+-	     reader->get_node_type() == xmlpp::TextReader::Comment)
++	     xmlpp::TextReader::NodeType::SignificantWhitespace ||
++	     reader->get_node_type() == xmlpp::TextReader::NodeType::Comment)
+ 	reader->read();
+ 
+       // document node
+-      if (reader->get_node_type() != xmlpp::TextReader::Element ||
++      if (reader->get_node_type() != xmlpp::TextReader::NodeType::Element ||
+ 	  reader->get_name() != "galois_config")
+ 	return false;
+ 
+@@ -400,16 +400,16 @@
+ 	  reader->read();
+ 	  // skip whitespace and comments
+ 	  while (reader->get_node_type() ==
+-		 xmlpp::TextReader::SignificantWhitespace ||
+-		 reader->get_node_type() == xmlpp::TextReader::Comment)
++		 xmlpp::TextReader::NodeType::SignificantWhitespace ||
++		 reader->get_node_type() == xmlpp::TextReader::NodeType::Comment)
+ 	    reader->read();
+ 
+ 	  // end of document node
+-	  if (reader->get_node_type() == xmlpp::TextReader::EndElement
++	  if (reader->get_node_type() == xmlpp::TextReader::NodeType::EndElement
+ 	      && reader->get_name() == "galois_config")
+ 	    break;
+ 
+-	  if (reader->get_node_type() != xmlpp::TextReader::Element)
++	  if (reader->get_node_type() != xmlpp::TextReader::NodeType::Element)
+ 	    return false;
+ 
+ 	  // read and apply properties
+@@ -422,17 +422,17 @@
+ 		  reader->read();
+ 		  // skip whitespace and comments
+ 		  while (reader->get_node_type() ==
+-			 xmlpp::TextReader::SignificantWhitespace ||
++			 xmlpp::TextReader::NodeType::SignificantWhitespace ||
+ 			 reader->get_node_type() ==
+-			 xmlpp::TextReader::Comment)
++			 xmlpp::TextReader::NodeType::Comment)
+ 		    reader->read();
+ 
+ 		  // end of document node
+-		  if (reader->get_node_type() == xmlpp::TextReader::EndElement
++		  if (reader->get_node_type() == xmlpp::TextReader::NodeType::EndElement
+ 		      && reader->get_name() == "keys_2d")
+ 		    break;
+ 
+-		  if (reader->get_node_type() != xmlpp::TextReader::Element ||
++		  if (reader->get_node_type() != xmlpp::TextReader::NodeType::Element ||
+ 		      reader->get_name() != "control_key")
+ 		    return false;
+ 
+@@ -458,17 +458,17 @@
+ 		  reader->read();
+ 		  // skip whitespace and comments
+ 		  while (reader->get_node_type() ==
+-			 xmlpp::TextReader::SignificantWhitespace ||
++			 xmlpp::TextReader::NodeType::SignificantWhitespace ||
+ 			 reader->get_node_type() ==
+-			 xmlpp::TextReader::Comment)
++			 xmlpp::TextReader::NodeType::Comment)
+ 		    reader->read();
+ 
+ 		  // end of document node
+-		  if (reader->get_node_type() == xmlpp::TextReader::EndElement
++		  if (reader->get_node_type() == xmlpp::TextReader::NodeType::EndElement
+ 		      && reader->get_name() == "keys_3d")
+ 		    break;
+ 
+-		  if (reader->get_node_type() != xmlpp::TextReader::Element ||
++		  if (reader->get_node_type() != xmlpp::TextReader::NodeType::Element ||
+ 		      reader->get_name() != "control_key")
+ 		    return false;
+ 
+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
+       while (reader->get_node_type() ==
+-	     xmlpp::TextReader::SignificantWhitespace ||
+-	     reader->get_node_type() == xmlpp::TextReader::Comment)
++	     xmlpp::TextReader::NodeType::SignificantWhitespace ||
++	     reader->get_node_type() == xmlpp::TextReader::NodeType::Comment)
+ 	reader->read();
+ 
+       // document node
+-      if (reader->get_node_type() != xmlpp::TextReader::Element ||
++      if (reader->get_node_type() != xmlpp::TextReader::NodeType::Element ||
+ 	  reader->get_name() != "galois_scores")
+ 	return false;
+ 
+@@ -436,16 +436,16 @@
+ 	  reader->read();
+ 	  // skip whitespace and comments
+ 	  while (reader->get_node_type() ==
+-		 xmlpp::TextReader::SignificantWhitespace ||
+-		 reader->get_node_type() == xmlpp::TextReader::Comment)
++		 xmlpp::TextReader::NodeType::SignificantWhitespace ||
++		 reader->get_node_type() == xmlpp::TextReader::NodeType::Comment)
+ 	    reader->read();
+ 
+ 	  // end of document node
+-	  if (reader->get_node_type() == xmlpp::TextReader::EndElement
++	  if (reader->get_node_type() == xmlpp::TextReader::NodeType::EndElement
+ 	      && reader->get_name() == "galois_scores")
+ 	    break;
+ 
+-	  if (reader->get_node_type() != xmlpp::TextReader::Element ||
++	  if (reader->get_node_type() != xmlpp::TextReader::NodeType::Element ||
+ 	      reader->get_name() != "game")
+ 	    return false;
+