import clean BK tree at cset 1.3670

4 files changed, 160 insertions, 0 deletions

diff --git a/packages/libeasysoap++/libeasysoap++0/.mtn2git_empty b/packages/libeasysoap++/libeasysoap++0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libeasysoap++/libeasysoap++0/.mtn2git_empty
diff --git a/packages/libeasysoap++/libeasysoap++0/libeasysoap++0-0.6.1-autoreconf-fixes-swb.patch b/packages/libeasysoap++/libeasysoap++0/libeasysoap++0-0.6.1-autoreconf-fixes-swb.patch
index e69de29bb2..272074d014 100644
--- a/packages/libeasysoap++/libeasysoap++0/libeasysoap++0-0.6.1-autoreconf-fixes-swb.patch
+++ b/packages/libeasysoap++/libeasysoap++0/libeasysoap++0-0.6.1-autoreconf-fixes-swb.patch
@@ -0,0 +1,58 @@
+2005-05-07  Steven Brown  <swbrown@ucsd.edu>
+
+	* Makefile.am: Remove $(top_srcdir) from ACLOCAL_AMFLAGS, as it can't
+	be substituted when calling autoreconf and friends.
+
+	* configure.in: Remove unnecessary sinclude lines (this is aclocal's
+	job), and outdated AC_CYGWIN test.
+
+	* src/Makefile.am: Remove duplicate library generation (libtool
+	static+dynamic vs. non-libtool static).
+
+
+diff -ruN EasySoap++-0.6.1-old/Makefile.am EasySoap++-0.6.1/Makefile.am
+--- EasySoap++-0.6.1-old/Makefile.am	Sat May  7 19:55:34 2005
++++ EasySoap++-0.6.1/Makefile.am	Sat May  7 19:55:42 2005
+@@ -1,5 +1,5 @@
+ SUBDIRS = include src proj tests validator simpleserver google
+-ACLOCAL_AMFLAGS = -I $(top_srcdir)/conftools
++ACLOCAL_AMFLAGS = -I conftools
+ EXTRA_DIST = \
+ 	README \
+ 	README.borland \
+diff -ruN EasySoap++-0.6.1-old/configure.in EasySoap++-0.6.1/configure.in
+--- EasySoap++-0.6.1-old/configure.in	Sat May  7 19:55:34 2005
++++ EasySoap++-0.6.1/configure.in	Sat May  7 19:55:57 2005
+@@ -21,15 +21,7 @@
+ AM_INIT_AUTOMAKE(EasySoap++, 0.6.1)
+ AM_CONFIG_HEADER(include/easysoap/es_config.h)
+ 
+-dnl
+-dnl Include other macros we need...
+-sinclude(conftools/ac_cxx_namespaces.m4)
+-sinclude(conftools/ac_cxx_template_keyword_qualifier.m4)
+-sinclude(conftools/ac_cxx_partial_specialization.m4)
+-sinclude(conftools/peti_with_dmalloc.m4)
+-
+ AC_CANONICAL_HOST
+-AC_CYGWIN
+ 
+ dnl Checks for programs.
+ AC_PROG_CXX
+diff -ruN EasySoap++-0.6.1-old/src/Makefile.am EasySoap++-0.6.1/src/Makefile.am
+--- EasySoap++-0.6.1-old/src/Makefile.am	Sat May  7 19:55:34 2005
++++ EasySoap++-0.6.1/src/Makefile.am	Sat May  7 19:56:11 2005
+@@ -1,5 +1,4 @@
+ lib_LTLIBRARIES = libeasysoap.la
+-lib_LIBRARIES = libeasysoap.a
+ THESOURCES = \
+ 	SOAPBase64.cpp \
+ 	SOAPBody.cpp \
+@@ -33,7 +32,6 @@
+ 	XMLParser.cpp 
+ 
+ libeasysoap_la_SOURCES = $(THESOURCES)
+-libeasysoap_a_SOURCES = $(THESOURCES)
+ noinst_HEADERS = \
+ 	SOAPBodyHandler.h \
+ 	SOAPClientSocketImp.h \
diff --git a/packages/libeasysoap++/libeasysoap++0/libeasysoap++0-0.6.1-compile-errors-swb.patch b/packages/libeasysoap++/libeasysoap++0/libeasysoap++0-0.6.1-compile-errors-swb.patch
index e69de29bb2..50638a69d3 100644
--- a/packages/libeasysoap++/libeasysoap++0/libeasysoap++0-0.6.1-compile-errors-swb.patch
+++ b/packages/libeasysoap++/libeasysoap++0/libeasysoap++0-0.6.1-compile-errors-swb.patch
@@ -0,0 +1,60 @@
+2005-05-07  Steven Brown  <swbrown@ucsd.edu>
+
+	* include/easysoap/SOAPSTL.h: Specializations require template<>.
+
+	* tests/interopclient.cpp: gcc 3.4 tries to invoke the private copy
+	constructor on SOAPBase64 and SOAPHex when passed directly through
+	the overload of << to AddParameter.  Not sure why it does this
+	(bug?), but assigning a name to the variables makes it happy.
+
+
+diff -ruN EasySoap++-0.6.1-old/include/easysoap/SOAPSTL.h EasySoap++-0.6.1/include/easysoap/SOAPSTL.h
+--- EasySoap++-0.6.1-old/include/easysoap/SOAPSTL.h	Sat May  7 19:55:34 2005
++++ EasySoap++-0.6.1/include/easysoap/SOAPSTL.h	Sat May  7 20:56:10 2005
+@@ -58,6 +58,7 @@
+ /**
+ *
+ */
++template<>
+ class SOAPTypeTraits<std::string>
+ {
+ public:
+@@ -168,6 +169,7 @@
+ /**
+ *
+ */
++template<>
+ class SOAPTypeTraits< SOAPSTLBase64 > : public SOAPBase64Traits
+ {
+ };
+@@ -200,6 +202,7 @@
+ /**
+ *
+ */
++template<>
+ class SOAPTypeTraits< SOAPSTLHex > : public SOAPHexTraits
+ {
+ };
+diff -ruN EasySoap++-0.6.1-old/tests/interopclient.cpp EasySoap++-0.6.1/tests/interopclient.cpp
+--- EasySoap++-0.6.1-old/tests/interopclient.cpp	Sat May  7 19:55:34 2005
++++ EasySoap++-0.6.1/tests/interopclient.cpp	Sat May  7 20:55:52 2005
+@@ -990,7 +990,8 @@
+ 
+ 	SOAPMethod method;
+ 	SetupMethod(method, "echoBase64", e);
+-	method.AddParameter("inputBase64") << SOAPBase64(inputBinary);
++	SOAPBase64 inputBase64(inputBinary);
++	method.AddParameter("inputBase64") << inputBase64;
+ 	const SOAPResponse& response = proxy.Execute(method);
+ 
+ 	SOAPBase64 base64(outputBinary);
+@@ -1217,7 +1218,8 @@
+ 
+ 	SOAPMethod method;
+ 	SetupMethod(method, "echoHexBinary", e);
+-	method.AddParameter("inputHexBinary") << SOAPHex(inputBinary);
++	SOAPHex inputHex(inputBinary);
++	method.AddParameter("inputHexBinary") << inputHex;
+ 	const SOAPResponse& response = proxy.Execute(method);
+ 
+ 	SOAPHex hex(outputBinary);
diff --git a/packages/libeasysoap++/libeasysoap++0/libeasysoap++0-0.6.1-template-keyword-qualifier-swb.patch b/packages/libeasysoap++/libeasysoap++0/libeasysoap++0-0.6.1-template-keyword-qualifier-swb.patch
index e69de29bb2..75d9165229 100644
--- a/packages/libeasysoap++/libeasysoap++0/libeasysoap++0-0.6.1-template-keyword-qualifier-swb.patch
+++ b/packages/libeasysoap++/libeasysoap++0/libeasysoap++0-0.6.1-template-keyword-qualifier-swb.patch
@@ -0,0 +1,42 @@
+2005-05-07  Steven Brown  <swbrown@ucsd.edu>
+
+	* conftools/ac_cxx_template_keyword_qualifier.m4: Upgrade to
+	2004/02/15 version, as the older version fails with gcc 3.4.
+
+
+diff -ruN EasySoap++-0.6.1-old/conftools/ac_cxx_template_keyword_qualifier.m4 EasySoap++-0.6.1/conftools/ac_cxx_template_keyword_qualifier.m4
+--- EasySoap++-0.6.1-old/conftools/ac_cxx_template_keyword_qualifier.m4	Sat May  7 19:55:34 2005
++++ EasySoap++-0.6.1/conftools/ac_cxx_template_keyword_qualifier.m4	Fri Jan 21 21:36:37 2005
+@@ -3,8 +3,8 @@
+ dnl If the compiler supports use of the template keyword as a qualifier,
+ dnl define HAVE_TEMPLATE_KEYWORD_QUALIFIER.
+ dnl
+-dnl @version $Id: ac_cxx_template_keyword_qualifier.m4,v 1.1 2001/11/12 07:48:22 dcrowley Exp $
+-dnl @author Luc Maisonobe
++dnl @version $Id: ac_cxx_template_keyword_qualifier.m4,v 1.2 2004/02/15 10:04:12 guidod Exp $
++dnl @author Todd Veldhuizen, Bernardo Innocenti, and Luc Maisonobe <luc@spaceroots.org>
+ dnl
+ AC_DEFUN([AC_CXX_TEMPLATE_KEYWORD_QUALIFIER],
+ [AC_CACHE_CHECK(whether the compiler supports use of the template keyword as a qualifier,
+@@ -12,9 +12,18 @@
+ [AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
+  AC_TRY_COMPILE([
+-class A { public : A() {}; template<class T> static T convert() { return T(); }
+-};
+-],[double z = A::template convert<double>(); return 0;],
++  class X
++  {
++    public:
++    template<int> void member() {}
++    template<int> static void static_member() {}
++  };
++  template<class T> void f(T* p)
++  {
++    p->template member<200>(); // OK: < starts template argument
++    T::template static_member<100>(); // OK: < starts explicit qualification
++  }
++],[X x; f(&x); return 0;],
+  ac_cv_cxx_template_keyword_qualifier=yes, ac_cv_cxx_template_keyword_qualifier=no)
+  AC_LANG_RESTORE
+ ])