CWS-TOOLING: integrate CWS sb113

2009-09-01 sb #i76393# second attempt at properly #ifdef-ing previous HG commit d598efdbf012
2009-08-28 sb #i102469# change back <T extends XInterface> to just <T> on queryInterface, to avoid binary incompatibility (method changing its signature from (Ljava/lang/Class;Ljava/lang/Object;)Ljava/lang/Object; to (Ljava/lang/Class;Ljava/lang/Object;)Lcom/sun/star/uno/XInterface;)
2009-08-28 sb #i76393# properly #ifdef previous HG commit d598efdbf012
2009-08-27 sb #i94421# work around compiler error (based on a patch supplied by cloph)
2009-08-26 sb merged in DEV300_m56
2009-08-26 sb #i76393# on Linux, include dynamic section offset in crash report so as to be able to map "prelinked" callstacks back to original (patch by cmc)
2009-08-26 sb #i88162# remove unnecessary whitespace lines from per-locale xcu files (patch by tora)
2009-08-17 Juergen Schmidt #i104292# set context classloader after create new custom UNO loader
2009-08-17 Juergen Schmidt #i103749# integrate patch
2009-08-14 sb #i103269# cherry-picked ssh://hg@hg.services.openoffice.org/cws/sb111 -r 5124ebd5edd1 ("#i101955# changed encoding of XML file content from erroneous ISO-8859-1 to UTF-8")
2009-08-12 sb #i102469# fixed mis-applications of UnoRuntime.queryInterface (detected via the simplified UnoRuntime.queryInterface, the HG changeset 29de35fc9554) to use AnyConverter instead; changed qadevOOo's lib.MultiMethodTest.before to allow throwing arbitrary exceptions, to cater for IllegalArgumentException thrown by AnyConverter
2009-08-12 sb #i104178# drop extra libxml2-config script from libxmlsec
2009-08-10 sb #i101754# simplified osl_getProcessInfo for LINUX (patch by cmc)
2009-08-10 sb #i95018# avoid closing -1 fds (patch supplied by cmc)
2009-08-10 sb #i103585# removed (apparently unnecessary) zlib support from libxml2; in turn, removed zlib dependencies from libxmlsec, libxslt, and redland (assuming those were transitive dependencies brought in by direct dependencies on libxml2)
2009-08-10 sb #i102469# simplified UnoRuntime.queryInterface using Java 5 generics; adapted URE-related modules accordingly
2009-08-10 sb #i101213# adapted setsolar env (solenv/config/) to set PYTHONPATH (and not set PYTHONHOME) in accordance with configure env (set_soenv.in); fixed testtools/source/bridgetest/pyuno (which now should work everywhere out of the box, thanks to the fixed setsolar PYTHONPATH)
2009-08-10 sb cherry-picked ssh://hg@hg.services.openoffice.org/cws/sb111 -r ea8de6d9396b ("#i101955# work in progress for a .hgignore file, continued")

2 files changed, 2 insertions, 72 deletions

diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 817dc6d84658..7632fc179414 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -87,7 +87,7 @@ xmlsec_LIBS+=-lstdc++_s
 .ENDIF
 CONFIGURE_DIR=
 CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure
-CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --with-mscrypto --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" CFLAGS="-D_MT" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump"
+CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --with-mscrypto --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" CFLAGS="-D_MT" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) OBJDUMP="$(WRAPCMD) objdump"
 .IF "$(SYSTEM_MOZILLA)" != "YES"
 CONFIGURE_FLAGS+=--enable-pkgconfig=no
 .ENDIF
@@ -139,7 +139,7 @@ LDFLAGS:=$(xmlsec_LDFLAGS)
 .ENDIF
 CONFIGURE_DIR=
 CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)"
-CONFIGURE_FLAGS=--with-pic --disable-shared --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)" ZLIB3RDLIB=$(ZLIB3RDLIB)
+CONFIGURE_FLAGS=--with-pic --disable-shared --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)"
 # system-mozilla needs pkgconfig to get the information about nss
 # FIXME: This also will enable pkg-config usage for libxml2. It *seems*
 # that the internal headers still are used when they are there but....
diff --git a/libxmlsec/xmlsec1-1.2.6.patch b/libxmlsec/xmlsec1-1.2.6.patch
index eb5153d99a18..dc720e144c06 100644
--- a/libxmlsec/xmlsec1-1.2.6.patch
+++ b/libxmlsec/xmlsec1-1.2.6.patch
@@ -213,15 +213,6 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -24598,7 +24599,7 @@
- fi
- 
- LIBXML_MIN_VERSION="2.4.2"
--LIBXML_CONFIG="xml2-config"
-+LIBXML_CONFIG="./libxml2-config"
- LIBXML_CFLAGS=""
- LIBXML_LIBS=""
- LIBXML_FOUND="no"
 @@ -25678,12 +25679,26 @@
  
  XMLSEC_NO_NSS="1"
@@ -2388,15 +2379,6 @@
  s,@XMLSEC_NO_SHA1@,$XMLSEC_NO_SHA1,;t t
 --- misc/xmlsec1-1.2.6/configure.in	2004-08-26 04:49:24.000000000 +0200
 +++ misc/build/xmlsec1-1.2.6/configure.in	2008-06-29 23:44:19.000000000 +0200
-@@ -143,7 +143,7 @@
- dnl find libxml
- dnl ==========================================================================
- LIBXML_MIN_VERSION="2.4.2"
--LIBXML_CONFIG="xml2-config"
-+LIBXML_CONFIG="./libxml2-config"
- LIBXML_CFLAGS=""
- LIBXML_LIBS=""
- LIBXML_FOUND="no"
 @@ -503,12 +503,26 @@
      
  XMLSEC_NO_NSS="1"
@@ -3076,58 +3058,6 @@
 +
 +#endif	/* __XMLSEC_NSS_TOKENS_H__ */
 +
---- misc/xmlsec1-1.2.6/libxml2-config	2008-06-29 23:44:40.000000000 +0200
-+++ misc/build/xmlsec1-1.2.6/libxml2-config	2008-06-29 23:44:19.000000000 +0200
-@@ -1 +1,48 @@
--dummy
-+#! /bin/sh
-+
-+if test "$SYSTEM_LIBXML" = "YES"
-+then xml2-config "$@"; exit 0
-+fi
-+
-+prefix=${SOLARVERSION}/${INPATH}
-+includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
-+libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
-+
-+while test $# -gt 0; do
-+    case "$1" in
-+    -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-+    *) optarg= ;;
-+    esac
-+
-+    case "$1" in
-+    --prefix=*)
-+	prefix=$optarg
-+	includedir=$prefix/include
-+	libdir=$prefix/lib
-+	;;
-+
-+    --prefix)
-+	echo $prefix
-+	;;
-+
-+    --version)
-+	echo 2.5.4
-+	exit 0
-+	;;
-+
-+    --cflags)
-+       	echo -I${includedir} 
-+       	;;
-+
-+    --libs)
-+       	echo -L${libdir} ${LIBXML2LIB} ${ZLIB3RDLIB}   -lm  
-+       	;;
-+
-+    *)
-+	exit 1
-+	;;
-+    esac
-+    shift
-+done
-+
-+exit 0
 --- misc/xmlsec1-1.2.6/ltmain.sh	2004-08-26 08:00:15.000000000 +0200
 +++ misc/build/xmlsec1-1.2.6/ltmain.sh	2008-06-29 23:44:19.000000000 +0200
 @@ -1661,6 +1661,11 @@