1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
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;
|