From: Bruno Haible <bruno@clisp.org>
Date: Thu, 14 Mar 2019 18:03:38 +0000 (+0100)
Subject: libtextstyle: Use less code from libxml.
X-Git-Tag: v0.20~127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68cebcd8c58f476991a90cd8e16632d68f688426;p=thirdparty%2Fgettext.git

libtextstyle: Use less code from libxml.

* libtextstyle/gnulib-local/lib/libxml/xmlversion.in.h.diff: New file.
* gnulib-local/lib/libxml/save.h (xmlEncodeAttributeEntities): Declare also when
LIBXML_OUTPUT_ENABLED is 0.
---

diff --git a/gnulib-local/lib/libxml/save.h b/gnulib-local/lib/libxml/save.h
index 2c32a1039..d1a30bd1b 100644
--- a/gnulib-local/lib/libxml/save.h
+++ b/gnulib-local/lib/libxml/save.h
@@ -25,8 +25,8 @@ void xmlBufDumpNotationTable(xmlBufPtr buf, xmlNotationTablePtr table);
 void xmlBufDumpElementDecl(xmlBufPtr buf, xmlElementPtr elem);
 void xmlBufDumpAttributeDecl(xmlBufPtr buf, xmlAttributePtr attr);
 void xmlBufDumpEntityDecl(xmlBufPtr buf, xmlEntityPtr ent);
-xmlChar *xmlEncodeAttributeEntities(xmlDocPtr doc, const xmlChar *input);
 #endif
+xmlChar *xmlEncodeAttributeEntities(xmlDocPtr doc, const xmlChar *input);
 
 #ifdef __cplusplus
 }
diff --git a/libtextstyle/gnulib-local/lib/libxml/xmlversion.in.h.diff b/libtextstyle/gnulib-local/lib/libxml/xmlversion.in.h.diff
new file mode 100644
index 000000000..4c33d04f7
--- /dev/null
+++ b/libtextstyle/gnulib-local/lib/libxml/xmlversion.in.h.diff
@@ -0,0 +1,121 @@
+*** xmlversion.in.h.orig
+--- xmlversion.in.h
+***************
+*** 120,126 ****
+   *
+   * Whether the serialization/saving support is configured in
+   */
+! #if 1
+  #define LIBXML_OUTPUT_ENABLED
+  #endif
+  
+--- 120,126 ----
+   *
+   * Whether the serialization/saving support is configured in
+   */
+! #if 0
+  #define LIBXML_OUTPUT_ENABLED
+  #endif
+  
+***************
+*** 129,135 ****
+   *
+   * Whether the push parsing interfaces are configured in
+   */
+! #if 1
+  #define LIBXML_PUSH_ENABLED
+  #endif
+  
+--- 129,135 ----
+   *
+   * Whether the push parsing interfaces are configured in
+   */
+! #if 0
+  #define LIBXML_PUSH_ENABLED
+  #endif
+  
+***************
+*** 138,144 ****
+   *
+   * Whether the xmlReader parsing interface is configured in
+   */
+! #if 1
+  #define LIBXML_READER_ENABLED
+  #endif
+  
+--- 138,144 ----
+   *
+   * Whether the xmlReader parsing interface is configured in
+   */
+! #if 0
+  #define LIBXML_READER_ENABLED
+  #endif
+  
+***************
+*** 156,162 ****
+   *
+   * Whether the xmlWriter saving interface is configured in
+   */
+! #if 1
+  #define LIBXML_WRITER_ENABLED
+  #endif
+  
+--- 156,162 ----
+   *
+   * Whether the xmlWriter saving interface is configured in
+   */
+! #if 0
+  #define LIBXML_WRITER_ENABLED
+  #endif
+  
+***************
+*** 246,252 ****
+   *
+   * Whether XPath is configured in
+   */
+! #if 1
+  #define LIBXML_XPATH_ENABLED
+  #endif
+  
+--- 246,252 ----
+   *
+   * Whether XPath is configured in
+   */
+! #if 0
+  #define LIBXML_XPATH_ENABLED
+  #endif
+  
+***************
+*** 255,261 ****
+   *
+   * Whether XPointer is configured in
+   */
+! #if 1
+  #define LIBXML_XPTR_ENABLED
+  #endif
+  
+--- 255,261 ----
+   *
+   * Whether XPointer is configured in
+   */
+! #if 0
+  #define LIBXML_XPTR_ENABLED
+  #endif
+  
+***************
+*** 273,279 ****
+   *
+   * Whether iconv support is available
+   */
+! #if 1
+  #define LIBXML_ICONV_ENABLED
+  #endif
+  
+--- 273,279 ----
+   *
+   * Whether iconv support is available
+   */
+! #if 0
+  #define LIBXML_ICONV_ENABLED
+  #endif
+