Make it compatible with libxml2 >= 2.12.0

kjellahl · kjellahl · commit 6e7e90984418 · 2023-11-19T14:36:32.000+01:00
* libxml++/document.cc:
* libxml++/dtd.cc:
* libxml++/nodes/entitydeclaration.cc:
* libxml++/nodes/entityreference.cc:
* libxml++/validators/relaxngvalidator.cc: Modify #include directives.
* libxml++/keepblanks.cc: Ignore deprecation of xmlKeepBlanksDefault().
* tests/saxparser_chunk_parsing_inconsistent_state/main.cc:
Accept that MySaxParser::on_start_document() can be called before
MySaxParser::on_error().
diff --git a/libxml++/document.cc b/libxml++/document.cc
@@ -16,6 +16,7 @@
 
 #include <libxml/tree.h>
 #include <libxml/xinclude.h>
+#include <libxml/xmlsave.h>
 #include <libxml/parser.h> // XML_PARSE_NOXINCNODE, XML_PARSE_NOBASEFIX
 
 #include <iostream>
diff --git a/libxml++/dtd.cc b/libxml++/dtd.cc
@@ -8,7 +8,7 @@
 #include <libxml++/exceptions/parse_error.h>
 #include <libxml++/io/istreamparserinputbuffer.h>
 
-#include <libxml/tree.h>
+#include <libxml/parser.h>
 
 namespace xmlpp
 {
diff --git a/libxml++/keepblanks.cc b/libxml++/keepblanks.cc
@@ -5,8 +5,11 @@
  * included with libxml++ as the file COPYING.
  */
 
-#include <libxml++/keepblanks.h>
+// xmlKeepBlanksDefault() is deprecated since libxml2 2.12.0.
+// Ignore deprecations here.
+#define XML_DEPRECATED
 
+#include <libxml++/keepblanks.h>
 #include <libxml/globals.h>
 
 namespace xmlpp
diff --git a/libxml++/nodes/entitydeclaration.cc b/libxml++/nodes/entitydeclaration.cc
@@ -5,7 +5,7 @@
  */
 
 #include <libxml++/nodes/entitydeclaration.h>
-#include <libxml/tree.h>
+#include <libxml/entities.h>
 
 namespace xmlpp
 {
diff --git a/libxml++/nodes/entityreference.cc b/libxml++/nodes/entityreference.cc
@@ -6,7 +6,7 @@
 
 #include <libxml++/nodes/entityreference.h>
 
-#include <libxml/tree.h>
+#include <libxml/entities.h>
 
 namespace xmlpp
 {
diff --git a/libxml++/validators/relaxngvalidator.cc b/libxml++/validators/relaxngvalidator.cc
@@ -22,6 +22,7 @@
 #include "libxml++/parsers/domparser.h"
 #include "libxml++/relaxngschema.h"
 
+#include <libxml/tree.h>
 #include <libxml/relaxng.h>
 
 namespace xmlpp
diff --git a/tests/saxparser_chunk_parsing_inconsistent_state/main.cc b/tests/saxparser_chunk_parsing_inconsistent_state/main.cc
@@ -23,10 +23,14 @@
 
 class MySaxParser : public xmlpp::SaxParser
 {
+public:
+  bool throw_on_start_doc = true;
+
 protected:
   void on_start_document() override
   {
-    throw std::runtime_error("some custom runtime exception");
+    if (throw_on_start_doc)
+      throw std::runtime_error("some custom runtime exception");
   }
   void on_error(const Glib::ustring& /* text */) override
   {
@@ -46,6 +50,9 @@ int main()
     bool exceptionThrown = false;
     try
     {
+      // Depending on the libxml2 version, MySaxParser::on_start_document()
+      // may or may not be called before MySaxParser::on_error().
+      parser.throw_on_start_doc = false;
       parser.parse_chunk("<?");
       parser.finish_chunk_parsing();
     }
@@ -64,6 +71,7 @@ int main()
     exceptionThrown = false;
     try
     {
+      parser.throw_on_start_doc = true;
       std::stringstream ss("<root></root>");
       parser.parse_stream(ss);
     }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`#include <libxml++/exceptions/parse_error.h>`
`9`	`9`	`#include <libxml++/io/istreamparserinputbuffer.h>`
`10`	`10`
`11`		`-#include <libxml/tree.h>`
	`11`	`+#include <libxml/parser.h>`
`12`	`12`
`13`	`13`	`namespace xmlpp`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*/`
`6`	`6`
`7`	`7`	`#include <libxml++/nodes/entitydeclaration.h>`
`8`		`-#include <libxml/tree.h>`
	`8`	`+#include <libxml/entities.h>`
`9`	`9`
`10`	`10`	`namespace xmlpp`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`#include <libxml++/nodes/entityreference.h>`
`8`	`8`
`9`		`-#include <libxml/tree.h>`
	`9`	`+#include <libxml/entities.h>`
`10`	`10`
`11`	`11`	`namespace xmlpp`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,14 @@`
`23`	`23`
`24`	`24`	`class MySaxParser : public xmlpp::SaxParser`
`25`	`25`	`{`
	`26`	`+public:`
	`27`	`+ bool throw_on_start_doc = true;`
	`28`	`+`
`26`	`29`	`protected:`
`27`	`30`	`void on_start_document() override`
`28`	`31`	`{`
`29`		`- throw std::runtime_error("some custom runtime exception");`
	`32`	`+ if (throw_on_start_doc)`
	`33`	`+ throw std::runtime_error("some custom runtime exception");`
`30`	`34`	`}`
`31`	`35`	`void on_error(const Glib::ustring& /* text */) override`
`32`	`36`	`{`
`@@ -46,6 +50,9 @@ int main()`
`46`	`50`	`bool exceptionThrown = false;`
`47`	`51`	`try`
`48`	`52`	`{`
	`53`	`+ // Depending on the libxml2 version, MySaxParser::on_start_document()`
	`54`	`+ // may or may not be called before MySaxParser::on_error().`
	`55`	`+ parser.throw_on_start_doc = false;`
`49`	`56`	`parser.parse_chunk("<?");`
`50`	`57`	`parser.finish_chunk_parsing();`
`51`	`58`	`}`
`@@ -64,6 +71,7 @@ int main()`
`64`	`71`	`exceptionThrown = false;`
`65`	`72`	`try`
`66`	`73`	`{`
	`74`	`+ parser.throw_on_start_doc = true;`
`67`	`75`	`std::stringstream ss("<root></root>");`
`68`	`76`	`parser.parse_stream(ss);`
`69`	`77`	`}`