[lmi-commits] [lmi] master 33aad87 3/6: Upgrade to xmlwrapp-0.8.1

[Greg Chicares]

branch: master
commit 33aad875c8238eed95d0890d1dfb861bca033186
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Upgrade to xmlwrapp-0.8.1
    
    The patches included were discussed on the lmi mailing list here:
      https://lists.nongnu.org/archive/html/lmi/2017-09/msg00023.html
      https://lists.nongnu.org/archive/html/lmi/2017-10/msg00000.html
---
 install_miscellanea.make |  6 +++---
 xmlwrapp-0.8.1.md5sums   | 43 +++++++++++++++++++++++++++++++++++++++++++
 xmlwrapp-0.8.1.patch     | 24 ++++++++++++++++++++++++
 3 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/install_miscellanea.make b/install_miscellanea.make
index 1f4c598..d0aa752 100644
--- a/install_miscellanea.make
+++ b/install_miscellanea.make
@@ -49,7 +49,7 @@ jing_archive     := jing-20091111.zip
 md5sum_msw_exe   := md5sum.exe
 sample_archive   := lmi-data-20050618T1440Z.tar.bz2
 trang_archive    := trang-20091111.zip
-xmlwrapp_archive := xmlwrapp-0.7.1.tar.gz
+xmlwrapp_archive := xmlwrapp-0.8.1.tar.gz
 
 file_list := \
   $(boost_archive) \
@@ -76,7 +76,7 @@ $(jing_archive)-url     := 
http://storage.googleapis.com/google-code-archive-dow
 $(md5sum_msw_exe)-url   := 
http://etree.org/cgi-bin/counter.cgi/software/md5sum.exe#!md5!eb574b236133e60c989c6f472f07827b
 $(sample_archive)-url   := 
http://download.savannah.gnu.org/releases/lmi/$(sample_archive)
 $(trang_archive)-url    := 
http://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jing-trang/$(trang_archive)
-$(xmlwrapp_archive)-url := 
http://github.com/vslavik/xmlwrapp/releases/download/v0.7.1/$(xmlwrapp_archive)
+$(xmlwrapp_archive)-url := 
http://github.com/vslavik/xmlwrapp/releases/download/v0.8.1/$(xmlwrapp_archive)
 
 $(boost_archive)-md5    := 2b999b2fb7798e1737d1fff8fac602ef
 $(cgicc_archive)-md5    := 6cb5153fc9fa64b4e50c7962aa557bbe
@@ -85,7 +85,7 @@ $(jing_archive)-md5     := 13eef193921409a1636377d1efbf9843
 $(md5sum_msw_exe)-md5   := eb574b236133e60c989c6f472f07827b
 $(sample_archive)-md5   := e7f07133abfc3b9c2252dfa3b61191bc
 $(trang_archive)-md5    := 9d31799b948c350850eb9dd14e5b832d
-$(xmlwrapp_archive)-md5 := d35f49e45cffaeb77bddda833bdd6c43
+$(xmlwrapp_archive)-md5 := 1cb3af5acb6231759f566ef5beae61fe
 
 # Utilities 
####################################################################
 
