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
|
Description: Upgrade dependency from libxml++2.6-dev to libxml++-5.0-dev
Origin: http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=27;bug=1121314
Bug-Debian: http://bugs.debian.org/1121314
Author: Sébastien Noel <sebastien@twolife.be>
Index: galois-0.8/configure.ac
===================================================================
--- galois-0.8.orig/configure.ac
+++ galois-0.8/configure.ac
@@ -21,5 +21,5 @@ AC_CONFIG_FILES([doc/galois-C.omf doc/ga
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++-5.0])
AC_OUTPUT
Index: galois-0.8/src/makefile.in
===================================================================
--- galois-0.8.orig/src/makefile.in
+++ galois-0.8/src/makefile.in
@@ -25,8 +25,8 @@ LDFLAGS += @LDFLAGS@
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++-5.0`
+XMLPP_LIBS = `${PKG_CONFIG} --libs libxml++-5.0`
THREAD_LIBS = -pthread
EXE = galois
Index: galois-0.8/src/preferences.cc
===================================================================
--- galois-0.8.orig/src/preferences.cc
+++ galois-0.8/src/preferences.cc
@@ -385,12 +385,12 @@ bool PrefsDialog::load()
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 @@ bool PrefsDialog::load()
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 @@ bool PrefsDialog::load()
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 @@ bool PrefsDialog::load()
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;
Index: galois-0.8/src/scores.cc
===================================================================
--- galois-0.8.orig/src/scores.cc
+++ galois-0.8/src/scores.cc
@@ -420,12 +420,12 @@ bool ScoresDialog::load()
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 @@ bool ScoresDialog::load()
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;
|
