Dual revision bumps; fix 2.10.0 patch and added a counterpart patch for 2.8.0 since it suffers from the same bug.

Package-Manager: portage-2.0.51.20-r4

4 files changed, 19 insertions, 18 deletions

diff --git a/dev-cpp/libxmlpp/files/digest-libxmlpp-2.10.0 b/dev-cpp/libxmlpp/files/digest-libxmlpp-2.10.0-r1
index 327819b1aa71..327819b1aa71 100644
--- a/dev-cpp/libxmlpp/files/digest-libxmlpp-2.10.0
+++ b/dev-cpp/libxmlpp/files/digest-libxmlpp-2.10.0-r1
diff --git a/dev-cpp/libxmlpp/files/digest-libxmlpp-2.8.0 b/dev-cpp/libxmlpp/files/digest-libxmlpp-2.8.0-r1
index 3a1250698921..3a1250698921 100644
--- a/dev-cpp/libxmlpp/files/digest-libxmlpp-2.8.0
+++ b/dev-cpp/libxmlpp/files/digest-libxmlpp-2.8.0-r1
diff --git a/dev-cpp/libxmlpp/files/libxmlpp-2.10.0-use-correct-callback.diff b/dev-cpp/libxmlpp/files/libxmlpp-2.10.0-use-correct-callback.diff
index 546074de7787..a6c2f41c06c4 100644
--- a/dev-cpp/libxmlpp/files/libxmlpp-2.10.0-use-correct-callback.diff
+++ b/dev-cpp/libxmlpp/files/libxmlpp-2.10.0-use-correct-callback.diff
@@ -1,23 +1,12 @@
-diff --exclude='*~' -ur libxml++-2.10.0.orig/libxml++/parsers/saxparser.cc libxml++-2.10.0/libxml++/parsers/saxparser.cc
---- libxml++-2.10.0.orig/libxml++/parsers/saxparser.cc	2005-04-23 07:54:18.000000000 -0400
-+++ libxml++-2.10.0/libxml++/parsers/saxparser.cc	2005-04-23 11:41:52.000000000 -0400
-@@ -395,10 +395,15 @@
+diff --exclude='*~' -urN libxml++-2.10.0.orig/libxml++/parsers/saxparser.cc libxml++-2.10.0/libxml++/parsers/saxparser.cc
+--- libxml++-2.10.0.orig/libxml++/parsers/saxparser.cc	2005-04-27 03:52:24.000000000 -0400
++++ libxml++-2.10.0/libxml++/parsers/saxparser.cc	2005-04-27 03:53:23.000000000 -0400
+@@ -395,7 +395,7 @@
      // Here we force the use of Glib::ustring::ustring( InputIterator begin, InputIterator end )
      // instead of Glib::ustring::ustring( const char*, size_type ) because it
      // expects the length of the string in characters, not in bytes.
 -    parser->on_cdata_block(
--        Glib::ustring(
-+    Glib::ustring s(
++    parser->on_characters(
+         Glib::ustring(
            reinterpret_cast<const char *>(ch),
--          reinterpret_cast<const char *>(ch + len) ) );
-+          reinterpret_cast<const char *>(ch + len) );
-+    
-+    if (s.substr(0, 5) == "Diego")
-+	std::cout << "ch = '" << ch+len << "'" << std::endl
-+		  << "s = '"  << s      << "'" << std::endl;
-+    
-+    parser->on_characters(s);
-   }
-   catch(const exception& e)
-   {
-Only in libxml++-2.10.0/libxml++/parsers: .saxparser.cc.swp
+           reinterpret_cast<const char *>(ch + len) ) );
diff --git a/dev-cpp/libxmlpp/files/libxmlpp-2.8.0-use-correct-callback.diff b/dev-cpp/libxmlpp/files/libxmlpp-2.8.0-use-correct-callback.diff
new file mode 100644
index 000000000000..4a75ae040c17
--- /dev/null
+++ b/dev-cpp/libxmlpp/files/libxmlpp-2.8.0-use-correct-callback.diff
@@ -0,0 +1,12 @@
+diff --exclude='*~' -urN libxml++-2.8.0.orig/libxml++/parsers/saxparser.cc libxml++-2.8.0/libxml++/parsers/saxparser.cc
+--- libxml++-2.8.0.orig/libxml++/parsers/saxparser.cc	2005-04-27 03:57:31.000000000 -0400
++++ libxml++-2.8.0/libxml++/parsers/saxparser.cc	2005-04-27 03:57:52.000000000 -0400
+@@ -390,7 +390,7 @@
+     // Here we force the use of Glib::ustring::ustring( InputIterator begin, InputIterator end )
+     // instead of Glib::ustring::ustring( const char*, size_type ) because it
+     // waits for the length of the string in characters, not in bytes.
+-    parser->on_cdata_block(
++    parser->on_characters(
+         Glib::ustring(
+           reinterpret_cast<const char *>(ch),
+           reinterpret_cast<const char *>(ch + len) ) );