Skip to content

Commit 1e80b3b

Browse files
committed
Patch implicit bool conversion in xmlmm
1 parent d36dbf6 commit 1e80b3b

File tree

2 files changed

+32
-0
lines changed

2 files changed

+32
-0
lines changed

CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ GET(${GTKMM_DIR_URL}/${GTKMM_DIR}.tar.xz)
4545
GET(${PANGOMM_DIR_URL}/${PANGOMM_DIR}.tar.xz)
4646
GET(${SIGC_DIR_URL}/${SIGC_DIR}.tar.xz)
4747
GET(${XMLMM_DIR_URL}/${XMLMM_DIR}.tar.xz)
48+
execute_process(COMMAND ${PATCH} -p0 -i ${CMAKE_CURRENT_SOURCE_DIR}/patches/libxmlpp_stream_explicit_bool.patch
49+
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${XMLMM_DIR})
4850
GET(${GSTREAMERMM_DIR_URL}/${GSTREAMERMM_DIR}.tar.xz)
4951
GET_VERSION(${GSTREAMERMM_DIR} GSTREAMERMM_MAJOR_VERSION GSTREAMERMM_MINOR_VERSION GSTREAMERMM_MICRO_VERSION)
5052
execute_process(COMMAND ${PATCH} -p0 -i ${CMAKE_CURRENT_SOURCE_DIR}/patches/gstreamer_mp_player_window_cc.patch
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
diff -burN libxml++.orig/io/istreamparserinputbuffer.cc libxml++/io/istreamparserinputbuffer.cc
2+
--- libxml++.orig/io/istreamparserinputbuffer.cc 2013-09-29 04:45:16.000000000 -0500
3+
+++ libxml++/io/istreamparserinputbuffer.cc 2015-04-25 23:21:46.392578500 -0500
4+
@@ -39,6 +39,6 @@
5+
6+
bool IStreamParserInputBuffer::do_close()
7+
{
8+
- return input_;
9+
+ return !input_.fail();
10+
}
11+
}
12+
diff -burN libxml++.orig/io/ostreamoutputbuffer.cc libxml++/io/ostreamoutputbuffer.cc
13+
--- libxml++.orig/io/ostreamoutputbuffer.cc 2013-09-29 04:45:16.000000000 -0500
14+
+++ libxml++/io/ostreamoutputbuffer.cc 2015-04-25 23:24:57.258269000 -0500
15+
@@ -29,13 +29,13 @@
16+
// here we rely on the ostream implicit conversion to boolean, to know if the stream can be used and/or if the write succeded.
17+
if(output_)
18+
output_.write(buffer, len);
19+
- return output_;
20+
+ return !output_.fail();
21+
}
22+
23+
bool OStreamOutputBuffer::do_close()
24+
{
25+
if(output_)
26+
output_.flush();
27+
- return output_;
28+
+ return !output_.fail();
29+
}
30+
}

0 commit comments

Comments
 (0)