[lmi] using xmlwrapp 0.5.1

[Vaclav Slavik]

Hi,

xmlwrapp 0.5.1 is now available from here:
https://sourceforge.net/project/showfiles.php?group_id=142403

All LMI-specific patches are included in it (plus some additional fixes,
e.g. FreeBSD or gcc-4.2 compilation fixes) and so the
xmlwrapp-0.5.0.patch is no longer necessary. 

Below is a patch that updates MSW makefiles to use it (notice removal of
2 files).

Regards,
Vaclav

Index: install_miscellanea.make
===================================================================
RCS file: /sources/lmi/lmi/install_miscellanea.make,v
retrieving revision 1.14
diff -u -u -r1.14 install_miscellanea.make
--- install_miscellanea.make    11 Sep 2008 18:09:16 -0000      1.14
+++ install_miscellanea.make    16 Nov 2008 22:32:34 -0000
@@ -53,7 +53,7 @@
 fop_archive      := fop-0.20.5-bin.tar.gz
 md5sum_msw_exe   := md5sum.exe
 sample_archive   := lmi-data-20050618T1440Z.tar.bz2
-xmlwrapp_archive := xmlwrapp-0.5.0.tar.gz
+xmlwrapp_archive := xmlwrapp-0.5.1.tar.gz
 
 file_list := \
   $(boost_archive) \
@@ -75,14 +75,14 @@
 $(fop_archive)-url      := 
http://archive.apache.org/dist/xmlgraphics/fop/binaries/$(fop_archive)
 $(md5sum_msw_exe)-url   := 
http://downloads.activestate.com/contrib/md5sum/Windows/md5sum.exe#!md5!eb574b236133e60c989c6f472f07827b
 $(sample_archive)-url   := 
http://download.savannah.gnu.org/releases/lmi/$(sample_archive)
-$(xmlwrapp_archive)-url := 
ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/$(xmlwrapp_archive)
+$(xmlwrapp_archive)-url := $(sf_mirror)/xmlwrapp/$(xmlwrapp_archive)
 
 $(boost_archive)-md5    := 2b999b2fb7798e1737d1fff8fac602ef
 $(cgicc_archive)-md5    := 6cb5153fc9fa64b4e50c7962aa557bbe
 $(fop_archive)-md5      := d6b43e3eddf9378536ad8127bc057d41
 $(md5sum_msw_exe)-md5   := eb574b236133e60c989c6f472f07827b
 $(sample_archive)-md5   := e7f07133abfc3b9c2252dfa3b61191bc
-$(xmlwrapp_archive)-md5 := b8a07e77f8f8af9ca96bccab7d9dd310
+$(xmlwrapp_archive)-md5 := f687b5ba97e2548d4dc0acb9cd21fd74
 
 # Utilities 
####################################################################
 
@@ -218,7 +218,6 @@
 
 .PHONY: xmlwrapp
 xmlwrapp: $(file_list)
