merge to m53

7 files changed, 363 insertions, 11 deletions

diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 12479a355f00..a200ba06a2c7 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.7 $
+# $Revision: 1.6.4.4 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -48,22 +48,33 @@ all:
 
 .INCLUDE :	../redlandversion.mk
 
-RAPTORVERSION=$(RAPTOR_MAJOR).4.17
+RAPTORVERSION=$(RAPTOR_MAJOR).4.18
 
 TARFILE_NAME=raptor-$(RAPTORVERSION)
-PATCH_FILES=..$/$(TARFILE_NAME).patch
 
 ADDITIONAL_FILES=src/makefile.mk src/raptor_config.h
 
+OOO_PATCH_FILES= \
+    $(TARFILE_NAME).patch.legal \
+    $(TARFILE_NAME).patch.autotools \
+    $(TARFILE_NAME).patch.ooo_build \
+    $(TARFILE_NAME).patch.dmake \
+    $(TARFILE_NAME).patch.win32 \
+
+
+PATCH_FILES=$(OOO_PATCH_FILES)
+
+
 .IF "$(OS)"=="OS2"
 BUILD_ACTION=dmake
 BUILD_DIR=$(CONFIGURE_DIR)$/src
-
 .ELIF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"
+OOO_PATCH_FILES+=$(TARFILE_NAME).patch.mingw
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols  -L$(ILIB:s/;/ -L/)" LIBS=-lmingwthrd OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) XSLTLIB="$(XSLTLIB)"
+# do not enable grddl parser (#i93768#)
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols  -L$(ILIB:s/;/ -L/)" LIBS=-lmingwthrd OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) XSLTLIB="$(XSLTLIB)"
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
@@ -100,7 +111,7 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl
 
 CPPFLAGS+:=$(EXTRA_CFLAGS)
 LDFLAGS+:=$(EXTRA_LINKFLAGS)
-XSLTLIB!:=$(XSLTLIB) # expand variable for (internal) xslt-config
+XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
 
 .EXPORT: CPPFLAGS
 .EXPORT: LDFLAGS
@@ -110,7 +121,8 @@ XSLTLIB!:=$(XSLTLIB) # expand variable for (internal) xslt-config
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml
+# do not enable grddl parser (#i93768#)
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
@@ -122,7 +134,7 @@ BUILD_DIR=$(CONFIGURE_DIR)
 OUT2INC+=src$/raptor.h
 
 .IF "$(OS)"=="MACOSX"
-OUT2LIB+=src$/.libs$/libraptor.1.dylib src$/.libs$/libraptor.dylib
+OUT2LIB+=src$/.libs$/libraptor.$(RAPTOR_MAJOR).dylib src$/.libs$/libraptor.dylib
 OUT2BIN+=src/raptor-config
 .ELIF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"
@@ -132,12 +144,10 @@ OUT2BIN+=src/raptor-config
 .ELSE
 # if we use dmake, this is done automagically
 .ENDIF
-
 .ELIF "$(GUI)"=="OS2"
 # if we use dmake, this is done automagically
-
 .ELSE
-OUT2LIB+=src$/.libs$/libraptor.so.1 src$/.libs$/libraptor.so
+OUT2LIB+=src$/.libs$/libraptor.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so
 OUT2BIN+=src/raptor-config
 .ENDIF
 