diff --git a/xmlwrapp-0.8.1.md5sums b/xmlwrapp-0.8.1.md5sums
new file mode 100644
index 0000000..9c7dedf
--- /dev/null
+++ b/xmlwrapp-0.8.1.md5sums
@@ -0,0 +1,43 @@
+e9f53a414a8b87c19b9aaa967d118b39 *include/xmlwrapp/_cbfo.h
+e5198c69b9160f894144c27f7944f006 *include/xmlwrapp/attributes.h
+bc40fb856cb277690789cd3da0e310c9 *include/xmlwrapp/document.h
+81f2eb808ba0a08dfdf7e504148e48e1 *include/xmlwrapp/errors.h
+472be44813eefa0c2678d756a0ad8553 *include/xmlwrapp/event_parser.h
+10265ab866c1ae2f5dd2294cc07fe814 *include/xmlwrapp/export.h
+aaf6d29222f1bc492971c491e8674094 *include/xmlwrapp/init.h
+4651fca38d08615491e4e27998ffe137 *include/xmlwrapp/node.h
+b9d932ae48098c200885debc66cef77a *include/xmlwrapp/nodes_view.h
+b1c92c9f772f9d15409239c95ffda7fa *include/xmlwrapp/schema.h
+0128a792eedd93e54c4279fbf0be747d *include/xmlwrapp/tree_parser.h
+9bab8e59a2b3e9eb1d5b0b0cd08b8865 *include/xmlwrapp/version.h
+19b42ef23f645d582ac5f2bcd243b1b0 *include/xmlwrapp/xmlwrapp.h
+9345a4883fb176b91565767f16431567 *include/xmlwrapp/xpath.h
+3f5f7ec654e831101f292c38b0d96822 *include/xsltwrapp/init.h
+fc72b50516d1ced56ecc41044a94a743 *include/xsltwrapp/stylesheet.h
+175cb6ca0c4b7c520eeb7db2f81ffe15 *include/xsltwrapp/xsltwrapp.h
+c9d06b9b82de6f8e619c849735ae51d3 *src/libxml/ait_impl.cxx
+aabe59ecc4a15a3f2fc33687f653bafb *src/libxml/ait_impl.h
+ce964eccb3ae135e4cd3cedccb400c19 *src/libxml/attributes.cxx
+08a95a96dae987ff57f7fdb7ff26622a *src/libxml/cpp11.h
+2060b084400ed88832ded6c024b1649d *src/libxml/document.cxx
+4b0e309695a7edf96aef3b8340f30b1d *src/libxml/dtd_impl.cxx
+52a30d8e4839d4862ea5d6beb8e88ce8 *src/libxml/dtd_impl.h
+4c6b35c0fc36ece0394279f3fbecc4fe *src/libxml/errors.cxx
+3b4d2010ef66b0e0095315e154af0230 *src/libxml/errors_impl.h
+e5e1b3adee3f1cf531d73a1ebe21ce25 *src/libxml/event_parser.cxx
+24bb190f12567172052ae57a9d8942cc *src/libxml/init.cxx
+69c988a1751efc1f7dd73cf96586c322 *src/libxml/node.cxx
+ea265506d61407be3941365a50d19cda *src/libxml/node_iterator.cxx
+69bd398ab48c4b287e43cf64e048dbda *src/libxml/node_iterator.h
+5b0ec97061b4b4913a5d5877f4069f7b *src/libxml/node_manip.cxx
+889caa6bab85a23ee264a7b81b5909d4 *src/libxml/node_manip.h
+7d053e87fa8ee74db74d48ba499729a7 *src/libxml/nodes_view.cxx
+d8b81745f1ae877d28bd6c7f2d11f73c *src/libxml/pimpl_base.h
+d7f910f4338ecf6ce5dd87c3c4925d1c *src/libxml/schema.cxx
+281189ffd81c03b45b79590be1e1c926 *src/libxml/tree_parser.cxx
+8f68498087e4b89ea1b32e71adfcdc21 *src/libxml/utility.cxx
+3e1ce5c708657b9c3c74d61a71afb186 *src/libxml/utility.h
+fff84ff7d49ea953c11f158bc0c64fa3 *src/libxml/xpath.cxx
+473b990a598670b0f7f0106548a30252 *src/libxslt/init.cxx
+ebb49a9d004f52bed42e5510ce54bb9b *src/libxslt/result.h
+955a8b16ded31ce18d9854ffb75abf02 *src/libxslt/stylesheet.cxx
diff --git a/xmlwrapp-0.8.1.patch b/xmlwrapp-0.8.1.patch
new file mode 100644
index 0000000..7a6a9ea
--- /dev/null
+++ b/xmlwrapp-0.8.1.patch
@@ -0,0 +1,24 @@
+diff --recursive '--unified=3' original/xmlwrapp-0.8.1/include/xmlwrapp/node.h 
modified/xmlwrapp-0.8.1/include/xmlwrapp/node.h
+--- original/xmlwrapp-0.8.1/include/xmlwrapp/node.h    2016-01-18 
14:21:44.000000000 +0000
++++ modified/xmlwrapp-0.8.1/include/xmlwrapp/node.h    2017-09-30 
21:36:12.271994244 +0000
+@@ -162,7 +162,7 @@
+      */
+     struct text
+     {
+-        explicit text (const char *text) : t(text) {}
++        explicit text (const char *content) : t(content) {}
+         const char *t;
+     };
+ 
+diff --recursive '--unified=3' original/xmlwrapp-0.8.1/src/libxml/node.cxx 
modified/xmlwrapp-0.8.1/src/libxml/node.cxx
+--- original/xmlwrapp-0.8.1/src/libxml/node.cxx        2016-12-11 
14:28:47.000000000 +0000
++++ modified/xmlwrapp-0.8.1/src/libxml/node.cxx        2017-09-30 
21:50:56.765557364 +0000
+@@ -589,7 +589,7 @@
+         {
+             if ( ns->prefix == NULL )
+             {
+-                xmlFree((void*)ns->href);
++                xmlFree((void*)const_cast<xmlChar*>(ns->href));
+                 ns->href = xmlStrdup(xmlHref);
+                 break;
+             }