-       $(PATCH) --directory=scratch --strip=1 < $(stem).patch
        @$(MKDIR) $(third_party_include_dir)/xmlwrapp/
        $(MV) scratch/$(stem)/include/xmlwrapp/*.h 
$(third_party_include_dir)/xmlwrapp/
        @$(MKDIR) $(third_party_include_dir)/xsltwrapp/
Index: xmlwrapp-0.5.0.md5sums
===================================================================
RCS file: xmlwrapp-0.5.0.md5sums
diff -N xmlwrapp-0.5.0.md5sums
--- xmlwrapp-0.5.0.md5sums      4 Nov 2007 17:50:21 -0000       1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-d41d8cd98f00b204e9800998ecf8427e *src/xmlwrapp_config.h
-08e1df2afd052897bd69eaa9eb62f972 *include/xmlwrapp/_cbfo.h
-28db003c72888af44eee85cf8ddc860a *include/xmlwrapp/attributes.h
-9a86dd2a2f7d37c7d893f2a42ce847fc *include/xmlwrapp/document.h
-6a4174f9683b6b26be87982444576f9b *include/xmlwrapp/event_parser.h
-b72417e95626ffc9af751b59a32662a8 *include/xmlwrapp/init.h
-03233955cf15ebe6199892c4d99eeb03 *include/xmlwrapp/node.h
-adaa19a7b9b647b8d8aa7ca33c83600d *include/xmlwrapp/tree_parser.h
-b7e3835e74d6c78dea55a398a9e5e40f *include/xmlwrapp/xmlwrapp.h
-22eb6088977177eb37dc626d8ca6a1e5 *include/xsltwrapp/init.h
-b6b9f377e2dd2141df2d1eea007d78ed *include/xsltwrapp/stylesheet.h
-8571128f21970a8e94c945efa27bcc04 *include/xsltwrapp/xsltwrapp.h
-981755ff5983f35cea9886b7700d32af *src/libxml/ait_impl.cxx
-33a721d1d6f5a02289548dc11006d06e *src/libxml/ait_impl.h
-e349e029a89627d1355dfb981d1b2103 *src/libxml/attributes.cxx
-d069e463f46de80c61d673174800ca2a *src/libxml/document.cxx
-117aa6137819ccf77412964c4a3cd9ba *src/libxml/dtd_impl.cxx
-d4f60f4568df4027f6037ca06401fe59 *src/libxml/dtd_impl.h
-3cc5d9eddbeae93c9daa6da6aa0a16d2 *src/libxml/event_parser.cxx
-61d9b3111c9501bd81463262d8894104 *src/libxml/init.cxx
-94061014bbc6c4ec64c8c7cd2ca8351b *src/libxml/node.cxx
-aa24242c45f70789b46da0bf401b18c9 *src/libxml/node_iterator.cxx
-a390b29868a12fb81842295d679c3f85 *src/libxml/node_iterator.h
-60429f9bbd9c9877c901afa28ebe4f52 *src/libxml/node_manip.cxx
-939adc970aa2a90bc813e041d6b84d76 *src/libxml/node_manip.h
-e3c817121fe5b2eb80091f5c57305498 *src/libxml/tree_parser.cxx
-097e87adb21149785764d3600bd928e7 *src/libxml/utility.cxx
-4671f725ca464a48d4ea9aa874c6a7a2 *src/libxml/utility.h
-b9d240b53637303801a584371f27ec0f *src/libxslt/init.cxx
-e754f345a17e392d0535a19a96784bbd *src/libxslt/stylesheet.cxx
Index: xmlwrapp-0.5.0.patch
===================================================================
RCS file: xmlwrapp-0.5.0.patch
diff -N xmlwrapp-0.5.0.patch
--- xmlwrapp-0.5.0.patch        2 Nov 2007 22:46:27 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-diff --recursive --unified=3 
original/xmlwrapp-0.5.0/include/xmlwrapp/event_parser.h 
modified/xmlwrapp-0.5.0/include/xmlwrapp/event_parser.h
---- original/xmlwrapp-0.5.0/include/xmlwrapp/event_parser.h    2003-08-04 
04:57:15.000000000 +0000
-+++ modified/xmlwrapp-0.5.0/include/xmlwrapp/event_parser.h    2006-12-09 
23:21:28.000000000 +0000
-@@ -38,6 +38,7 @@
- #define _xmlwrapp_event_parser_h_
- 
- // standard includes
-+#include <cstddef>
- #include <string>
- #include <iosfwd>
- #include <map>
-diff --recursive --unified=3 original/xmlwrapp-0.5.0/src/libxml/node.cxx 
modified/xmlwrapp-0.5.0/src/libxml/node.cxx
---- original/xmlwrapp-0.5.0/src/libxml/node.cxx        2003-11-18 
23:08:59.000000000 +0000
-+++ modified/xmlwrapp-0.5.0/src/libxml/node.cxx        2006-12-09 
23:18:06.000000000 +0000
-@@ -42,6 +42,7 @@
- #include "node_manip.h"
- 
- // standard includes
-+#include <cstring>
- #include <new>
- #include <memory>
- #include <string>
-diff --recursive --unified=3 original/xmlwrapp-0.5.0/src/libxml/utility.cxx 
modified/xmlwrapp-0.5.0/src/libxml/utility.cxx
---- original/xmlwrapp-0.5.0/src/libxml/utility.cxx     2003-08-04 
04:57:20.000000000 +0000
-+++ modified/xmlwrapp-0.5.0/src/libxml/utility.cxx     2006-12-09 
23:16:04.000000000 +0000
-@@ -37,7 +37,7 @@
- #include <string>
- 
- // hack to pull in vsnprintf for MSVC6
--#if defined(_MSC_VER) && _MSC_VER <= 1200
-+#if (defined(_MSC_VER) && _MSC_VER <= 1200) || (defined __COMO__ && defined 
__WIN32__)
- #  undef vsnprintf
- #  define vsnprintf _vsnprintf
- #endif
Index: xmlwrapp-0.5.1.md5sums
===================================================================
RCS file: xmlwrapp-0.5.1.md5sums
diff -N xmlwrapp-0.5.1.md5sums
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ xmlwrapp-0.5.1.md5sums      16 Nov 2008 22:32:34 -0000
@@ -0,0 +1,30 @@
+d41d8cd98f00b204e9800998ecf8427e *src/xmlwrapp_config.h
+08e1df2afd052897bd69eaa9eb62f972 *include/xmlwrapp/_cbfo.h
+28db003c72888af44eee85cf8ddc860a *include/xmlwrapp/attributes.h
+9a86dd2a2f7d37c7d893f2a42ce847fc *include/xmlwrapp/document.h
+6a4174f9683b6b26be87982444576f9b *include/xmlwrapp/event_parser.h
+b72417e95626ffc9af751b59a32662a8 *include/xmlwrapp/init.h
+03233955cf15ebe6199892c4d99eeb03 *include/xmlwrapp/node.h
+adaa19a7b9b647b8d8aa7ca33c83600d *include/xmlwrapp/tree_parser.h
+b7e3835e74d6c78dea55a398a9e5e40f *include/xmlwrapp/xmlwrapp.h
+22eb6088977177eb37dc626d8ca6a1e5 *include/xsltwrapp/init.h
+b6b9f377e2dd2141df2d1eea007d78ed *include/xsltwrapp/stylesheet.h
+8571128f21970a8e94c945efa27bcc04 *include/xsltwrapp/xsltwrapp.h
+981755ff5983f35cea9886b7700d32af *src/libxml/ait_impl.cxx
+33a721d1d6f5a02289548dc11006d06e *src/libxml/ait_impl.h
+e349e029a89627d1355dfb981d1b2103 *src/libxml/attributes.cxx
+d069e463f46de80c61d673174800ca2a *src/libxml/document.cxx
+117aa6137819ccf77412964c4a3cd9ba *src/libxml/dtd_impl.cxx
+d4f60f4568df4027f6037ca06401fe59 *src/libxml/dtd_impl.h
+3cc5d9eddbeae93c9daa6da6aa0a16d2 *src/libxml/event_parser.cxx
+61d9b3111c9501bd81463262d8894104 *src/libxml/init.cxx
+777b13bca25c91b4b86bb19d218f1f4b *src/libxml/node.cxx
+aa24242c45f70789b46da0bf401b18c9 *src/libxml/node_iterator.cxx
+a390b29868a12fb81842295d679c3f85 *src/libxml/node_iterator.h
+60429f9bbd9c9877c901afa28ebe4f52 *src/libxml/node_manip.cxx
+939adc970aa2a90bc813e041d6b84d76 *src/libxml/node_manip.h
+e3c817121fe5b2eb80091f5c57305498 *src/libxml/tree_parser.cxx
+fee4c5ced6a58884a1aaa46477f7cc18 *src/libxml/utility.cxx
+8f71c42bdb77eb92dbbbe345eb3ffbae *src/libxml/utility.h
+b9d240b53637303801a584371f27ec0f *src/libxslt/init.cxx
+e754f345a17e392d0535a19a96784bbd *src/libxslt/stylesheet.cxx