diff --git a/redland/raptor/raptor-1.4.18.patch.autotools b/redland/raptor/raptor-1.4.18.patch.autotools
new file mode 100644
index 000000000000..4b43def56511
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.patch.autotools
@@ -0,0 +1,46 @@
+--- misc/raptor-1.4.18/configure	Sun Jun 15 10:25:55 2008
++++ misc/build/raptor-1.4.18/configure	Wed Feb 18 13:23:12 2009
+@@ -4321,7 +4321,7 @@
+ 
+ cygwin*)
+   # func_win32_libid is a shell function defined in ltmain.sh
+-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++  lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
+   lt_cv_file_magic_cmd='func_win32_libid'
+   ;;
+ 
+@@ -4330,7 +4330,7 @@
+   # func_win32_libid shell function, so use a weaker test based on 'objdump',
+   # unless we find 'file', for example because we are cross-compiling.
+   if ( file / ) >/dev/null 2>&1; then
+-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++    lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
+     lt_cv_file_magic_cmd='func_win32_libid'
+   else
+     lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+--- misc/raptor-1.4.18/ltmain.sh	2008-02-02 22:28:24.000000000 +0900
++++ misc/build/raptor-1.4.18/ltmain.sh	2008-07-08 11:58:42.000000000 +0900
+@@ -3262,9 +3262,9 @@
+ 	    revision="$number_revision"
+ 	    ;;
+ 	  freebsd-aout|freebsd-elf|sunos)
+-	    current="$number_major"
+-	    revision="$number_minor"
+-	    age="0"
++	    current=`expr $number_major + $number_minor`
++	    age="$number_minor"
++	    revision="$number_revision"
+ 	    ;;
+ 	  irix|nonstopux)
+ 	    current=`expr $number_major + $number_minor`
+@@ -3344,8 +3344,8 @@
+ 	  ;;
+ 
+ 	freebsd-elf)
+-	  major=".$current"
+-	  versuffix=".$current";
++	  major=.`expr $current - $age`
++	  versuffix="$major.$age.$revision"
+ 	  ;;
+ 
+ 	irix | nonstopux)
diff --git a/redland/raptor/raptor-1.4.18.patch.dmake b/redland/raptor/raptor-1.4.18.patch.dmake
new file mode 100644
index 000000000000..6e8191c216f3
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.patch.dmake
@@ -0,0 +1,127 @@
+--- misc/raptor-1.4.18/src/makefile.mk	Thu Nov  6 15:25:51 2008
++++ misc/build/raptor-1.4.18/src/makefile.mk	Thu Nov  6 15:33:14 2008
+@@ -1,1 +1,123 @@
+-dummy
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# Copyright 2008 by Sun Microsystems, Inc.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile: raptor-1.4.18.patch,v $
++#
++# $Revision: 1.1.2.1 $
++#
++# This file is part of OpenOffice.org.
++#
++# OpenOffice.org is free software: you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License version 3
++# only, as published by the Free Software Foundation.
++#
++# OpenOffice.org is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU Lesser General Public License version 3 for more details
++# (a copy is included in the LICENSE file that accompanied this code).
++#
++# You should have received a copy of the GNU Lesser General Public License
++# version 3 along with OpenOffice.org.  If not, see
++# <http://www.openoffice.org/license.html>
++# for a copy of the LGPLv3 License.
++#
++#*************************************************************************
++
++PRJ=..$/..$/..$/..$/..
++
++PRJNAME=redland
++TARGET=raptor
++LIBTARGET=NO
++UWINAPIDLL=
++
++EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
++
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE :  settings.mk
++
++CDEFS+=-DRAPTOR_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS
++
++# --- Files --------------------------------------------------------
++
++SLOFILES =	\
++   $(SLO)$/n3_lexer.obj \
++   $(SLO)$/n3_parser.obj \
++   $(SLO)$/ntriples_parse.obj \
++   $(SLO)$/parsedate.obj \
++   $(SLO)$/raptor_feature.obj \
++   $(SLO)$/raptor_general.obj \
++   $(SLO)$/raptor_guess.obj \
++   $(SLO)$/raptor_identifier.obj \
++   $(SLO)$/raptor_iostream.obj \
++   $(SLO)$/raptor_libxml.obj \
++   $(SLO)$/raptor_locator.obj \
++   $(SLO)$/raptor_namespace.obj \
++   $(SLO)$/raptor_nfc.obj \
++   $(SLO)$/raptor_nfc_data.obj \
++   $(SLO)$/raptor_parse.obj \
++   $(SLO)$/raptor_qname.obj \
++   $(SLO)$/raptor_rdfxml.obj \
++   $(SLO)$/raptor_rfc2396.obj \
++   $(SLO)$/raptor_rss.obj \
++   $(SLO)$/raptor_rss_common.obj \
++   $(SLO)$/raptor_sax2.obj \
++   $(SLO)$/raptor_sequence.obj \
++   $(SLO)$/raptor_serialize.obj \
++   $(SLO)$/raptor_serialize_ntriples.obj \
++   $(SLO)$/raptor_serialize_rdfxml.obj \
++   $(SLO)$/raptor_serialize_rdfxmla.obj \
++   $(SLO)$/raptor_serialize_simple.obj \
++   $(SLO)$/raptor_set.obj \
++   $(SLO)$/raptor_stringbuffer.obj \
++   $(SLO)$/raptor_uri.obj \
++   $(SLO)$/raptor_utf8.obj \
++   $(SLO)$/raptor_win32.obj \
++   $(SLO)$/raptor_www.obj \
++   $(SLO)$/raptor_www_libxml.obj \
++   $(SLO)$/raptor_xml.obj \
++   $(SLO)$/raptor_xml_writer.obj \
++   $(SLO)$/raptor_xsd.obj \
++   $(SLO)$/raptor_strcasecmp.obj \
++   $(SLO)$/turtle_common.obj \
++   $(SLO)$/turtle_lexer.obj \
++   $(SLO)$/turtle_parser.obj \
++   $(SLO)$/raptor_abbrev.obj \
++   $(SLO)$/raptor_avltree.obj \
++   $(SLO)$/raptor_statement.obj \
++   $(SLO)$/raptor_turtle_writer.obj \
++
++#   $(SLO)$/raptor_grddl.obj \
++#   $(SLO)$/raptor_serialize_rss.obj \
++
++
++SHL1DEPN=   makefile.mk
++SHL1OBJS=   $(SLOFILES)
++SHL1USE_EXPORTS=name
++
++#SHL1TARGET=	$(TARGET)$(DLLPOSTFIX)
++SHL1TARGET=	$(TARGET)
++SHL1IMPLIB= lib$(TARGET)
++
++#SHL1VERSIONMAP=../service/exports.map
++SHL1DEF=$(MISC)$/$(SHL1TARGET).def
++DEF1NAME=$(SHL1TARGET)
++
++SHL1STDLIBS= \
++    $(LIBXML2LIB) \
++    $(XSLTLIB) \
++
++# --- Targets ------------------------------------------------------
++
++.INCLUDE :  target.mk
++
++$(MISC)$/raptor_strcasecmp.c : strcasecmp.c
++	$(COPY) $< $@
++
diff --git a/redland/raptor/raptor-1.4.18.patch.legal b/redland/raptor/raptor-1.4.18.patch.legal
new file mode 100644
index 000000000000..217b7d154812
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.patch.legal
@@ -0,0 +1,18 @@
+--- misc/raptor-1.4.18/LICENSE.txt	Sun Mar 30 06:52:22 2008
++++ misc/build/raptor-1.4.18/LICENSE.txt	Mon Jun 16 15:55:38 2008
+@@ -60,3 +60,15 @@
+ 
+    Copyright (C) 2000-2008 David Beckett
+    Copyright (C) 2000-2005 University of Bristol
++
++
++LGPL Disclaimer
++
++For the avoidance of doubt, except that if any license choice other 
++than GPL or LGPL is available it will apply instead, Sun elects to 
++use only the Lesser General Public License version 2.1 (LGPLv2) at 
++this time for any software where a choice of LGPL license versions 
++is made available with the language indicating that LGPLv2.1 or any 
++later version may be used, or where a choice of which version of the 
++LGPL is applied is otherwise unspecified.
++
diff --git a/redland/raptor/raptor-1.4.18.patch.mingw b/redland/raptor/raptor-1.4.18.patch.mingw
new file mode 100644
index 000000000000..e29a0a07c5a9
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.patch.mingw
@@ -0,0 +1,30 @@
+--- misc/raptor-1.4.18/configure	2008-06-15 17:25:55.000000000 +0900
++++ misc/build/raptor-1.4.18/configure	2009-06-04 21:10:22.447125000 +0900
+@@ -25238,6 +25238,12 @@
+ rdfa_parser=yes
+ 
+ rdf_parsers_available="rdfxml ntriples turtle trig guess rss-tag-soup rdfa"
++case $host_os in
++mingw*)
++  rdfa_parser=no
++  rdf_parsers_available="rdfxml ntriples turtle trig guess rss-tag-soup"
++  ;;
++esac
+ if test "$USE_MAINTAINER_MODE" = yes; then
+   rdf_parsers_available="$rdf_parsers_available n3"
+ fi
+--- misc/raptor-1.4.18/configure.ac	2008-06-15 17:25:20.000000000 +0900
++++ misc/build/raptor-1.4.18/configure.ac	2009-06-04 21:10:31.025250000 +0900
+@@ -758,6 +758,12 @@
+ rdfa_parser=yes
+ 
+ rdf_parsers_available="rdfxml ntriples turtle trig guess rss-tag-soup rdfa"
++case $host_os in
++mingw*)
++  rdfa_parser=no
++  rdf_parsers_available="rdfxml ntriples turtle trig guess rss-tag-soup"
++  ;;
++esac
+ if test "$USE_MAINTAINER_MODE" = yes; then
+   rdf_parsers_available="$rdf_parsers_available n3"
+ fi
diff --git a/redland/raptor/raptor-1.4.18.patch.ooo_build b/redland/raptor/raptor-1.4.18.patch.ooo_build
new file mode 100644
index 000000000000..a16878503ede
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.patch.ooo_build
@@ -0,0 +1,43 @@
+--- misc/raptor-1.4.18/src/raptor-config.in	Sat Jan  6 05:02:00 2007
++++ misc/build/raptor-1.4.18/src/raptor-config.in	Mon Jun 16 15:55:38 2008
+@@ -21,14 +21,23 @@
+ # 
+ #
+ 
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
++prefix=${SOLARVERSION}/${INPATH}
++exec_prefix=${SOLARVERSION}/${INPATH}
++#includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
++#libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
++# HACK: map to build directory
++includedir=../../../../inc
++libdir=../../../../lib
++includes=-I${includedir}
+ 
+-if test "@includedir@" != /usr/include ; then
+-  includes="-I@includedir@"
+-else
+-  includes=
+-fi
++#prefix=@prefix@
++#exec_prefix=@exec_prefix@
++#
++#if test "@includedir@" != /usr/include ; then
++#  includes="-I@includedir@"
++#else
++#  includes=
++#fi
+ 
+ 
+ usage()
+@@ -130,7 +139,8 @@
+   done
+ fi
+ if test "$echo_libs" = "yes"; then
+-  echo -L@libdir@ -lraptor
++#  echo -L@libdir@ -lraptor
++  echo -L${libdir} -lraptor
+ fi
+ if test "$echo_libtool_libs" = "yes"; then
+   echo @libdir@/@RAPTOR_LIBTOOLLIBS@
diff --git a/redland/raptor/raptor-1.4.18.patch.win32 b/redland/raptor/raptor-1.4.18.patch.win32
new file mode 100644
index 000000000000..8de0d25cad5e
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.patch.win32
@@ -0,0 +1,78 @@
+--- misc/raptor-1.4.18/src/win32_raptor_config.h	Wed Apr  2 06:50:14 2008
++++ misc/build/raptor-1.4.18/src/win32_raptor_config.h	Wed Feb 18 13:21:23 2009
+@@ -38,6 +38,8 @@
+ 
+ #define HAVE_STDLIB_H 1
+ 
++#define HAVE_ERRNO_H 1
++
+ #if 0
+ /* For using expat on win32 */
+ #define RAPTOR_XML_EXPAT 1
+@@ -47,8 +49,17 @@
+ /* For using libxml2 on win32 */
+ #define RAPTOR_XML_LIBXML
+ #define HAVE_LIBXML_XMLREADER_H
++#define HAVE_LIBXML_HASH_H 1
++#define HAVE_LIBXML_HTMLPARSER_H 1
++#define HAVE_LIBXML_NANOHTTP_H 1
++#define HAVE_LIBXML_PARSER_H 1
++#define HAVE_LIBXSLT_XSLT_H 1
++
++#define RAPTOR_LIBXML_HTML_PARSE_NONET 1
++#define RAPTOR_LIBXML_XML_PARSE_NONET 1
++
+ /* does libxml struct xmlEntity have a field etype */
+-/*#define RAPTOR_LIBXML_ENTITY_ETYPE*/
++#define RAPTOR_LIBXML_ENTITY_ETYPE
+ 
+ /* does libxml struct xmlEntity have a field name_length */
+ /*#define RAPTOR_LIBXML_ENTITY_NAME_LENGTH*/
+@@ -60,16 +71,17 @@
+ #define HAVE_XMLSAX2INTERNALSUBSET 1
+ 
+ /* does libxml xmlSAXHandler have externalSubset field */
+-/*#define RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET*/
++#define RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET 1
+ 
+ /* does libxml xmlSAXHandler have initialized field */
+-/*#define RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED*/
++#define RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED 1
+ #endif
+ 
+ #define HAVE_STRICMP 1
+ 
+ /* MS names for these functions */
+-#define vsnprintf _vsnprintf
++// next line breaks build on wntmsci12
++//#define vsnprintf _vsnprintf
+ #define snprintf _snprintf
+ #define access _access
+ #define stricmp _stricmp
+@@ -113,19 +125,23 @@
+ #endif
+ 
+ #define RAPTOR_PARSER_GUESS 1
+-#define RAPTOR_PARSER_GRDDL 1
++/* #define RAPTOR_PARSER_GRDDL 1   disabled: (#i93768#) */
++#ifndef __MINGW32__ /* conflicts with normal configure result */
+ #define RAPTOR_PARSER_N3 1
++#endif
+ #define RAPTOR_PARSER_TURTLE 1
+ #define RAPTOR_PARSER_NTRIPLES 1
+ #define RAPTOR_PARSER_RDFXML 1
+ 
++/* does not build on wntmsci12 due to gettimeofday
+ #define RAPTOR_SERIALIZER_ATOM 1
+-#define RAPTOR_SERIALIZER_RSS_1_0 1
++#define RAPTOR_SERIALIZER_RSS_1_0 1 */
+ #define RAPTOR_SERIALIZER_RDFXML 1
+ #define RAPTOR_SERIALIZER_RDFXML_ABBREV 1
+ #define RAPTOR_SERIALIZER_NTRIPLES 1
+ 
+-#define RAPTOR_WWW_LIBCURL 1
++//#define RAPTOR_WWW_LIBCURL 1
++#define RAPTOR_WWW_LIBXML 1
+ 
+ 
+ #include <windows.h>