From 8a519289b742ec7557fbe18c12a5145a6e548234 Mon Sep 17 00:00:00 2001 From: mst Date: Mon, 16 Jun 2008 10:38:21 +0000 Subject: redland: initial import --- redland/LICENSE.txt | 11 + redland/README | 21 ++ redland/prj/build.lst | 5 + redland/prj/d.lst | 6 + redland/raptor-1.4.17.patch | 82 +++++++ redland/raptor/makefile.mk | 135 +++++++++++ redland/rasqal-0.9.15.patch | 80 ++++++ redland/rasqal/makefile.mk | 135 +++++++++++ redland/redland-1.0.7.patch | 574 ++++++++++++++++++++++++++++++++++++++++++++ redland/redland/makefile.mk | 132 ++++++++++ 10 files changed, 1181 insertions(+) create mode 100644 redland/LICENSE.txt create mode 100644 redland/README create mode 100644 redland/prj/build.lst create mode 100644 redland/prj/d.lst create mode 100644 redland/raptor-1.4.17.patch create mode 100644 redland/raptor/makefile.mk create mode 100644 redland/rasqal-0.9.15.patch create mode 100644 redland/rasqal/makefile.mk create mode 100644 redland/redland-1.0.7.patch create mode 100644 redland/redland/makefile.mk (limited to 'redland') diff --git a/redland/LICENSE.txt b/redland/LICENSE.txt new file mode 100644 index 000000000000..a3a5fa8901e5 --- /dev/null +++ b/redland/LICENSE.txt @@ -0,0 +1,11 @@ + +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/README b/redland/README new file mode 100644 index 000000000000..57397ccc10d7 --- /dev/null +++ b/redland/README @@ -0,0 +1,21 @@ +Redland RDF library (librdf) + +Module: external/redland + +Upstream URL: http://librdf.org/ + +License: Triple-licensed: LGPL v2+/GPL v2+/Apache v2 + Note that Sun distributes this software only under LGPL v2 + (see LICENSE.txt) + +Description: +This module contains the third-party Redland RDF / librdf library, which +is needed to support data in RDF (Resource Description Framework) format. +It consists of 3 parts: +- raptor: parsers and serializers for numerous RDF file formats +- rasqal: query engine which supports SPARQL queries +- redland: librdf integrates raptor and rasqal, and provides numerous storage + engines for storing RDF graphs (in memory, SQL, ...) + +Libraries: libraptor, librasqal, librdf + diff --git a/redland/prj/build.lst b/redland/prj/build.lst new file mode 100644 index 000000000000..29716493d584 --- /dev/null +++ b/redland/prj/build.lst @@ -0,0 +1,5 @@ +rl redland : soltools ZLIB:zlib LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL +rl redland usr1 - all rl_mkout NULL +rl redland\raptor nmake - all rl_raptor NULL +rl redland\rasqal nmake - all rl_rasqal rl_raptor NULL +rl redland\redland nmake - all rl_redland rl_raptor rl_rasqal NULL diff --git a/redland/prj/d.lst b/redland/prj/d.lst new file mode 100644 index 000000000000..622e83e038f5 --- /dev/null +++ b/redland/prj/d.lst @@ -0,0 +1,6 @@ +..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\*.h +..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT% +..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT% +..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT% diff --git a/redland/raptor-1.4.17.patch b/redland/raptor-1.4.17.patch new file mode 100644 index 000000000000..bdefaa0835be --- /dev/null +++ b/redland/raptor-1.4.17.patch @@ -0,0 +1,82 @@ +diff -cr misc/raptor-1.4.17/LICENSE.txt misc/build/raptor-1.4.17/LICENSE.txt +*** misc/raptor-1.4.17/LICENSE.txt Sun Mar 30 06:52:22 2008 +--- misc/build/raptor-1.4.17/LICENSE.txt Fri Jun 6 18:38:51 2008 +*************** +*** 60,62 **** +--- 60,74 ---- + + 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 -cr misc/raptor-1.4.17/src/raptor-config.in misc/build/raptor-1.4.17/src/raptor-config.in +*** misc/raptor-1.4.17/src/raptor-config.in 2007-01-06 05:02:00.000000000 +0100 +--- misc/build/raptor-1.4.17/src/raptor-config.in 2008-04-07 16:55:00.542937115 +0200 +*************** +*** 21,34 **** + # + # + +! prefix=@prefix@ +! exec_prefix=@exec_prefix@ + +! if test "@includedir@" != /usr/include ; then +! includes="-I@includedir@" +! else +! includes= +! fi + + + usage() +--- 21,43 ---- + # + # + +! 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} + +! #prefix=@prefix@ +! #exec_prefix=@exec_prefix@ +! # +! #if test "@includedir@" != /usr/include ; then +! # includes="-I@includedir@" +! #else +! # includes= +! #fi + + + usage() +*************** +*** 130,136 **** + done + fi + if test "$echo_libs" = "yes"; then +! echo -L@libdir@ -lraptor + fi + if test "$echo_libtool_libs" = "yes"; then + echo @libdir@/@RAPTOR_LIBTOOLLIBS@ +--- 139,146 ---- + done + fi + if test "$echo_libs" = "yes"; then +! # 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/makefile.mk b/redland/raptor/makefile.mk new file mode 100644 index 000000000000..84b7b225ff67 --- /dev/null +++ b/redland/raptor/makefile.mk @@ -0,0 +1,135 @@ +#************************************************************************* +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile: makefile.mk,v $ +# +# $Revision: 1.1 $ +# +# last change: $Author: mst $ $Date: 2008-06-16 11:38:21 $ +# +# The Contents of this file are made available subject to +# the terms of GNU Lesser General Public License Version 2.1. +# +# +# GNU Lesser General Public License Version 2.1 +# ============================================= +# Copyright 2005 by Sun Microsystems, Inc. +# 901 San Antonio Road, Palo Alto, CA 94303, USA +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License version 2.1, as published by the Free Software Foundation. +# +# This library 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 for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# +#************************************************************************* + +PRJ=.. + +PRJNAME=raptor +TARGET=so_raptor + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +.IF "$(SYSTEM_REDLAND)" == "YES" +all: + @echo "An already available installation of Redland RDF should exist on your system." + @echo "Therefore the version provided here does not need to be built in addition." +.ENDIF + +# --- Files -------------------------------------------------------- + +RAPTORVERSION=1.4.17 + +TARFILE_NAME=$(PRJNAME)-$(RAPTORVERSION) +PATCH_FILE_NAME=$(TARFILE_NAME).patch + + +.IF "$(OS)"=="WNT" +.IF "$(COM)"=="GCC" +#CONFIGURE_DIR= +#CONFIGURE_ACTION=.$/configure +#CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CFLAGS=-D_MT LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc -L$(ILIB:s/;/ -L/)" LIBS="-lws2_32 -lmingwthrd" OBJDUMP="$(WRAPCMD) objdump" +#BUILD_ACTION=$(GNUMAKE) +#BUILD_DIR=$(CONFIGURE_DIR) +all: + @echo "FIXME: somebody port me to mingw please..." + exit 1 +.ELSE +# there is no wntmsci build environment in the tarball; we use custom dmakefile +BUILD_ACTION=dmake +BUILD_DIR=$(CONFIGURE_DIR)$/src +.ENDIF +.ELSE # "WNT" + +.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack +.ENDIF # "$(OS)$(COM)"=="LINUXGCC" +.IF "$(OS)$(COM)"=="SOLARISC52" +LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' +.ENDIF # "$(OS)$(COM)"=="SOLARISC52" + +.IF "$(SYSBASE)"!="" +CPPFLAGS+=-I$(SOLARINCDIR)$/external -I$(SYSBASE)$/usr$/include +.IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX" +# NB: SOLARLIBDIR is first, because linux SYSBASE contains obsolete libcrypto +LDFLAGS+:=-L$(SOLARLIBDIR) -L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl +.ENDIF +.ENDIF # "$(SYSBASE)"!="" + +CPPFLAGS+:=$(EXTRA_CFLAGS) +LDFLAGS+:=$(EXTRA_LINKFLAGS) +XSLTLIB:=$(XSLTLIB) + +.EXPORT: CPPFLAGS +.EXPORT: LDFLAGS +.EXPORT: LIBXML2LIB +.EXPORT: ZLIB3RDLIB +.EXPORT: XSLTLIB + +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 +BUILD_ACTION=$(GNUMAKE) +BUILD_FLAGS+= -j$(EXTMAXPROCESS) +BUILD_DIR=$(CONFIGURE_DIR) +#INSTALL_ACTION=$(GNUMAKE) install +#INSTALL_FLAGS+=DESTDIR=$(PWD)$/$(P_INSTALL_TARGET_DIR) +.ENDIF + + +OUT2INC+=src$/raptor.h + +.IF "$(OS)"=="MACOSX" +OUT2LIB+=src$/.libs$/libraptor*.dylib +OUT2BIN+=src/raptor-config +.ELIF "$(OS)"=="WNT" +.IF "$(COM)"=="GCC" +OUT2LIB+=src$/.libs$/*.a +OUT2BIN+=src$/.libs$/*.dll +OUT2BIN+=src/raptor-config +.ELSE +# if we use dmake, this is done automagically +.ENDIF +.ELSE +OUT2LIB+=src$/.libs$/libraptor*.so* +OUT2BIN+=src/raptor-config +.ENDIF + +# --- Targets ------------------------------------------------------ + +.INCLUDE : set_ext.mk +.INCLUDE : target.mk +.INCLUDE : tg_ext.mk + diff --git a/redland/rasqal-0.9.15.patch b/redland/rasqal-0.9.15.patch new file mode 100644 index 000000000000..03ee6dda062c --- /dev/null +++ b/redland/rasqal-0.9.15.patch @@ -0,0 +1,80 @@ +diff -cr misc/rasqal-0.9.15/LICENSE.txt misc/build/rasqal-0.9.15/LICENSE.txt +*** misc/rasqal-0.9.15/LICENSE.txt Sun Apr 22 23:09:08 2007 +--- misc/build/rasqal-0.9.15/LICENSE.txt Fri Jun 6 18:39:51 2008 +*************** +*** 61,63 **** +--- 61,75 ---- + + Copyright (C) 2003-2007 Dave Beckett + Copyright (C) 2003-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 -cr misc/rasqal-0.9.15/src/rasqal-config.in misc/build/rasqal-0.9.15/src/rasqal-config.in +*** misc/rasqal-0.9.15/src/rasqal-config.in 2007-04-22 22:58:51.000000000 +0200 +--- misc/build/rasqal-0.9.15/src/rasqal-config.in 2008-04-07 17:18:52.033946868 +0200 +*************** +*** 22,34 **** + # + # + +! prefix=@prefix@ + +! if test "@includedir@" != /usr/include ; then +! includes="-I@includedir@" +! else +! includes= +! fi + + + usage() +--- 22,43 ---- + # + # + +! 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} + +! #prefix=@prefix@ +! # +! #if test "@includedir@" != /usr/include ; then +! # includes="-I@includedir@" +! #else +! # includes= +! #fi + + + usage() +*************** +*** 109,115 **** + echo $includes + fi + if test "$echo_libs" = "yes"; then +! echo -L@libdir@ -lrasqal + fi + if test "$echo_libtool_libs" = "yes"; then + echo @libdir@/@RASQAL_LIBTOOLLIBS@ +--- 118,125 ---- + echo $includes + fi + if test "$echo_libs" = "yes"; then +! # echo -L@libdir@ -lrasqal +! echo -L${libdir} -lrasqal + fi + if test "$echo_libtool_libs" = "yes"; then + echo @libdir@/@RASQAL_LIBTOOLLIBS@ diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk new file mode 100644 index 000000000000..7dacd1fcf1d5 --- /dev/null +++ b/redland/rasqal/makefile.mk @@ -0,0 +1,135 @@ +#************************************************************************* +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile: makefile.mk,v $ +# +# $Revision: 1.1 $ +# +# last change: $Author: mst $ $Date: 2008-06-16 11:38:21 $ +# +# The Contents of this file are made available subject to +# the terms of GNU Lesser General Public License Version 2.1. +# +# +# GNU Lesser General Public License Version 2.1 +# ============================================= +# Copyright 2005 by Sun Microsystems, Inc. +# 901 San Antonio Road, Palo Alto, CA 94303, USA +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License version 2.1, as published by the Free Software Foundation. +# +# This library 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 for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# +#************************************************************************* + +PRJ=.. + +PRJNAME=rasqal +TARGET=so_rasqal + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +.IF "$(SYSTEM_REDLAND)" == "YES" +all: + @echo "An already available installation of Redland RDF should exist on your system." + @echo "Therefore the version provided here does not need to be built in addition." +.ENDIF + +# --- Files -------------------------------------------------------- + +RASQALVERSION=0.9.15 + +TARFILE_NAME=$(PRJNAME)-$(RASQALVERSION) +PATCH_FILE_NAME=$(TARFILE_NAME).patch + + +.IF "$(OS)"=="WNT" +.IF "$(COM)"=="GCC" +#CONFIGURE_DIR= +#CONFIGURE_ACTION=.$/configure +#CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CFLAGS=-D_MT LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc -L$(ILIB:s/;/ -L/)" LIBS="-lws2_32 -lmingwthrd" OBJDUMP="$(WRAPCMD) objdump" +#BUILD_ACTION=$(GNUMAKE) +#BUILD_DIR=$(CONFIGURE_DIR) +all: + @echo "FIXME: somebody port me to mingw please..." + exit 1 +.ELSE +# there is no wntmsci build environment in the tarball; we use custom dmakefile +BUILD_ACTION=dmake +BUILD_DIR=$(CONFIGURE_DIR)$/src +.ENDIF +.ELSE # "WNT" + +.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack +.ENDIF # "$(OS)$(COM)"=="LINUXGCC" +.IF "$(OS)$(COM)"=="SOLARISC52" +LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' +.ENDIF # "$(OS)$(COM)"=="SOLARISC52" + +.IF "$(SYSBASE)"!="" +CPPFLAGS+=-I$(SOLARINCDIR)$/external -I$(SYSBASE)$/usr$/include +.IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX" +# NB: SOLARLIBDIR is first, because linux SYSBASE contains obsolete libcrypto +LDFLAGS+:=-L$(SOLARLIBDIR) -L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl +.ENDIF +.ENDIF # "$(SYSBASE)"!="" + +CPPFLAGS+:=$(EXTRA_CFLAGS) +LDFLAGS+:=$(EXTRA_LINKFLAGS) +XSLTLIB:=$(XSLTLIB) + +.EXPORT: CPPFLAGS +.EXPORT: LDFLAGS +.EXPORT: LIBXML2LIB +.EXPORT: ZLIB3RDLIB +.EXPORT: XSLTLIB + +CONFIGURE_DIR= +CONFIGURE_ACTION=.$/configure PATH=..$/..$/..$/bin:$$PATH +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 +BUILD_ACTION=$(GNUMAKE) +BUILD_FLAGS+= -j$(EXTMAXPROCESS) +BUILD_DIR=$(CONFIGURE_DIR) +#INSTALL_ACTION=$(GNUMAKE) install +#INSTALL_FLAGS+=DESTDIR=$(PWD)$/$(P_INSTALL_TARGET_DIR) +.ENDIF + + +OUT2INC+=src$/rasqal.h + +.IF "$(OS)"=="MACOSX" +OUT2LIB+=src$/.libs$/librasqal*.dylib +OUT2BIN+=src/rasqal-config +.ELIF "$(OS)"=="WNT" +.IF "$(COM)"=="GCC" +OUT2LIB+=src$/.libs$/*.a +OUT2BIN+=src$/.libs$/*.dll +OUT2BIN+=src/rasqal-config +.ELSE +# if we use dmake, this is done automagically +.ENDIF +.ELSE +OUT2LIB+=src$/.libs$/librasqal*.so* +OUT2BIN+=src/rasqal-config +.ENDIF + +# --- Targets ------------------------------------------------------ + +.INCLUDE : set_ext.mk +.INCLUDE : target.mk +.INCLUDE : tg_ext.mk + diff --git a/redland/redland-1.0.7.patch b/redland/redland-1.0.7.patch new file mode 100644 index 000000000000..23c7fb759a7d --- /dev/null +++ b/redland/redland-1.0.7.patch @@ -0,0 +1,574 @@ +diff -cr misc/redland-1.0.7/LICENSE.txt misc/build/redland-1.0.7/LICENSE.txt +*** misc/redland-1.0.7/LICENSE.txt Wed May 2 07:45:42 2007 +--- misc/build/redland-1.0.7/LICENSE.txt Fri Jun 6 18:40:18 2008 +*************** +*** 77,79 **** +--- 77,91 ---- + 10. NOTICE + 11. http://purl.org/net/dajobe/ + 12. http://www.bristol.ac.uk/ ++ ++ ++ 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 -cr misc/redland-1.0.7/raptor/LICENSE.txt misc/build/redland-1.0.7/raptor/LICENSE.txt +*** misc/redland-1.0.7/raptor/LICENSE.txt Fri Mar 23 06:28:24 2007 +--- misc/build/redland-1.0.7/raptor/LICENSE.txt Fri Jun 6 18:40:37 2008 +*************** +*** 61,63 **** +--- 61,75 ---- + + Copyright (C) 2000-2007 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 -cr misc/redland-1.0.7/rasqal/LICENSE.txt misc/build/redland-1.0.7/rasqal/LICENSE.txt +*** misc/redland-1.0.7/rasqal/LICENSE.txt Sun Apr 22 23:09:08 2007 +--- misc/build/redland-1.0.7/rasqal/LICENSE.txt Fri Jun 6 18:40:54 2008 +*************** +*** 61,63 **** +--- 61,75 ---- + + Copyright (C) 2003-2007 Dave Beckett + Copyright (C) 2003-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 -cr misc/redland-1.0.7/librdf/rdf_digest.c misc/build/redland-1.0.7/librdf/rdf_digest.c +*** misc/redland-1.0.7/librdf/rdf_digest.c Wed Dec 5 18:25:18 2007 +--- misc/build/redland-1.0.7/librdf/rdf_digest.c Mon Apr 28 13:27:03 2008 +*************** +*** 250,255 **** +--- 250,257 ---- + void + librdf_free_digest(librdf_digest *digest) + { ++ if(!digest) ++ return; + if(digest->context) + LIBRDF_FREE(digest_context, digest->context); + if(digest->digest) +diff -cr misc/redland-1.0.7/librdf/rdf_hash.c misc/build/redland-1.0.7/librdf/rdf_hash.c +*** misc/redland-1.0.7/librdf/rdf_hash.c Thu Dec 20 22:39:42 2007 +--- misc/build/redland-1.0.7/librdf/rdf_hash.c Mon Apr 28 13:27:03 2008 +*************** +*** 490,495 **** +--- 490,497 ---- + void + librdf_free_hash(librdf_hash* hash) + { ++ if(!hash) ++ return; + if(hash->context) { + if(hash->is_open) + librdf_hash_close(hash); +diff -cr misc/redland-1.0.7/librdf/rdf_init.c misc/build/redland-1.0.7/librdf/rdf_init.c +*** misc/redland-1.0.7/librdf/rdf_init.c Tue Nov 6 16:26:18 2007 +--- misc/build/redland-1.0.7/librdf/rdf_init.c Mon Apr 28 13:27:03 2008 +*************** +*** 178,183 **** +--- 178,186 ---- + void + librdf_free_world(librdf_world *world) + { ++ if(!world) ++ return; ++ + /* NOTE: raptor is always initialised as a parser and may + * be also used as a serializer, but it is NOT finished + * in the serializer_raptor registration. Therefore, always +diff -cr misc/redland-1.0.7/librdf/rdf_list.c misc/build/redland-1.0.7/librdf/rdf_list.c +*** misc/redland-1.0.7/librdf/rdf_list.c Thu Dec 20 22:39:42 2007 +--- misc/build/redland-1.0.7/librdf/rdf_list.c Mon Apr 28 13:27:03 2008 +*************** +*** 108,113 **** +--- 108,115 ---- + void + librdf_free_list(librdf_list* list) + { ++ if(!list) ++ return; + LIBRDF_ASSERT_RETURN(list->iterator_count, + "Iterators were active on freeing list", ); + +diff -cr misc/redland-1.0.7/librdf/rdf_model.c misc/build/redland-1.0.7/librdf/rdf_model.c +*** misc/redland-1.0.7/librdf/rdf_model.c Tue Oct 23 16:55:06 2007 +--- misc/build/redland-1.0.7/librdf/rdf_model.c Mon Apr 28 13:27:03 2008 +*************** +*** 393,399 **** + librdf_iterator* iterator; + librdf_model* m; + +! LIBRDF_ASSERT_OBJECT_POINTER_RETURN(model, librdf_model); + + if(--model->usage) + return; +--- 393,400 ---- + librdf_iterator* iterator; + librdf_model* m; + +! if(!model) +! return; + + if(--model->usage) + return; +diff -cr misc/redland-1.0.7/librdf/rdf_node.c misc/build/redland-1.0.7/librdf/rdf_node.c +*** misc/redland-1.0.7/librdf/rdf_node.c Thu Dec 20 22:39:42 2007 +--- misc/build/redland-1.0.7/librdf/rdf_node.c Mon Apr 28 13:27:03 2008 +*************** +*** 726,732 **** + librdf_world *world; + #endif + +! LIBRDF_ASSERT_OBJECT_POINTER_RETURN(node, librdf_node); + + #ifdef WITH_THREADS + world = node->world; +--- 726,733 ---- + librdf_world *world; + #endif + +! if(!node) +! return; + + #ifdef WITH_THREADS + world = node->world; +diff -cr misc/redland-1.0.7/librdf/rdf_parser.c misc/build/redland-1.0.7/librdf/rdf_parser.c +*** misc/redland-1.0.7/librdf/rdf_parser.c Mon Dec 17 08:19:11 2007 +--- misc/build/redland-1.0.7/librdf/rdf_parser.c Mon Apr 28 13:27:03 2008 +*************** +*** 371,377 **** + void + librdf_free_parser(librdf_parser *parser) + { +! LIBRDF_ASSERT_OBJECT_POINTER_RETURN(parser, librdf_parser); + + if(parser->context) { + if(parser->factory->terminate) +--- 371,378 ---- + void + librdf_free_parser(librdf_parser *parser) + { +! if(!parser) +! return; + + if(parser->context) { + if(parser->factory->terminate) +diff -cr misc/redland-1.0.7/librdf/rdf_query.c misc/build/redland-1.0.7/librdf/rdf_query.c +*** misc/redland-1.0.7/librdf/rdf_query.c Tue Oct 23 16:55:06 2007 +--- misc/build/redland-1.0.7/librdf/rdf_query.c Mon Apr 28 13:27:03 2008 +*************** +*** 388,394 **** + void + librdf_free_query(librdf_query* query) + { +! LIBRDF_ASSERT_OBJECT_POINTER_RETURN(query, librdf_query); + + if(--query->usage) + return; +--- 388,395 ---- + void + librdf_free_query(librdf_query* query) + { +! if(!query) +! return; + + if(--query->usage) + return; +diff -cr misc/redland-1.0.7/librdf/rdf_query_results.c misc/build/redland-1.0.7/librdf/rdf_query_results.c +*** misc/redland-1.0.7/librdf/rdf_query_results.c Fri Oct 26 04:23:36 2007 +--- misc/build/redland-1.0.7/librdf/rdf_query_results.c Mon Apr 28 13:27:03 2008 +*************** +*** 244,250 **** + void + librdf_free_query_results(librdf_query_results* query_results) + { +! LIBRDF_ASSERT_OBJECT_POINTER_RETURN(query_results, librdf_query_results); + + if(query_results->query->factory->free_results) + query_results->query->factory->free_results(query_results); +--- 244,251 ---- + void + librdf_free_query_results(librdf_query_results* query_results) + { +! if(!query_results) +! return; + + if(query_results->query->factory->free_results) + query_results->query->factory->free_results(query_results); +*************** +*** 636,641 **** +--- 637,644 ---- + void + librdf_free_query_results_formatter(librdf_query_results_formatter* formatter) + { ++ if(!formatter) ++ return; + if(formatter->query_results->query->factory->free_results_formatter) + formatter->query_results->query->factory->free_results_formatter(formatter); + } +diff -cr misc/redland-1.0.7/librdf/rdf_serializer.c misc/build/redland-1.0.7/librdf/rdf_serializer.c +*** misc/redland-1.0.7/librdf/rdf_serializer.c Tue Oct 23 16:55:06 2007 +--- misc/build/redland-1.0.7/librdf/rdf_serializer.c Mon Apr 28 13:27:03 2008 +*************** +*** 373,379 **** + void + librdf_free_serializer(librdf_serializer *serializer) + { +! LIBRDF_ASSERT_OBJECT_POINTER_RETURN(serializer, librdf_serializer); + + if(serializer->context) { + if(serializer->factory->terminate) +--- 373,380 ---- + void + librdf_free_serializer(librdf_serializer *serializer) + { +! if(!serializer) +! return; + + if(serializer->context) { + if(serializer->factory->terminate) +diff -cr misc/redland-1.0.7/librdf/rdf_statement.c misc/build/redland-1.0.7/librdf/rdf_statement.c +*** misc/redland-1.0.7/librdf/rdf_statement.c Tue Nov 6 16:26:18 2007 +--- misc/build/redland-1.0.7/librdf/rdf_statement.c Mon Apr 28 13:27:03 2008 +*************** +*** 255,261 **** + librdf_world *world; + #endif + +! LIBRDF_ASSERT_OBJECT_POINTER_RETURN(statement, librdf_statement); + + #ifdef WITH_THREADS + world = statement->world; +--- 255,262 ---- + librdf_world *world; + #endif + +! if(!statement) +! return; + + #ifdef WITH_THREADS + world = statement->world; +diff -cr misc/redland-1.0.7/librdf/rdf_storage.c misc/build/redland-1.0.7/librdf/rdf_storage.c +*** misc/redland-1.0.7/librdf/rdf_storage.c Thu Dec 20 22:39:42 2007 +--- misc/build/redland-1.0.7/librdf/rdf_storage.c Mon Apr 28 13:27:03 2008 +*************** +*** 608,614 **** + void + librdf_free_storage (librdf_storage* storage) + { +! LIBRDF_ASSERT_OBJECT_POINTER_RETURN(storage, librdf_storage); + + if(--storage->usage) + return; +--- 608,615 ---- + void + librdf_free_storage (librdf_storage* storage) + { +! if(!storage) +! return; + + if(--storage->usage) + return; +diff -cr misc/redland-1.0.7/librdf/rdf_storage_hashes.c misc/build/redland-1.0.7/librdf/rdf_storage_hashes.c +*** misc/redland-1.0.7/librdf/rdf_storage_hashes.c Thu Dec 20 22:39:42 2007 +--- misc/build/redland-1.0.7/librdf/rdf_storage_hashes.c Tue May 6 14:06:56 2008 +*************** +*** 1389,1394 **** +--- 1389,1454 ---- + LIBRDF_STATEMENT_OBJECT); + } + ++ ++ /* return -1 on failure, 1 if context contains stmt, 0 if not */ ++ static int ++ librdf_storage_hashes_context_contains_statement(librdf_storage* storage, ++ librdf_node* context_node, ++ librdf_statement* statement) ++ { ++ librdf_storage_hashes_context* context=(librdf_storage_hashes_context*)storage->context; ++ librdf_hash_datum key, value; /* on stack - not allocated */ ++ size_t size; ++ int status; ++ ++ if(context->contexts_index < 0) { ++ librdf_log(storage->world, 0, LIBRDF_LOG_WARN, LIBRDF_FROM_STORAGE, NULL, ++ "Storage was created without context support"); ++ return -1; ++ } ++ ++ /* ENCODE KEY */ ++ size=librdf_node_encode(context_node, NULL, 0); ++ if (!size) ++ return -1; ++ key.data=(char*)LIBRDF_MALLOC(cstring, size); ++ if (!key.data) ++ return -1; ++ key.size=librdf_node_encode(context_node, ++ (unsigned char*)key.data, size); ++ if (!key.size) { ++ LIBRDF_FREE(data, key.data); ++ return -1; ++ } ++ ++ /* ENCODE VALUE */ ++ size=librdf_statement_encode(statement, NULL, 0); ++ if (!size) { ++ LIBRDF_FREE(data, key.data); ++ return -1; ++ } ++ value.data=(char*)LIBRDF_MALLOC(cstring, size); ++ if (!value.data) { ++ LIBRDF_FREE(data, key.data); ++ return -1; ++ } ++ value.size=librdf_statement_encode(statement, (unsigned char*)value.data, size); ++ if (!value.size) { ++ LIBRDF_FREE(data, value.data); ++ LIBRDF_FREE(data, key.data); ++ return -1; ++ } ++ ++ status=librdf_hash_exists(context->hashes[context->contexts_index], &key, &value); ++ LIBRDF_FREE(data, value.data); ++ LIBRDF_FREE(data, key.data); ++ ++ /* DO NOT free statement, ownership was not passed in */ ++ return status; ++ } ++ ++ ++ + /** + * librdf_storage_hashes_context_add_statement: + * @storage: #librdf_storage object +*************** +*** 1414,1420 **** + "Storage was created without context support"); + return 1; + } +! + if(librdf_storage_hashes_add_remove_statement(storage, + statement, context_node, 1)) + return 1; +--- 1474,1488 ---- + "Storage was created without context support"); + return 1; + } +! +! /* Do not add duplicate statements */ +! status=librdf_storage_hashes_context_contains_statement(storage, context_node, statement); +! if(status) +! if(status < 0) +! return 1; +! else +! return 0; +! + if(librdf_storage_hashes_add_remove_statement(storage, + statement, context_node, 1)) + return 1; +*************** +*** 1595,1601 **** + { + librdf_storage_hashes_context_serialise_stream_context* scontext=(librdf_storage_hashes_context_serialise_stream_context*)context; + librdf_hash_datum* v; +- librdf_node** cnp=NULL; + + switch(flags) { + case LIBRDF_ITERATOR_GET_METHOD_GET_OBJECT: +--- 1595,1600 ---- +*************** +*** 1608,1627 **** + return scontext->context_node; + } + +! /* current stuff is out of date - get new cached answers */ +! if(scontext->index_contexts) { +! if(scontext->context_node) +! librdf_free_node(scontext->context_node); +! scontext->context_node=NULL; +! cnp=&scontext->context_node; +! } +! + librdf_statement_clear(&scontext->current); + + v=(librdf_hash_datum*)librdf_iterator_get_value(scontext->iterator); +! + /* decode value content and optional context */ +! if(!librdf_statement_decode_parts(&scontext->current, cnp, + (unsigned char*)v->data, v->size)) { + return NULL; + } +--- 1607,1620 ---- + return scontext->context_node; + } + +! /* note: scontext->context_node is still valid */ +! + librdf_statement_clear(&scontext->current); + + v=(librdf_hash_datum*)librdf_iterator_get_value(scontext->iterator); +! + /* decode value content and optional context */ +! if(!librdf_statement_decode_parts(&scontext->current, NULL, + (unsigned char*)v->data, v->size)) { + return NULL; + } +diff -cr misc/redland-1.0.7/librdf/rdf_storage_list.c misc/build/redland-1.0.7/librdf/rdf_storage_list.c +*** misc/redland-1.0.7/librdf/rdf_storage_list.c Thu Dec 20 22:39:42 2007 +--- misc/build/redland-1.0.7/librdf/rdf_storage_list.c Mon Apr 28 13:27:21 2008 +*************** +*** 459,464 **** +--- 459,522 ---- + } + + ++ /* return -1 on failure, 1 if context contains stmt, 0 if not */ ++ static int ++ librdf_storage_list_context_contains_statement(librdf_storage* storage, ++ librdf_node* context_node, ++ librdf_statement* statement) ++ { ++ librdf_storage_list_context* context=(librdf_storage_list_context*)storage->context; ++ librdf_hash_datum key, value; /* on stack - not allocated */ ++ size_t size; ++ int status; ++ ++ if(!context->index_contexts) { ++ librdf_log(storage->world, 0, LIBRDF_LOG_WARN, LIBRDF_FROM_STORAGE, NULL, ++ "Storage was created without context support"); ++ return -1; ++ } ++ ++ /* ENCODE KEY */ ++ size=librdf_node_encode(context_node, NULL, 0); ++ if (!size) ++ return -1; ++ key.data=(char*)LIBRDF_MALLOC(cstring, size); ++ if (!key.data) ++ return -1; ++ key.size=librdf_node_encode(context_node, ++ (unsigned char*)key.data, size); ++ if (!key.size) { ++ LIBRDF_FREE(data, key.data); ++ return -1; ++ } ++ ++ /* ENCODE VALUE */ ++ size=librdf_statement_encode(statement, NULL, 0); ++ if (!size) { ++ LIBRDF_FREE(data, key.data); ++ return -1; ++ } ++ value.data=(char*)LIBRDF_MALLOC(cstring, size); ++ if (!value.data) { ++ LIBRDF_FREE(data, key.data); ++ return -1; ++ } ++ value.size=librdf_statement_encode(statement, (unsigned char*)value.data, size); ++ if (!value.size) { ++ LIBRDF_FREE(data, value.data); ++ LIBRDF_FREE(data, key.data); ++ return -1; ++ } ++ ++ status=librdf_hash_exists(context->contexts, &key, &value); ++ LIBRDF_FREE(data, value.data); ++ LIBRDF_FREE(data, key.data); ++ ++ /* DO NOT free statement, ownership was not passed in */ ++ return status; ++ } ++ ++ + /** + * librdf_storage_list_context_add_statement: + * @storage: #librdf_storage object +*************** +*** 485,491 **** + "Storage was created without context support"); + return 1; + } +! + /* Store statement + node in the storage_list */ + sln=(librdf_storage_list_node*)LIBRDF_MALLOC(librdf_storage_list_node, sizeof(librdf_storage_list_node)); + if(!sln) +--- 543,557 ---- + "Storage was created without context support"); + return 1; + } +! +! /* Do not add duplicate statements */ +! status=librdf_storage_list_context_contains_statement(storage, context_node, statement); +! if(status) +! if(status < 0) +! return 1; +! else +! return 0; +! + /* Store statement + node in the storage_list */ + sln=(librdf_storage_list_node*)LIBRDF_MALLOC(librdf_storage_list_node, sizeof(librdf_storage_list_node)); + if(!sln) +diff -cr misc/redland-1.0.7/librdf/rdf_stream.c misc/build/redland-1.0.7/librdf/rdf_stream.c +*** misc/redland-1.0.7/librdf/rdf_stream.c Mon Dec 24 00:23:10 2007 +--- misc/build/redland-1.0.7/librdf/rdf_stream.c Mon Apr 28 13:27:03 2008 +*************** +*** 126,131 **** +--- 126,134 ---- + void + librdf_free_stream(librdf_stream* stream) + { ++ if(!stream) ++ return; ++ + if(stream->finished_method) + stream->finished_method(stream->context); + +diff -cr misc/redland-1.0.7/librdf/rdf_uri.c misc/build/redland-1.0.7/librdf/rdf_uri.c +*** misc/redland-1.0.7/librdf/rdf_uri.c Tue Oct 23 16:55:06 2007 +--- misc/build/redland-1.0.7/librdf/rdf_uri.c Mon Apr 28 13:27:03 2008 +*************** +*** 409,415 **** + librdf_world *world; + #endif + +! LIBRDF_ASSERT_OBJECT_POINTER_RETURN(uri, librdf_uri); + + #ifdef WITH_THREADS + world = uri->world; +--- 409,416 ---- + librdf_world *world; + #endif + +! if(!uri) +! return; + + #ifdef WITH_THREADS + world = uri->world; diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk new file mode 100644 index 000000000000..92b16e31b9ab --- /dev/null +++ b/redland/redland/makefile.mk @@ -0,0 +1,132 @@ +#************************************************************************* +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile: makefile.mk,v $ +# +# $Revision: 1.1 $ +# +# last change: $Author: mst $ $Date: 2008-06-16 11:38:21 $ +# +# The Contents of this file are made available subject to +# the terms of GNU Lesser General Public License Version 2.1. +# +# +# GNU Lesser General Public License Version 2.1 +# ============================================= +# Copyright 2005 by Sun Microsystems, Inc. +# 901 San Antonio Road, Palo Alto, CA 94303, USA +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License version 2.1, as published by the Free Software Foundation. +# +# This library 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 for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# +#************************************************************************* + +PRJ=.. + +PRJNAME=redland +TARGET=so_redland + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +.IF "$(SYSTEM_REDLAND)" == "YES" +all: + @echo "An already available installation of Redland RDF should exist on your system." + @echo "Therefore the version provided here does not need to be built in addition." +.ENDIF + +# --- Files -------------------------------------------------------- + +REDLANDVERSION=1.0.7 + +TARFILE_NAME=$(PRJNAME)-$(REDLANDVERSION) +PATCH_FILE_NAME=$(TARFILE_NAME).patch + + +.IF "$(OS)"=="WNT" +.IF "$(COM)"=="GCC" +#CONFIGURE_DIR= +#CONFIGURE_ACTION=.$/configure +#CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CFLAGS=-D_MT LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc -L$(ILIB:s/;/ -L/)" LIBS="-lws2_32 -lmingwthrd" OBJDUMP="$(WRAPCMD) objdump" +#BUILD_ACTION=$(GNUMAKE) +#BUILD_DIR=$(CONFIGURE_DIR) +all: + @echo "FIXME: somebody port me to mingw please..." + exit 1 +.ELSE +# there is no wntmsci build environment in the tarball; we use custom dmakefile +BUILD_ACTION=dmake +BUILD_DIR=$(CONFIGURE_DIR)$/librdf +.ENDIF +.ELSE # "WNT" + +.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack +.ENDIF # "$(OS)$(COM)"=="LINUXGCC" +.IF "$(OS)$(COM)"=="SOLARISC52" +LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' +.ENDIF # "$(OS)$(COM)"=="SOLARISC52" + +.IF "$(SYSBASE)"!="" +CPPFLAGS+=-I$(SOLARINCDIR)$/external -I$(SYSBASE)$/usr$/include +.IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX" +# NB: SOLARLIBDIR is first, because linux SYSBASE contains obsolete libcrypto +LDFLAGS+:=-L$(SOLARLIBDIR) -L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl +.ENDIF +.ENDIF # "$(SYSBASE)"!="" + +CPPFLAGS+:=$(EXTRA_CFLAGS) +LDFLAGS+:=$(EXTRA_LINKFLAGS) +XSLTLIB:=$(XSLTLIB) + +.EXPORT: CPPFLAGS +.EXPORT: LDFLAGS +.EXPORT: LIBXML2LIB +.EXPORT: ZLIB3RDLIB +.EXPORT: XSLTLIB + +CONFIGURE_DIR= +CONFIGURE_ACTION=.$/configure PATH=..$/..$/..$/bin:$$PATH +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --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) +#INSTALL_ACTION=$(GNUMAKE) install +#INSTALL_FLAGS+=DESTDIR=$(PWD)$/$(P_INSTALL_TARGET_DIR) +.ENDIF + + +OUT2INC+=librdf$/*.h + +.IF "$(OS)"=="MACOSX" +OUT2LIB+=librdf$/.libs$/librdf*.dylib +.ELIF "$(OS)"=="WNT" +.IF "$(COM)"=="GCC" +OUT2LIB+=librdf$/.libs$/*.a +OUT2BIN+=librdf$/.libs$/*.dll +.ELSE +# if we use dmake, this is done automagically +.ENDIF +.ELSE +OUT2LIB+=librdf$/.libs$/librdf*.so* +.ENDIF + +# --- Targets ------------------------------------------------------ + +.INCLUDE : set_ext.mk +.INCLUDE : target.mk +.INCLUDE : tg_ext.mk + -- cgit v1.2.3 From 693b532d226a2a31a44892809942445ee2ebab97 Mon Sep 17 00:00:00 2001 From: mst Date: Tue, 17 Jun 2008 15:12:51 +0000 Subject: make it build on wntmsci12 and unxmacxi - redland/*/makefile.mk: + fix bugs + use evil -dylib_file hack so redland builds on unxmacxi - redland/*.patch: + add dmakefile for wntmsci12 build --- redland/raptor-1.4.17.patch | 329 ++++++++--- redland/raptor/makefile.mk | 10 +- redland/rasqal-0.9.15.patch | 281 +++++++--- redland/rasqal/makefile.mk | 10 +- redland/redland-1.0.7.patch | 1260 +++++++++++++++++++++++-------------------- redland/redland/makefile.mk | 12 +- 6 files changed, 1155 insertions(+), 747 deletions(-) (limited to 'redland') diff --git a/redland/raptor-1.4.17.patch b/redland/raptor-1.4.17.patch index bdefaa0835be..29a90f8635b9 100644 --- a/redland/raptor-1.4.17.patch +++ b/redland/raptor-1.4.17.patch @@ -1,82 +1,247 @@ -diff -cr misc/raptor-1.4.17/LICENSE.txt misc/build/raptor-1.4.17/LICENSE.txt -*** misc/raptor-1.4.17/LICENSE.txt Sun Mar 30 06:52:22 2008 ---- misc/build/raptor-1.4.17/LICENSE.txt Fri Jun 6 18:38:51 2008 -*************** -*** 60,62 **** ---- 60,74 ---- - - 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 -cr misc/raptor-1.4.17/src/raptor-config.in misc/build/raptor-1.4.17/src/raptor-config.in -*** misc/raptor-1.4.17/src/raptor-config.in 2007-01-06 05:02:00.000000000 +0100 ---- misc/build/raptor-1.4.17/src/raptor-config.in 2008-04-07 16:55:00.542937115 +0200 -*************** -*** 21,34 **** - # - # - -! prefix=@prefix@ -! exec_prefix=@exec_prefix@ - -! if test "@includedir@" != /usr/include ; then -! includes="-I@includedir@" -! else -! includes= -! fi - - - usage() ---- 21,43 ---- - # - # - -! 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} - -! #prefix=@prefix@ -! #exec_prefix=@exec_prefix@ -! # -! #if test "@includedir@" != /usr/include ; then -! # includes="-I@includedir@" -! #else -! # includes= -! #fi - - - usage() -*************** -*** 130,136 **** - done - fi - if test "$echo_libs" = "yes"; then -! echo -L@libdir@ -lraptor - fi - if test "$echo_libtool_libs" = "yes"; then - echo @libdir@/@RAPTOR_LIBTOOLLIBS@ ---- 139,146 ---- - done - fi - if test "$echo_libs" = "yes"; then -! # echo -L@libdir@ -lraptor -! echo -L${libdir} -lraptor - fi - if test "$echo_libtool_libs" = "yes"; then - echo @libdir@/@RAPTOR_LIBTOOLLIBS@ +--- misc/raptor-1.4.17/LICENSE.txt Sun Mar 30 06:52:22 2008 ++++ misc/build/raptor-1.4.17/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. ++ +--- misc/raptor-1.4.17/src/makefile.mk Mon Jun 16 17:24:23 2008 ++++ misc/build/raptor-1.4.17/src/makefile.mk Mon Jun 16 19:25:14 2008 +@@ -1,1 +1,121 @@ +-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.17.patch,v $ ++# ++# $Revision: 1.2 $ ++# ++# 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 ++# ++# for a copy of the LGPLv3 License. ++# ++#************************************************************************* ++ ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=redland ++TARGET=raptor ++LIBTARGET=NO ++ ++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_rss.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_grddl.obj \ ++ $(SLO)$/raptor_abbrev.obj \ ++ $(SLO)$/raptor_avltree.obj \ ++ $(SLO)$/raptor_statement.obj \ ++ $(SLO)$/raptor_turtle_writer.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) $< $@ ++ +--- misc/raptor-1.4.17/src/raptor-config.in Sat Jan 6 05:02:00 2007 ++++ misc/build/raptor-1.4.17/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@ +--- misc/raptor-1.4.17/src/win32_raptor_config.h Tue Oct 2 06:12:55 2007 ++++ misc/build/raptor-1.4.17/src/win32_raptor_config.h Mon Jun 16 15:55:38 2008 +@@ -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 +@@ -125,7 +137,8 @@ + #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 diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 84b7b225ff67..b454aa96efab 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: mst $ $Date: 2008-06-16 11:38:21 $ +# last change: $Author: mst $ $Date: 2008-06-17 16:12:51 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -35,7 +35,7 @@ PRJ=.. -PRJNAME=raptor +PRJNAME=redland TARGET=so_raptor # --- Settings ----------------------------------------------------- @@ -52,9 +52,11 @@ all: RAPTORVERSION=1.4.17 -TARFILE_NAME=$(PRJNAME)-$(RAPTORVERSION) +TARFILE_NAME=raptor-$(RAPTORVERSION) PATCH_FILE_NAME=$(TARFILE_NAME).patch +ADDITIONAL_FILES=src/makefile.mk + .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" diff --git a/redland/rasqal-0.9.15.patch b/redland/rasqal-0.9.15.patch index 03ee6dda062c..994b60e09c96 100644 --- a/redland/rasqal-0.9.15.patch +++ b/redland/rasqal-0.9.15.patch @@ -1,80 +1,201 @@ -diff -cr misc/rasqal-0.9.15/LICENSE.txt misc/build/rasqal-0.9.15/LICENSE.txt -*** misc/rasqal-0.9.15/LICENSE.txt Sun Apr 22 23:09:08 2007 ---- misc/build/rasqal-0.9.15/LICENSE.txt Fri Jun 6 18:39:51 2008 -*************** -*** 61,63 **** ---- 61,75 ---- - - Copyright (C) 2003-2007 Dave Beckett - Copyright (C) 2003-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 -cr misc/rasqal-0.9.15/src/rasqal-config.in misc/build/rasqal-0.9.15/src/rasqal-config.in -*** misc/rasqal-0.9.15/src/rasqal-config.in 2007-04-22 22:58:51.000000000 +0200 ---- misc/build/rasqal-0.9.15/src/rasqal-config.in 2008-04-07 17:18:52.033946868 +0200 -*************** -*** 22,34 **** - # - # - -! prefix=@prefix@ - -! if test "@includedir@" != /usr/include ; then -! includes="-I@includedir@" -! else -! includes= -! fi - - - usage() ---- 22,43 ---- - # - # - -! 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} - -! #prefix=@prefix@ -! # -! #if test "@includedir@" != /usr/include ; then -! # includes="-I@includedir@" -! #else -! # includes= -! #fi - - - usage() -*************** -*** 109,115 **** - echo $includes - fi - if test "$echo_libs" = "yes"; then -! echo -L@libdir@ -lrasqal - fi - if test "$echo_libtool_libs" = "yes"; then - echo @libdir@/@RASQAL_LIBTOOLLIBS@ ---- 118,125 ---- - echo $includes - fi - if test "$echo_libs" = "yes"; then -! # echo -L@libdir@ -lrasqal -! echo -L${libdir} -lrasqal - fi - if test "$echo_libtool_libs" = "yes"; then - echo @libdir@/@RASQAL_LIBTOOLLIBS@ +--- misc/rasqal-0.9.15/LICENSE.txt Sun Apr 22 23:09:08 2007 ++++ misc/build/rasqal-0.9.15/LICENSE.txt Mon Jun 16 15:55:45 2008 +@@ -61,3 +61,15 @@ + + Copyright (C) 2003-2007 Dave Beckett + Copyright (C) 2003-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. ++ +--- misc/rasqal-0.9.15/src/makefile.mk Mon Jun 16 19:30:20 2008 ++++ misc/build/rasqal-0.9.15/src/makefile.mk Mon Jun 16 19:25:48 2008 +@@ -1,1 +1,95 @@ +-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: rasqal-0.9.15.patch,v $ ++# ++# $Revision: 1.2 $ ++# ++# 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 ++# ++# for a copy of the LGPLv3 License. ++# ++#************************************************************************* ++ ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=redland ++TARGET=rasqal ++LIBTARGET=NO ++ ++EXTERNAL_WARNINGS_NOT_ERRORS=TRUE ++ ++ ++# --- Settings ----------------------------------------------------- ++ ++.INCLUDE : settings.mk ++ ++CDEFS+=-DRASQAL_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS -D_MT ++ ++# --- Files -------------------------------------------------------- ++ ++SLOFILES = \ ++ $(SLO)$/rasqal_datetime.obj \ ++ $(SLO)$/rasqal_decimal.obj \ ++ $(SLO)$/rasqal_engine.obj \ ++ $(SLO)$/rasqal_expr.obj \ ++ $(SLO)$/rasqal_feature.obj \ ++ $(SLO)$/rasqal_general.obj \ ++ $(SLO)$/rasqal_graph_pattern.obj \ ++ $(SLO)$/rasqal_literal.obj \ ++ $(SLO)$/rasqal_map.obj \ ++ $(SLO)$/rasqal_query_results.obj \ ++ $(SLO)$/rasqal_query.obj \ ++ $(SLO)$/rasqal_raptor.obj \ ++ $(SLO)$/rasqal_result_formats.obj \ ++ $(SLO)$/rasqal_xsd_datatypes.obj \ ++ $(SLO)$/rdql_lexer.obj \ ++ $(SLO)$/rdql_parser.obj \ ++ $(SLO)$/sparql_lexer.obj \ ++ $(SLO)$/sparql_parser.obj \ ++ $(SLO)$/strcasecmp.obj \ ++ ++ ++# $(SLO)$/rasqal_redland.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= \ ++ $(PRJ)$/$(INPATH)$/lib$/libraptor.lib \ ++ ++ ++#$(LIBXML2LIB) \ ++# $(XSLTLIB) \ ++ ++# --- Targets ------------------------------------------------------ ++ ++.INCLUDE : target.mk ++ +--- misc/rasqal-0.9.15/src/rasqal-config.in Sun Apr 22 22:58:51 2007 ++++ misc/build/rasqal-0.9.15/src/rasqal-config.in Mon Jun 16 15:55:45 2008 +@@ -22,13 +22,22 @@ + # + # + +-prefix=@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@ ++# ++#if test "@includedir@" != /usr/include ; then ++# includes="-I@includedir@" ++#else ++# includes= ++#fi + + + usage() +@@ -109,7 +118,8 @@ + echo $includes + fi + if test "$echo_libs" = "yes"; then +- echo -L@libdir@ -lrasqal ++# echo -L@libdir@ -lrasqal ++ echo -L${libdir} -lrasqal + fi + if test "$echo_libtool_libs" = "yes"; then + echo @libdir@/@RASQAL_LIBTOOLLIBS@ +--- misc/rasqal-0.9.15/src/win32_rasqal_config.h Mon Apr 23 09:18:27 2007 ++++ misc/build/rasqal-0.9.15/src/win32_rasqal_config.h Mon Jun 16 15:55:45 2008 +@@ -39,10 +39,13 @@ + + #define HAVE_STDLIB_H 1 + ++#define HAVE_ERRNO_H 1 ++ + #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 +@@ -87,6 +90,9 @@ + #include + #include + ++// argh! stupid winnt.h... ++#undef DELETE ++ + /* This is a SPARQL token define */ + #ifdef OPTIONAL + #undef OPTIONAL +@@ -118,8 +124,14 @@ + /* #define RAPTOR_TRIPLES_SOURCE_REDLAND 1 */ + + /* Use PCRE regex library */ +-#define RASQAL_REGEX_PCRE 1 ++//#define RASQAL_REGEX_PCRE 1 + ++#define HAVE_LIBXML_SCHEMASINTERNALS_H 1 ++#define HAVE_LIBXML_XMLSCHEMASTYPES_H 1 ++#define HAVE_LIBXML_XMLSCHEMAS_H 1 ++ ++#define RASQAL_DECIMAL_NONE 1 ++ + #ifdef _DEBUG + #define RASQAL_DEBUG 1 + #endif diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index 7dacd1fcf1d5..9e25f27c86a0 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: mst $ $Date: 2008-06-16 11:38:21 $ +# last change: $Author: mst $ $Date: 2008-06-17 16:12:51 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -35,7 +35,7 @@ PRJ=.. -PRJNAME=rasqal +PRJNAME=redland TARGET=so_rasqal # --- Settings ----------------------------------------------------- @@ -52,9 +52,11 @@ all: RASQALVERSION=0.9.15 -TARFILE_NAME=$(PRJNAME)-$(RASQALVERSION) +TARFILE_NAME=rasqal-$(RASQALVERSION) PATCH_FILE_NAME=$(TARFILE_NAME).patch +ADDITIONAL_FILES=src/makefile.mk + .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" diff --git a/redland/redland-1.0.7.patch b/redland/redland-1.0.7.patch index 23c7fb759a7d..4f275064f937 100644 --- a/redland/redland-1.0.7.patch +++ b/redland/redland-1.0.7.patch @@ -1,574 +1,686 @@ -diff -cr misc/redland-1.0.7/LICENSE.txt misc/build/redland-1.0.7/LICENSE.txt -*** misc/redland-1.0.7/LICENSE.txt Wed May 2 07:45:42 2007 ---- misc/build/redland-1.0.7/LICENSE.txt Fri Jun 6 18:40:18 2008 -*************** -*** 77,79 **** ---- 77,91 ---- - 10. NOTICE - 11. http://purl.org/net/dajobe/ - 12. http://www.bristol.ac.uk/ -+ -+ -+ 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 -cr misc/redland-1.0.7/raptor/LICENSE.txt misc/build/redland-1.0.7/raptor/LICENSE.txt -*** misc/redland-1.0.7/raptor/LICENSE.txt Fri Mar 23 06:28:24 2007 ---- misc/build/redland-1.0.7/raptor/LICENSE.txt Fri Jun 6 18:40:37 2008 -*************** -*** 61,63 **** ---- 61,75 ---- - - Copyright (C) 2000-2007 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 -cr misc/redland-1.0.7/rasqal/LICENSE.txt misc/build/redland-1.0.7/rasqal/LICENSE.txt -*** misc/redland-1.0.7/rasqal/LICENSE.txt Sun Apr 22 23:09:08 2007 ---- misc/build/redland-1.0.7/rasqal/LICENSE.txt Fri Jun 6 18:40:54 2008 -*************** -*** 61,63 **** ---- 61,75 ---- - - Copyright (C) 2003-2007 Dave Beckett - Copyright (C) 2003-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 -cr misc/redland-1.0.7/librdf/rdf_digest.c misc/build/redland-1.0.7/librdf/rdf_digest.c -*** misc/redland-1.0.7/librdf/rdf_digest.c Wed Dec 5 18:25:18 2007 ---- misc/build/redland-1.0.7/librdf/rdf_digest.c Mon Apr 28 13:27:03 2008 -*************** -*** 250,255 **** ---- 250,257 ---- - void - librdf_free_digest(librdf_digest *digest) - { -+ if(!digest) -+ return; - if(digest->context) - LIBRDF_FREE(digest_context, digest->context); - if(digest->digest) -diff -cr misc/redland-1.0.7/librdf/rdf_hash.c misc/build/redland-1.0.7/librdf/rdf_hash.c -*** misc/redland-1.0.7/librdf/rdf_hash.c Thu Dec 20 22:39:42 2007 ---- misc/build/redland-1.0.7/librdf/rdf_hash.c Mon Apr 28 13:27:03 2008 -*************** -*** 490,495 **** ---- 490,497 ---- - void - librdf_free_hash(librdf_hash* hash) - { -+ if(!hash) -+ return; - if(hash->context) { - if(hash->is_open) - librdf_hash_close(hash); -diff -cr misc/redland-1.0.7/librdf/rdf_init.c misc/build/redland-1.0.7/librdf/rdf_init.c -*** misc/redland-1.0.7/librdf/rdf_init.c Tue Nov 6 16:26:18 2007 ---- misc/build/redland-1.0.7/librdf/rdf_init.c Mon Apr 28 13:27:03 2008 -*************** -*** 178,183 **** ---- 178,186 ---- - void - librdf_free_world(librdf_world *world) - { -+ if(!world) -+ return; -+ - /* NOTE: raptor is always initialised as a parser and may - * be also used as a serializer, but it is NOT finished - * in the serializer_raptor registration. Therefore, always -diff -cr misc/redland-1.0.7/librdf/rdf_list.c misc/build/redland-1.0.7/librdf/rdf_list.c -*** misc/redland-1.0.7/librdf/rdf_list.c Thu Dec 20 22:39:42 2007 ---- misc/build/redland-1.0.7/librdf/rdf_list.c Mon Apr 28 13:27:03 2008 -*************** -*** 108,113 **** ---- 108,115 ---- - void - librdf_free_list(librdf_list* list) - { -+ if(!list) -+ return; - LIBRDF_ASSERT_RETURN(list->iterator_count, - "Iterators were active on freeing list", ); - -diff -cr misc/redland-1.0.7/librdf/rdf_model.c misc/build/redland-1.0.7/librdf/rdf_model.c -*** misc/redland-1.0.7/librdf/rdf_model.c Tue Oct 23 16:55:06 2007 ---- misc/build/redland-1.0.7/librdf/rdf_model.c Mon Apr 28 13:27:03 2008 -*************** -*** 393,399 **** - librdf_iterator* iterator; - librdf_model* m; - -! LIBRDF_ASSERT_OBJECT_POINTER_RETURN(model, librdf_model); - - if(--model->usage) - return; ---- 393,400 ---- - librdf_iterator* iterator; - librdf_model* m; - -! if(!model) -! return; - - if(--model->usage) - return; -diff -cr misc/redland-1.0.7/librdf/rdf_node.c misc/build/redland-1.0.7/librdf/rdf_node.c -*** misc/redland-1.0.7/librdf/rdf_node.c Thu Dec 20 22:39:42 2007 ---- misc/build/redland-1.0.7/librdf/rdf_node.c Mon Apr 28 13:27:03 2008 -*************** -*** 726,732 **** - librdf_world *world; - #endif - -! LIBRDF_ASSERT_OBJECT_POINTER_RETURN(node, librdf_node); - - #ifdef WITH_THREADS - world = node->world; ---- 726,733 ---- - librdf_world *world; - #endif - -! if(!node) -! return; - - #ifdef WITH_THREADS - world = node->world; -diff -cr misc/redland-1.0.7/librdf/rdf_parser.c misc/build/redland-1.0.7/librdf/rdf_parser.c -*** misc/redland-1.0.7/librdf/rdf_parser.c Mon Dec 17 08:19:11 2007 ---- misc/build/redland-1.0.7/librdf/rdf_parser.c Mon Apr 28 13:27:03 2008 -*************** -*** 371,377 **** - void - librdf_free_parser(librdf_parser *parser) - { -! LIBRDF_ASSERT_OBJECT_POINTER_RETURN(parser, librdf_parser); - - if(parser->context) { - if(parser->factory->terminate) ---- 371,378 ---- - void - librdf_free_parser(librdf_parser *parser) - { -! if(!parser) -! return; - - if(parser->context) { - if(parser->factory->terminate) -diff -cr misc/redland-1.0.7/librdf/rdf_query.c misc/build/redland-1.0.7/librdf/rdf_query.c -*** misc/redland-1.0.7/librdf/rdf_query.c Tue Oct 23 16:55:06 2007 ---- misc/build/redland-1.0.7/librdf/rdf_query.c Mon Apr 28 13:27:03 2008 -*************** -*** 388,394 **** - void - librdf_free_query(librdf_query* query) - { -! LIBRDF_ASSERT_OBJECT_POINTER_RETURN(query, librdf_query); - - if(--query->usage) - return; ---- 388,395 ---- - void - librdf_free_query(librdf_query* query) - { -! if(!query) -! return; - - if(--query->usage) - return; -diff -cr misc/redland-1.0.7/librdf/rdf_query_results.c misc/build/redland-1.0.7/librdf/rdf_query_results.c -*** misc/redland-1.0.7/librdf/rdf_query_results.c Fri Oct 26 04:23:36 2007 ---- misc/build/redland-1.0.7/librdf/rdf_query_results.c Mon Apr 28 13:27:03 2008 -*************** -*** 244,250 **** - void - librdf_free_query_results(librdf_query_results* query_results) - { -! LIBRDF_ASSERT_OBJECT_POINTER_RETURN(query_results, librdf_query_results); - - if(query_results->query->factory->free_results) - query_results->query->factory->free_results(query_results); ---- 244,251 ---- - void - librdf_free_query_results(librdf_query_results* query_results) - { -! if(!query_results) -! return; - - if(query_results->query->factory->free_results) - query_results->query->factory->free_results(query_results); -*************** -*** 636,641 **** ---- 637,644 ---- - void - librdf_free_query_results_formatter(librdf_query_results_formatter* formatter) - { -+ if(!formatter) -+ return; - if(formatter->query_results->query->factory->free_results_formatter) - formatter->query_results->query->factory->free_results_formatter(formatter); - } -diff -cr misc/redland-1.0.7/librdf/rdf_serializer.c misc/build/redland-1.0.7/librdf/rdf_serializer.c -*** misc/redland-1.0.7/librdf/rdf_serializer.c Tue Oct 23 16:55:06 2007 ---- misc/build/redland-1.0.7/librdf/rdf_serializer.c Mon Apr 28 13:27:03 2008 -*************** -*** 373,379 **** - void - librdf_free_serializer(librdf_serializer *serializer) - { -! LIBRDF_ASSERT_OBJECT_POINTER_RETURN(serializer, librdf_serializer); - - if(serializer->context) { - if(serializer->factory->terminate) ---- 373,380 ---- - void - librdf_free_serializer(librdf_serializer *serializer) - { -! if(!serializer) -! return; - - if(serializer->context) { - if(serializer->factory->terminate) -diff -cr misc/redland-1.0.7/librdf/rdf_statement.c misc/build/redland-1.0.7/librdf/rdf_statement.c -*** misc/redland-1.0.7/librdf/rdf_statement.c Tue Nov 6 16:26:18 2007 ---- misc/build/redland-1.0.7/librdf/rdf_statement.c Mon Apr 28 13:27:03 2008 -*************** -*** 255,261 **** - librdf_world *world; - #endif - -! LIBRDF_ASSERT_OBJECT_POINTER_RETURN(statement, librdf_statement); - - #ifdef WITH_THREADS - world = statement->world; ---- 255,262 ---- - librdf_world *world; - #endif - -! if(!statement) -! return; - - #ifdef WITH_THREADS - world = statement->world; -diff -cr misc/redland-1.0.7/librdf/rdf_storage.c misc/build/redland-1.0.7/librdf/rdf_storage.c -*** misc/redland-1.0.7/librdf/rdf_storage.c Thu Dec 20 22:39:42 2007 ---- misc/build/redland-1.0.7/librdf/rdf_storage.c Mon Apr 28 13:27:03 2008 -*************** -*** 608,614 **** - void - librdf_free_storage (librdf_storage* storage) - { -! LIBRDF_ASSERT_OBJECT_POINTER_RETURN(storage, librdf_storage); - - if(--storage->usage) - return; ---- 608,615 ---- - void - librdf_free_storage (librdf_storage* storage) - { -! if(!storage) -! return; - - if(--storage->usage) - return; -diff -cr misc/redland-1.0.7/librdf/rdf_storage_hashes.c misc/build/redland-1.0.7/librdf/rdf_storage_hashes.c -*** misc/redland-1.0.7/librdf/rdf_storage_hashes.c Thu Dec 20 22:39:42 2007 ---- misc/build/redland-1.0.7/librdf/rdf_storage_hashes.c Tue May 6 14:06:56 2008 -*************** -*** 1389,1394 **** ---- 1389,1454 ---- - LIBRDF_STATEMENT_OBJECT); - } - -+ -+ /* return -1 on failure, 1 if context contains stmt, 0 if not */ -+ static int -+ librdf_storage_hashes_context_contains_statement(librdf_storage* storage, -+ librdf_node* context_node, -+ librdf_statement* statement) -+ { -+ librdf_storage_hashes_context* context=(librdf_storage_hashes_context*)storage->context; -+ librdf_hash_datum key, value; /* on stack - not allocated */ -+ size_t size; -+ int status; -+ -+ if(context->contexts_index < 0) { -+ librdf_log(storage->world, 0, LIBRDF_LOG_WARN, LIBRDF_FROM_STORAGE, NULL, -+ "Storage was created without context support"); -+ return -1; -+ } -+ -+ /* ENCODE KEY */ -+ size=librdf_node_encode(context_node, NULL, 0); -+ if (!size) -+ return -1; -+ key.data=(char*)LIBRDF_MALLOC(cstring, size); -+ if (!key.data) -+ return -1; -+ key.size=librdf_node_encode(context_node, -+ (unsigned char*)key.data, size); -+ if (!key.size) { -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ -+ /* ENCODE VALUE */ -+ size=librdf_statement_encode(statement, NULL, 0); -+ if (!size) { -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ value.data=(char*)LIBRDF_MALLOC(cstring, size); -+ if (!value.data) { -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ value.size=librdf_statement_encode(statement, (unsigned char*)value.data, size); -+ if (!value.size) { -+ LIBRDF_FREE(data, value.data); -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ -+ status=librdf_hash_exists(context->hashes[context->contexts_index], &key, &value); -+ LIBRDF_FREE(data, value.data); -+ LIBRDF_FREE(data, key.data); -+ -+ /* DO NOT free statement, ownership was not passed in */ -+ return status; -+ } -+ -+ -+ - /** - * librdf_storage_hashes_context_add_statement: - * @storage: #librdf_storage object -*************** -*** 1414,1420 **** - "Storage was created without context support"); - return 1; - } -! - if(librdf_storage_hashes_add_remove_statement(storage, - statement, context_node, 1)) - return 1; ---- 1474,1488 ---- - "Storage was created without context support"); - return 1; - } -! -! /* Do not add duplicate statements */ -! status=librdf_storage_hashes_context_contains_statement(storage, context_node, statement); -! if(status) -! if(status < 0) -! return 1; -! else -! return 0; -! - if(librdf_storage_hashes_add_remove_statement(storage, - statement, context_node, 1)) - return 1; -*************** -*** 1595,1601 **** - { - librdf_storage_hashes_context_serialise_stream_context* scontext=(librdf_storage_hashes_context_serialise_stream_context*)context; - librdf_hash_datum* v; -- librdf_node** cnp=NULL; - - switch(flags) { - case LIBRDF_ITERATOR_GET_METHOD_GET_OBJECT: ---- 1595,1600 ---- -*************** -*** 1608,1627 **** - return scontext->context_node; - } - -! /* current stuff is out of date - get new cached answers */ -! if(scontext->index_contexts) { -! if(scontext->context_node) -! librdf_free_node(scontext->context_node); -! scontext->context_node=NULL; -! cnp=&scontext->context_node; -! } -! - librdf_statement_clear(&scontext->current); - - v=(librdf_hash_datum*)librdf_iterator_get_value(scontext->iterator); -! - /* decode value content and optional context */ -! if(!librdf_statement_decode_parts(&scontext->current, cnp, - (unsigned char*)v->data, v->size)) { - return NULL; - } ---- 1607,1620 ---- - return scontext->context_node; - } - -! /* note: scontext->context_node is still valid */ -! - librdf_statement_clear(&scontext->current); - - v=(librdf_hash_datum*)librdf_iterator_get_value(scontext->iterator); -! - /* decode value content and optional context */ -! if(!librdf_statement_decode_parts(&scontext->current, NULL, - (unsigned char*)v->data, v->size)) { - return NULL; - } -diff -cr misc/redland-1.0.7/librdf/rdf_storage_list.c misc/build/redland-1.0.7/librdf/rdf_storage_list.c -*** misc/redland-1.0.7/librdf/rdf_storage_list.c Thu Dec 20 22:39:42 2007 ---- misc/build/redland-1.0.7/librdf/rdf_storage_list.c Mon Apr 28 13:27:21 2008 -*************** -*** 459,464 **** ---- 459,522 ---- - } - - -+ /* return -1 on failure, 1 if context contains stmt, 0 if not */ -+ static int -+ librdf_storage_list_context_contains_statement(librdf_storage* storage, -+ librdf_node* context_node, -+ librdf_statement* statement) -+ { -+ librdf_storage_list_context* context=(librdf_storage_list_context*)storage->context; -+ librdf_hash_datum key, value; /* on stack - not allocated */ -+ size_t size; -+ int status; -+ -+ if(!context->index_contexts) { -+ librdf_log(storage->world, 0, LIBRDF_LOG_WARN, LIBRDF_FROM_STORAGE, NULL, -+ "Storage was created without context support"); -+ return -1; -+ } -+ -+ /* ENCODE KEY */ -+ size=librdf_node_encode(context_node, NULL, 0); -+ if (!size) -+ return -1; -+ key.data=(char*)LIBRDF_MALLOC(cstring, size); -+ if (!key.data) -+ return -1; -+ key.size=librdf_node_encode(context_node, -+ (unsigned char*)key.data, size); -+ if (!key.size) { -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ -+ /* ENCODE VALUE */ -+ size=librdf_statement_encode(statement, NULL, 0); -+ if (!size) { -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ value.data=(char*)LIBRDF_MALLOC(cstring, size); -+ if (!value.data) { -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ value.size=librdf_statement_encode(statement, (unsigned char*)value.data, size); -+ if (!value.size) { -+ LIBRDF_FREE(data, value.data); -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ -+ status=librdf_hash_exists(context->contexts, &key, &value); -+ LIBRDF_FREE(data, value.data); -+ LIBRDF_FREE(data, key.data); -+ -+ /* DO NOT free statement, ownership was not passed in */ -+ return status; -+ } -+ -+ - /** - * librdf_storage_list_context_add_statement: - * @storage: #librdf_storage object -*************** -*** 485,491 **** - "Storage was created without context support"); - return 1; - } -! - /* Store statement + node in the storage_list */ - sln=(librdf_storage_list_node*)LIBRDF_MALLOC(librdf_storage_list_node, sizeof(librdf_storage_list_node)); - if(!sln) ---- 543,557 ---- - "Storage was created without context support"); - return 1; - } -! -! /* Do not add duplicate statements */ -! status=librdf_storage_list_context_contains_statement(storage, context_node, statement); -! if(status) -! if(status < 0) -! return 1; -! else -! return 0; -! - /* Store statement + node in the storage_list */ - sln=(librdf_storage_list_node*)LIBRDF_MALLOC(librdf_storage_list_node, sizeof(librdf_storage_list_node)); - if(!sln) -diff -cr misc/redland-1.0.7/librdf/rdf_stream.c misc/build/redland-1.0.7/librdf/rdf_stream.c -*** misc/redland-1.0.7/librdf/rdf_stream.c Mon Dec 24 00:23:10 2007 ---- misc/build/redland-1.0.7/librdf/rdf_stream.c Mon Apr 28 13:27:03 2008 -*************** -*** 126,131 **** ---- 126,134 ---- - void - librdf_free_stream(librdf_stream* stream) - { -+ if(!stream) -+ return; -+ - if(stream->finished_method) - stream->finished_method(stream->context); - -diff -cr misc/redland-1.0.7/librdf/rdf_uri.c misc/build/redland-1.0.7/librdf/rdf_uri.c -*** misc/redland-1.0.7/librdf/rdf_uri.c Tue Oct 23 16:55:06 2007 ---- misc/build/redland-1.0.7/librdf/rdf_uri.c Mon Apr 28 13:27:03 2008 -*************** -*** 409,415 **** - librdf_world *world; - #endif - -! LIBRDF_ASSERT_OBJECT_POINTER_RETURN(uri, librdf_uri); - - #ifdef WITH_THREADS - world = uri->world; ---- 409,416 ---- - librdf_world *world; - #endif - -! if(!uri) -! return; - - #ifdef WITH_THREADS - world = uri->world; +--- misc/redland-1.0.7/LICENSE.txt Wed May 2 07:45:42 2007 ++++ misc/build/redland-1.0.7/LICENSE.txt Mon Jun 16 15:55:51 2008 +@@ -77,3 +77,15 @@ + 10. NOTICE + 11. http://purl.org/net/dajobe/ + 12. http://www.bristol.ac.uk/ ++ ++ ++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. ++ +--- misc/redland-1.0.7/librdf/makefile.mk Mon Jun 16 19:32:46 2008 ++++ misc/build/redland-1.0.7/librdf/makefile.mk Mon Jun 16 19:26:20 2008 +@@ -1,1 +1,114 @@ +-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: redland-1.0.7.patch,v $ ++# ++# $Revision: 1.2 $ ++# ++# 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 ++# ++# for a copy of the LGPLv3 License. ++# ++#************************************************************************* ++ ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=redland ++TARGET=librdf ++LIBTARGET=NO ++ ++EXTERNAL_WARNINGS_NOT_ERRORS=TRUE ++ ++ ++# --- Settings ----------------------------------------------------- ++ ++.INCLUDE : settings.mk ++ ++CDEFS+=-DLIBRDF_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS ++ ++# --- Files -------------------------------------------------------- ++ ++SLOFILES = \ ++ $(SLO)$/rdf_concepts.obj \ ++ $(SLO)$/rdf_digest.obj \ ++ $(SLO)$/rdf_digest_md5.obj \ ++ $(SLO)$/rdf_digest_openssl.obj \ ++ $(SLO)$/rdf_digest_sha1.obj \ ++ $(SLO)$/rdf_files.obj \ ++ $(SLO)$/rdf_hash.obj \ ++ $(SLO)$/rdf_hash_cursor.obj \ ++ $(SLO)$/rdf_hash_memory.obj \ ++ $(SLO)$/rdf_heuristics.obj \ ++ $(SLO)$/rdf_init.obj \ ++ $(SLO)$/rdf_iterator.obj \ ++ $(SLO)$/rdf_list.obj \ ++ $(SLO)$/rdf_log.obj \ ++ $(SLO)$/rdf_model.obj \ ++ $(SLO)$/rdf_model_storage.obj \ ++ $(SLO)$/rdf_node.obj \ ++ $(SLO)$/rdf_parser.obj \ ++ $(SLO)$/rdf_parser_raptor.obj \ ++ $(SLO)$/rdf_query.obj \ ++ $(SLO)$/rdf_query_rasqal.obj \ ++ $(SLO)$/rdf_query_results.obj \ ++ $(SLO)$/rdf_query_triples.obj \ ++ $(SLO)$/rdf_serializer.obj \ ++ $(SLO)$/rdf_serializer_raptor.obj \ ++ $(SLO)$/rdf_statement.obj \ ++ $(SLO)$/rdf_storage.obj \ ++ $(SLO)$/rdf_storage_file.obj \ ++ $(SLO)$/rdf_storage_list.obj \ ++ $(SLO)$/rdf_storage_hashes.obj \ ++ $(SLO)$/rdf_stream.obj \ ++ $(SLO)$/rdf_uri.obj \ ++ $(SLO)$/rdf_utf8.obj \ ++ ++ ++# $(SLO)$/rdf_hash_bdb.obj \ ++# $(SLO)$/rdf_storage_mysql.obj \ ++# $(SLO)$/rdf_storage_sqlite.obj \ ++ ++ ++SHL1DEPN= makefile.mk ++SHL1OBJS= $(SLOFILES) ++ ++#SHL1TARGET= $(TARGET)$(DLLPOSTFIX) ++SHL1TARGET= $(TARGET) ++SHL1IMPLIB= $(TARGET) ++SHL1USE_EXPORTS=name ++ ++#SHL1VERSIONMAP=../service/exports.map ++SHL1DEF=$(MISC)$/$(SHL1TARGET).def ++DEF1NAME=$(SHL1TARGET) ++ ++SHL1STDLIBS= \ ++ $(OPENSSLLIB) \ ++ $(PRJ)$/$(INPATH)$/lib$/libraptor.lib \ ++ $(PRJ)$/$(INPATH)$/lib$/librasqal.lib \ ++ ++ ++#$(LIBXML2LIB) \ ++# $(XSLTLIB) \ ++ ++# --- Targets ------------------------------------------------------ ++ ++.INCLUDE : target.mk ++ +--- misc/redland-1.0.7/librdf/rdf_digest.c Wed Dec 5 18:25:18 2007 ++++ misc/build/redland-1.0.7/librdf/rdf_digest.c Mon Jun 16 15:55:51 2008 +@@ -250,6 +250,8 @@ + void + librdf_free_digest(librdf_digest *digest) + { ++ if(!digest) ++ return; + if(digest->context) + LIBRDF_FREE(digest_context, digest->context); + if(digest->digest) +--- misc/redland-1.0.7/librdf/rdf_hash.c Thu Dec 20 22:39:42 2007 ++++ misc/build/redland-1.0.7/librdf/rdf_hash.c Mon Jun 16 15:55:51 2008 +@@ -490,6 +490,8 @@ + void + librdf_free_hash(librdf_hash* hash) + { ++ if(!hash) ++ return; + if(hash->context) { + if(hash->is_open) + librdf_hash_close(hash); +--- misc/redland-1.0.7/librdf/rdf_init.c Tue Nov 6 16:26:18 2007 ++++ misc/build/redland-1.0.7/librdf/rdf_init.c Mon Jun 16 15:55:51 2008 +@@ -178,6 +178,9 @@ + void + librdf_free_world(librdf_world *world) + { ++ if(!world) ++ return; ++ + /* NOTE: raptor is always initialised as a parser and may + * be also used as a serializer, but it is NOT finished + * in the serializer_raptor registration. Therefore, always +--- misc/redland-1.0.7/librdf/rdf_list.c Thu Dec 20 22:39:42 2007 ++++ misc/build/redland-1.0.7/librdf/rdf_list.c Mon Jun 16 15:55:51 2008 +@@ -108,6 +108,8 @@ + void + librdf_free_list(librdf_list* list) + { ++ if(!list) ++ return; + LIBRDF_ASSERT_RETURN(list->iterator_count, + "Iterators were active on freeing list", ); + +--- misc/redland-1.0.7/librdf/rdf_model.c Tue Oct 23 16:55:06 2007 ++++ misc/build/redland-1.0.7/librdf/rdf_model.c Mon Jun 16 15:55:51 2008 +@@ -393,7 +393,8 @@ + librdf_iterator* iterator; + librdf_model* m; + +- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(model, librdf_model); ++ if(!model) ++ return; + + if(--model->usage) + return; +--- misc/redland-1.0.7/librdf/rdf_node.c Thu Dec 20 22:39:42 2007 ++++ misc/build/redland-1.0.7/librdf/rdf_node.c Mon Jun 16 15:55:51 2008 +@@ -726,7 +726,8 @@ + librdf_world *world; + #endif + +- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(node, librdf_node); ++ if(!node) ++ return; + + #ifdef WITH_THREADS + world = node->world; +--- misc/redland-1.0.7/librdf/rdf_parser.c Mon Dec 17 08:19:11 2007 ++++ misc/build/redland-1.0.7/librdf/rdf_parser.c Mon Jun 16 15:55:51 2008 +@@ -371,7 +371,8 @@ + void + librdf_free_parser(librdf_parser *parser) + { +- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(parser, librdf_parser); ++ if(!parser) ++ return; + + if(parser->context) { + if(parser->factory->terminate) +--- misc/redland-1.0.7/librdf/rdf_query.c Tue Oct 23 16:55:06 2007 ++++ misc/build/redland-1.0.7/librdf/rdf_query.c Mon Jun 16 15:55:51 2008 +@@ -388,7 +388,8 @@ + void + librdf_free_query(librdf_query* query) + { +- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(query, librdf_query); ++ if(!query) ++ return; + + if(--query->usage) + return; +--- misc/redland-1.0.7/librdf/rdf_query_results.c Fri Oct 26 04:23:36 2007 ++++ misc/build/redland-1.0.7/librdf/rdf_query_results.c Mon Jun 16 15:55:51 2008 +@@ -244,7 +244,8 @@ + void + librdf_free_query_results(librdf_query_results* query_results) + { +- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(query_results, librdf_query_results); ++ if(!query_results) ++ return; + + if(query_results->query->factory->free_results) + query_results->query->factory->free_results(query_results); +@@ -636,6 +637,8 @@ + void + librdf_free_query_results_formatter(librdf_query_results_formatter* formatter) + { ++ if(!formatter) ++ return; + if(formatter->query_results->query->factory->free_results_formatter) + formatter->query_results->query->factory->free_results_formatter(formatter); + } +--- misc/redland-1.0.7/librdf/rdf_serializer.c Tue Oct 23 16:55:06 2007 ++++ misc/build/redland-1.0.7/librdf/rdf_serializer.c Mon Jun 16 15:55:51 2008 +@@ -373,7 +373,8 @@ + void + librdf_free_serializer(librdf_serializer *serializer) + { +- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(serializer, librdf_serializer); ++ if(!serializer) ++ return; + + if(serializer->context) { + if(serializer->factory->terminate) +--- misc/redland-1.0.7/librdf/rdf_statement.c Tue Nov 6 16:26:18 2007 ++++ misc/build/redland-1.0.7/librdf/rdf_statement.c Mon Jun 16 15:55:51 2008 +@@ -255,7 +255,8 @@ + librdf_world *world; + #endif + +- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(statement, librdf_statement); ++ if(!statement) ++ return; + + #ifdef WITH_THREADS + world = statement->world; +--- misc/redland-1.0.7/librdf/rdf_storage.c Thu Dec 20 22:39:42 2007 ++++ misc/build/redland-1.0.7/librdf/rdf_storage.c Mon Jun 16 15:55:51 2008 +@@ -608,7 +608,8 @@ + void + librdf_free_storage (librdf_storage* storage) + { +- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(storage, librdf_storage); ++ if(!storage) ++ return; + + if(--storage->usage) + return; +--- misc/redland-1.0.7/librdf/rdf_storage_hashes.c Thu Dec 20 22:39:42 2007 ++++ misc/build/redland-1.0.7/librdf/rdf_storage_hashes.c Mon Jun 16 15:55:51 2008 +@@ -1389,6 +1389,66 @@ + LIBRDF_STATEMENT_OBJECT); + } + ++ ++/* return -1 on failure, 1 if context contains stmt, 0 if not */ ++static int ++librdf_storage_hashes_context_contains_statement(librdf_storage* storage, ++ librdf_node* context_node, ++ librdf_statement* statement) ++{ ++ librdf_storage_hashes_context* context=(librdf_storage_hashes_context*)storage->context; ++ librdf_hash_datum key, value; /* on stack - not allocated */ ++ size_t size; ++ int status; ++ ++ if(context->contexts_index < 0) { ++ librdf_log(storage->world, 0, LIBRDF_LOG_WARN, LIBRDF_FROM_STORAGE, NULL, ++ "Storage was created without context support"); ++ return -1; ++ } ++ ++ /* ENCODE KEY */ ++ size=librdf_node_encode(context_node, NULL, 0); ++ if (!size) ++ return -1; ++ key.data=(char*)LIBRDF_MALLOC(cstring, size); ++ if (!key.data) ++ return -1; ++ key.size=librdf_node_encode(context_node, ++ (unsigned char*)key.data, size); ++ if (!key.size) { ++ LIBRDF_FREE(data, key.data); ++ return -1; ++ } ++ ++ /* ENCODE VALUE */ ++ size=librdf_statement_encode(statement, NULL, 0); ++ if (!size) { ++ LIBRDF_FREE(data, key.data); ++ return -1; ++ } ++ value.data=(char*)LIBRDF_MALLOC(cstring, size); ++ if (!value.data) { ++ LIBRDF_FREE(data, key.data); ++ return -1; ++ } ++ value.size=librdf_statement_encode(statement, (unsigned char*)value.data, size); ++ if (!value.size) { ++ LIBRDF_FREE(data, value.data); ++ LIBRDF_FREE(data, key.data); ++ return -1; ++ } ++ ++ status=librdf_hash_exists(context->hashes[context->contexts_index], &key, &value); ++ LIBRDF_FREE(data, value.data); ++ LIBRDF_FREE(data, key.data); ++ ++ /* DO NOT free statement, ownership was not passed in */ ++ return status; ++} ++ ++ ++ + /** + * librdf_storage_hashes_context_add_statement: + * @storage: #librdf_storage object +@@ -1414,7 +1474,15 @@ + "Storage was created without context support"); + return 1; + } +- ++ ++ /* Do not add duplicate statements */ ++ status=librdf_storage_hashes_context_contains_statement(storage, context_node, statement); ++ if(status) ++ if(status < 0) ++ return 1; ++ else ++ return 0; ++ + if(librdf_storage_hashes_add_remove_statement(storage, + statement, context_node, 1)) + return 1; +@@ -1595,7 +1663,6 @@ + { + librdf_storage_hashes_context_serialise_stream_context* scontext=(librdf_storage_hashes_context_serialise_stream_context*)context; + librdf_hash_datum* v; +- librdf_node** cnp=NULL; + + switch(flags) { + case LIBRDF_ITERATOR_GET_METHOD_GET_OBJECT: +@@ -1608,20 +1675,14 @@ + return scontext->context_node; + } + +- /* current stuff is out of date - get new cached answers */ +- if(scontext->index_contexts) { +- if(scontext->context_node) +- librdf_free_node(scontext->context_node); +- scontext->context_node=NULL; +- cnp=&scontext->context_node; +- } +- ++ /* note: scontext->context_node is still valid */ ++ + librdf_statement_clear(&scontext->current); + + v=(librdf_hash_datum*)librdf_iterator_get_value(scontext->iterator); +- ++ + /* decode value content and optional context */ +- if(!librdf_statement_decode_parts(&scontext->current, cnp, ++ if(!librdf_statement_decode_parts(&scontext->current, NULL, + (unsigned char*)v->data, v->size)) { + return NULL; + } +--- misc/redland-1.0.7/librdf/rdf_storage_list.c Thu Dec 20 22:39:42 2007 ++++ misc/build/redland-1.0.7/librdf/rdf_storage_list.c Mon Jun 16 15:55:51 2008 +@@ -459,6 +459,64 @@ + } + + ++/* return -1 on failure, 1 if context contains stmt, 0 if not */ ++static int ++librdf_storage_list_context_contains_statement(librdf_storage* storage, ++ librdf_node* context_node, ++ librdf_statement* statement) ++{ ++ librdf_storage_list_context* context=(librdf_storage_list_context*)storage->context; ++ librdf_hash_datum key, value; /* on stack - not allocated */ ++ size_t size; ++ int status; ++ ++ if(!context->index_contexts) { ++ librdf_log(storage->world, 0, LIBRDF_LOG_WARN, LIBRDF_FROM_STORAGE, NULL, ++ "Storage was created without context support"); ++ return -1; ++ } ++ ++ /* ENCODE KEY */ ++ size=librdf_node_encode(context_node, NULL, 0); ++ if (!size) ++ return -1; ++ key.data=(char*)LIBRDF_MALLOC(cstring, size); ++ if (!key.data) ++ return -1; ++ key.size=librdf_node_encode(context_node, ++ (unsigned char*)key.data, size); ++ if (!key.size) { ++ LIBRDF_FREE(data, key.data); ++ return -1; ++ } ++ ++ /* ENCODE VALUE */ ++ size=librdf_statement_encode(statement, NULL, 0); ++ if (!size) { ++ LIBRDF_FREE(data, key.data); ++ return -1; ++ } ++ value.data=(char*)LIBRDF_MALLOC(cstring, size); ++ if (!value.data) { ++ LIBRDF_FREE(data, key.data); ++ return -1; ++ } ++ value.size=librdf_statement_encode(statement, (unsigned char*)value.data, size); ++ if (!value.size) { ++ LIBRDF_FREE(data, value.data); ++ LIBRDF_FREE(data, key.data); ++ return -1; ++ } ++ ++ status=librdf_hash_exists(context->contexts, &key, &value); ++ LIBRDF_FREE(data, value.data); ++ LIBRDF_FREE(data, key.data); ++ ++ /* DO NOT free statement, ownership was not passed in */ ++ return status; ++} ++ ++ + /** + * librdf_storage_list_context_add_statement: + * @storage: #librdf_storage object +@@ -485,7 +543,15 @@ + "Storage was created without context support"); + return 1; + } +- ++ ++ /* Do not add duplicate statements */ ++ status=librdf_storage_list_context_contains_statement(storage, context_node, statement); ++ if(status) ++ if(status < 0) ++ return 1; ++ else ++ return 0; ++ + /* Store statement + node in the storage_list */ + sln=(librdf_storage_list_node*)LIBRDF_MALLOC(librdf_storage_list_node, sizeof(librdf_storage_list_node)); + if(!sln) +--- misc/redland-1.0.7/librdf/rdf_stream.c Mon Dec 24 00:23:10 2007 ++++ misc/build/redland-1.0.7/librdf/rdf_stream.c Mon Jun 16 15:55:52 2008 +@@ -126,6 +126,9 @@ + void + librdf_free_stream(librdf_stream* stream) + { ++ if(!stream) ++ return; ++ + if(stream->finished_method) + stream->finished_method(stream->context); + +--- misc/redland-1.0.7/librdf/rdf_uri.c Tue Oct 23 16:55:06 2007 ++++ misc/build/redland-1.0.7/librdf/rdf_uri.c Mon Jun 16 15:55:52 2008 +@@ -409,7 +409,8 @@ + librdf_world *world; + #endif + +- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(uri, librdf_uri); ++ if(!uri) ++ return; + + #ifdef WITH_THREADS + world = uri->world; +--- misc/redland-1.0.7/librdf/win32_rdf_config.h Sun May 6 19:14:36 2007 ++++ misc/build/redland-1.0.7/librdf/win32_rdf_config.h Mon Jun 16 15:55:52 2008 +@@ -45,7 +45,8 @@ + #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 +@@ -74,40 +75,40 @@ + */ + + /* BDB has close method with 2 args */ +-#define HAVE_BDB_CLOSE_2_ARGS 1 ++// #define HAVE_BDB_CLOSE_2_ARGS 1 + + /* BDB defines DBC */ +-#define HAVE_BDB_CURSOR 1 ++// #define HAVE_BDB_CURSOR 1 + + /* BDB cursor method has 4 arguments */ +-#define HAVE_BDB_CURSOR_4_ARGS 1 ++// #define HAVE_BDB_CURSOR_4_ARGS 1 + + /* BDB defines DB_TXN */ +-#define HAVE_BDB_DB_TXN 1 ++// #define HAVE_BDB_DB_TXN 1 + + /* BDB has fd method with 2 args */ +-#define HAVE_BDB_FD_2_ARGS 1 ++// #define HAVE_BDB_FD_2_ARGS 1 + + /* Have BDB hash support */ +-#define HAVE_BDB_HASH 1 ++// #define HAVE_BDB_HASH 1 + + /* BDB has open method with 6 args */ + /* #undef HAVE_BDB_OPEN_6_ARGS */ + + /* BDB has open method with 7 args */ +-#define HAVE_BDB_OPEN_7_ARGS 1 ++// #define HAVE_BDB_OPEN_7_ARGS 1 + + /* BDB has set_flags method */ +-#define HAVE_BDB_SET_FLAGS 1 ++// #define HAVE_BDB_SET_FLAGS 1 + + /* BDB has dbopen method */ + /* #undef HAVE_DBOPEN */ + + /* BDB has db_create method */ +-#define HAVE_DB_CREATE 1 ++// #define HAVE_DB_CREATE 1 + + /* Define to 1 if you have the header file. */ +-#define HAVE_DB_H 1 ++// #define HAVE_DB_H 1 + + /* Define to 1 if you have the header file. */ + /* undef HAVE_DLFCN_H */ +@@ -143,13 +144,13 @@ + /* #undef HAVE_LIBWWW */ + + /* Have local MD5 digest */ +-#define HAVE_LOCAL_MD5_DIGEST 1 ++// #define HAVE_LOCAL_MD5_DIGEST 1 + + /* Have local RIPEMD160 digest */ + /* #undef HAVE_LOCAL_RIPEMD160_DIGEST */ + + /* Have local SHA1 digest */ +-#define HAVE_LOCAL_SHA1_DIGEST 1 ++// #define HAVE_LOCAL_SHA1_DIGEST 1 + + /* Define to 1 if you have the header file. */ + #define HAVE_MEMORY_H 1 +@@ -161,22 +162,27 @@ + #define HAVE_MKTEMP 1 + + /* MySQL libraries are present */ +-#define HAVE_MYSQL 1 ++// #define HAVE_MYSQL 1 + + /* Define to 1 if you have the header file. */ + /* #undef HAVE_OPENSSL_CRYPTO_H */ ++#define HAVE_OPENSSL_CRYPTO_H 1 + + /* Have openssl MD5 digest */ + /* #undef HAVE_OPENSSL_CRYPTO_MD5_DIGEST */ ++#define HAVE_OPENSSL_CRYPTO_MD5_DIGEST 1 + + /* Have openssl RIPEMD160 digest */ + /* #undef HAVE_OPENSSL_CRYPTO_RIPEMD160_DIGEST */ ++#define HAVE_OPENSSL_CRYPTO_RIPEMD160_DIGEST 1 + + /* Have openssl SHA1 digest */ + /* #undef HAVE_OPENSSL_CRYPTO_SHA1_DIGEST */ ++#define HAVE_OPENSSL_CRYPTO_SHA1_DIGEST 1 + + /* Have openssl digests */ + /* #undef HAVE_OPENSSL_DIGESTS */ ++#define HAVE_OPENSSL_DIGESTS 1 + + /* Define to 1 if you have the header file. */ + /* #undef HAVE_PTHREAD_H */ +@@ -248,7 +254,7 @@ + #define SIZEOF_UNSIGNED_LONG_LONG 8 + + /* SQLite API version */ +-#define SQLITE_API 3 ++// #define SQLITE_API 3 + + /* Define to 1 if you have the ANSI C header files. */ + #define STDC_HEADERS 1 +@@ -256,14 +262,17 @@ + /* Building file storage */ + #define STORAGE_FILE 1 + ++#define STORAGE_HASHES 1 ++#define STORAGE_MEMORY 1 ++ + /* Building MySQL storage */ +-#define STORAGE_MYSQL 1 ++// #define STORAGE_MYSQL 1 + + /* Building PostgreSQL storage */ + /*#undef STORAGE_POSTGRESQL*/ + + /* Building SQLite storage */ +-#define STORAGE_SQLITE 1 ++// #define STORAGE_SQLITE 1 + + /* Building 3store storage */ + /*#undef STORAGE_TSTORE*/ +--- misc/redland-1.0.7/raptor/LICENSE.txt Fri Mar 23 06:28:24 2007 ++++ misc/build/redland-1.0.7/raptor/LICENSE.txt Mon Jun 16 15:55:52 2008 +@@ -61,3 +61,15 @@ + + Copyright (C) 2000-2007 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. ++ +--- misc/redland-1.0.7/rasqal/LICENSE.txt Sun Apr 22 23:09:08 2007 ++++ misc/build/redland-1.0.7/rasqal/LICENSE.txt Mon Jun 16 15:55:52 2008 +@@ -61,3 +61,15 @@ + + Copyright (C) 2003-2007 Dave Beckett + Copyright (C) 2003-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/redland/makefile.mk b/redland/redland/makefile.mk index 92b16e31b9ab..a91b8fd4ce54 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: mst $ $Date: 2008-06-16 11:38:21 $ +# last change: $Author: mst $ $Date: 2008-06-17 16:12:51 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -52,9 +52,11 @@ all: REDLANDVERSION=1.0.7 -TARFILE_NAME=$(PRJNAME)-$(REDLANDVERSION) +TARFILE_NAME=redland-$(REDLANDVERSION) PATCH_FILE_NAME=$(TARFILE_NAME).patch +ADDITIONAL_FILES=librdf/makefile.mk + .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" @@ -88,6 +90,10 @@ LDFLAGS+:=-L$(SOLARLIBDIR) -L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -l .ENDIF .ENDIF # "$(SYSBASE)"!="" +.IF "$(OS)"=="MACOSX" +LDFLAGS+:=-Wl,-dylib_file,@loader_path/libraptor.1.dylib:$(PWD)/$(LB)/libraptor.1.dylib +.ENDIF + CPPFLAGS+:=$(EXTRA_CFLAGS) LDFLAGS+:=$(EXTRA_LINKFLAGS) XSLTLIB:=$(XSLTLIB) -- cgit v1.2.3 From 42838436d82fbd61a41cefdc883302051a9dd88b Mon Sep 17 00:00:00 2001 From: mst Date: Thu, 26 Jun 2008 09:52:14 +0000 Subject: - redland/redlandversion.mk: + add new include makefile for soname versioning - redland/*/makefile.mk, redland/prj/d.lst: + include and deliver redlandversion.mk --- redland/prj/d.lst | 1 + redland/raptor/makefile.mk | 9 ++++++--- redland/rasqal/makefile.mk | 7 +++++-- redland/redland/makefile.mk | 7 +++++-- redland/redlandversion.mk | 43 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 60 insertions(+), 7 deletions(-) create mode 100644 redland/redlandversion.mk (limited to 'redland') diff --git a/redland/prj/d.lst b/redland/prj/d.lst index 622e83e038f5..681b83717500 100644 --- a/redland/prj/d.lst +++ b/redland/prj/d.lst @@ -4,3 +4,4 @@ ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT% ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT% +..\redlandversion.mk %_DEST%\inc%_EXT%\redlandversion.mk diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index b454aa96efab..be51b4e2f738 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: mst $ $Date: 2008-06-17 16:12:51 $ +# last change: $Author: mst $ $Date: 2008-06-26 10:52:14 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -50,7 +50,10 @@ all: # --- Files -------------------------------------------------------- -RAPTORVERSION=1.4.17 +.INCLUDE : ../redlandversion.mk + +#RAPTORVERSION=$(RAPTOR_MAJOR).$(RAPTOR_MINOR).$(RAPTOR_MICRO) +RAPTORVERSION=$(RAPTOR_MAJOR).4.17 TARFILE_NAME=raptor-$(RAPTORVERSION) PATCH_FILE_NAME=$(TARFILE_NAME).patch diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index 9e25f27c86a0..017256636eda 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: mst $ $Date: 2008-06-17 16:12:51 $ +# last change: $Author: mst $ $Date: 2008-06-26 10:52:14 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -50,6 +50,9 @@ all: # --- Files -------------------------------------------------------- +.INCLUDE : ../redlandversion.mk + +#RASQALVERSION=$(RASQAL_MAJOR).$(RASQAL_MINOR).$(RASQAL_MICRO) RASQALVERSION=0.9.15 TARFILE_NAME=rasqal-$(RASQALVERSION) diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index a91b8fd4ce54..2404f509c84f 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: mst $ $Date: 2008-06-17 16:12:51 $ +# last change: $Author: mst $ $Date: 2008-06-26 10:52:14 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -50,6 +50,9 @@ all: # --- Files -------------------------------------------------------- +.INCLUDE : ../redlandversion.mk + +#REDLANDVERSION=$(REDLAND_MAJOR).$(REDLAND_MINOR).$(REDLAND_MICRO) REDLANDVERSION=1.0.7 TARFILE_NAME=redland-$(REDLANDVERSION) diff --git a/redland/redlandversion.mk b/redland/redlandversion.mk new file mode 100644 index 000000000000..a95bdb82cbea --- /dev/null +++ b/redland/redlandversion.mk @@ -0,0 +1,43 @@ +#************************************************************************* +# +# 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: redlandversion.mk,v $ +# +# $Revision: 1.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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +RAPTOR_MAJOR=1 +RAPTOR_MINOR=1 +RAPTOR_MICRO=0 +# rasqal has no stable abi +RASQAL_MAJOR=0 +RASQAL_MINOR=0 +RASQAL_MICRO=0 +# redland has no stable abi +REDLAND_MAJOR=0 +REDLAND_MINOR=0 +REDLAND_MICRO=0 + -- cgit v1.2.3 From 5781848329d2046a354467fd307c66f66d378e3d Mon Sep 17 00:00:00 2001 From: mst Date: Fri, 27 Jun 2008 08:30:39 +0000 Subject: #i91117# - redland/{rasqal,redland}/makefile.mk: + quote PATH=... argument to configure --- redland/rasqal/makefile.mk | 6 +++--- redland/redland/makefile.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'redland') diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index 017256636eda..dbf535754a1b 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: mst $ $Date: 2008-06-26 10:52:14 $ +# last change: $Author: mst $ $Date: 2008-06-27 09:30:39 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -104,7 +104,7 @@ XSLTLIB:=$(XSLTLIB) .EXPORT: XSLTLIB CONFIGURE_DIR= -CONFIGURE_ACTION=.$/configure PATH=..$/..$/..$/bin:$$PATH +CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" 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 BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 2404f509c84f..3a6fd1184b33 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: mst $ $Date: 2008-06-26 10:52:14 $ +# last change: $Author: mst $ $Date: 2008-06-27 09:30:39 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -108,7 +108,7 @@ XSLTLIB:=$(XSLTLIB) .EXPORT: XSLTLIB CONFIGURE_DIR= -CONFIGURE_ACTION=.$/configure PATH=..$/..$/..$/bin:$$PATH +CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --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) -- cgit v1.2.3 From 18c2304c0d5901d1a6f29c69afd0f50f45b26f10 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Tue, 1 Jul 2008 15:02:25 +0000 Subject: Make module acronym unique. --- redland/prj/build.lst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'redland') diff --git a/redland/prj/build.lst b/redland/prj/build.lst index 29716493d584..54cf90390d96 100644 --- a/redland/prj/build.lst +++ b/redland/prj/build.lst @@ -1,5 +1,5 @@ -rl redland : soltools ZLIB:zlib LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL -rl redland usr1 - all rl_mkout NULL -rl redland\raptor nmake - all rl_raptor NULL -rl redland\rasqal nmake - all rl_rasqal rl_raptor NULL -rl redland\redland nmake - all rl_redland rl_raptor rl_rasqal NULL +rld redland : soltools ZLIB:zlib LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL +rld redland usr1 - all rld_mkout NULL +rld redland\raptor nmake - all rld_raptor NULL +rld redland\rasqal nmake - all rld_rasqal rld_raptor NULL +rld redland\redland nmake - all rld_redland rld_raptor rld_rasqal NULL -- cgit v1.2.3 From 899bf0f5dc08698e0d80fac733f89adb5ae6729d Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Wed, 2 Jul 2008 13:24:19 +0000 Subject: #100000# added missing global depedency --- redland/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'redland') diff --git a/redland/prj/build.lst b/redland/prj/build.lst index 54cf90390d96..a5653f0cf5d4 100644 --- a/redland/prj/build.lst +++ b/redland/prj/build.lst @@ -1,4 +1,4 @@ -rld redland : soltools ZLIB:zlib LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL +rld redland : sal soltools ZLIB:zlib LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL rld redland usr1 - all rld_mkout NULL rld redland\raptor nmake - all rld_raptor NULL rld redland\rasqal nmake - all rld_rasqal rld_raptor NULL -- cgit v1.2.3 From 0b2b3fdc3177d0ffeb16246684fa6b78d1941515 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Wed, 16 Jul 2008 06:55:04 +0000 Subject: #i10000# Correct license header --- redland/raptor/makefile.mk | 42 +++++++++++++++++++----------------------- redland/rasqal/makefile.mk | 42 +++++++++++++++++++----------------------- redland/redland/makefile.mk | 42 +++++++++++++++++++----------------------- 3 files changed, 57 insertions(+), 69 deletions(-) (limited to 'redland') diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index be51b4e2f738..acdbaed3480c 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -1,35 +1,31 @@ #************************************************************************* # -# OpenOffice.org - a multi-platform office productivity suite +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2008 by Sun Microsystems, Inc. # -# $RCSfile: makefile.mk,v $ +# OpenOffice.org - a multi-platform office productivity suite # -# $Revision: 1.3 $ +# $RCSfile: makefile.mk,v $ # -# last change: $Author: mst $ $Date: 2008-06-26 10:52:14 $ +# $Revision: 1.4 $ # -# The Contents of this file are made available subject to -# the terms of GNU Lesser General Public License Version 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. # -# GNU Lesser General Public License Version 2.1 -# ============================================= -# Copyright 2005 by Sun Microsystems, Inc. -# 901 San Antonio Road, Palo Alto, CA 94303, USA +# 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). # -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License version 2.1, as published by the Free Software Foundation. -# -# This library 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 for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. # #************************************************************************* diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index dbf535754a1b..e1e3331b2c87 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -1,35 +1,31 @@ #************************************************************************* # -# OpenOffice.org - a multi-platform office productivity suite +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2008 by Sun Microsystems, Inc. # -# $RCSfile: makefile.mk,v $ +# OpenOffice.org - a multi-platform office productivity suite # -# $Revision: 1.4 $ +# $RCSfile: makefile.mk,v $ # -# last change: $Author: mst $ $Date: 2008-06-27 09:30:39 $ +# $Revision: 1.5 $ # -# The Contents of this file are made available subject to -# the terms of GNU Lesser General Public License Version 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. # -# GNU Lesser General Public License Version 2.1 -# ============================================= -# Copyright 2005 by Sun Microsystems, Inc. -# 901 San Antonio Road, Palo Alto, CA 94303, USA +# 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). # -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License version 2.1, as published by the Free Software Foundation. -# -# This library 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 for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. # #************************************************************************* diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 3a6fd1184b33..aa2552bd0ff4 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -1,35 +1,31 @@ #************************************************************************* # -# OpenOffice.org - a multi-platform office productivity suite +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2008 by Sun Microsystems, Inc. # -# $RCSfile: makefile.mk,v $ +# OpenOffice.org - a multi-platform office productivity suite # -# $Revision: 1.4 $ +# $RCSfile: makefile.mk,v $ # -# last change: $Author: mst $ $Date: 2008-06-27 09:30:39 $ +# $Revision: 1.5 $ # -# The Contents of this file are made available subject to -# the terms of GNU Lesser General Public License Version 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. # -# GNU Lesser General Public License Version 2.1 -# ============================================= -# Copyright 2005 by Sun Microsystems, Inc. -# 901 San Antonio Road, Palo Alto, CA 94303, USA +# 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). # -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License version 2.1, as published by the Free Software Foundation. -# -# This library 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 for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. # #************************************************************************* -- cgit v1.2.3 From 0b04d1472000e7733c46123cbd9e3cc2dd57fbb1 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Thu, 17 Jul 2008 12:38:38 +0000 Subject: INTEGRATION: CWS ause095 (1.3.2); FILE MERGED 2008/07/07 17:12:38 hjs 1.3.2.1: #i90789# - referencing patches changed --- redland/raptor/makefile.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'redland') diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index acdbaed3480c..ff3f28214a5b 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # # This file is part of OpenOffice.org. # @@ -52,7 +52,7 @@ all: RAPTORVERSION=$(RAPTOR_MAJOR).4.17 TARFILE_NAME=raptor-$(RAPTORVERSION) -PATCH_FILE_NAME=$(TARFILE_NAME).patch +PATCH_FILE_NAME=..$/$(TARFILE_NAME).patch ADDITIONAL_FILES=src/makefile.mk -- cgit v1.2.3 From 9a49cdfba4d16da18f473307b29c5a9ce866cc56 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Thu, 17 Jul 2008 12:38:52 +0000 Subject: INTEGRATION: CWS ause095 (1.4.2); FILE MERGED 2008/07/07 17:12:38 hjs 1.4.2.1: #i90789# - referencing patches changed --- redland/rasqal/makefile.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'redland') diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index e1e3331b2c87..d01f265d050d 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # # This file is part of OpenOffice.org. # @@ -52,7 +52,7 @@ all: RASQALVERSION=0.9.15 TARFILE_NAME=rasqal-$(RASQALVERSION) -PATCH_FILE_NAME=$(TARFILE_NAME).patch +PATCH_FILE_NAME=..$/$(TARFILE_NAME).patch ADDITIONAL_FILES=src/makefile.mk -- cgit v1.2.3 From f4640aab87dbe64bb6b2174bd922933655305e7d Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Thu, 17 Jul 2008 12:39:05 +0000 Subject: INTEGRATION: CWS ause095 (1.4.2); FILE MERGED 2008/07/07 17:12:39 hjs 1.4.2.1: #i90789# - referencing patches changed --- redland/redland/makefile.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'redland') diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index aa2552bd0ff4..434bc5e199c3 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # # This file is part of OpenOffice.org. # @@ -52,7 +52,7 @@ all: REDLANDVERSION=1.0.7 TARFILE_NAME=redland-$(REDLANDVERSION) -PATCH_FILE_NAME=$(TARFILE_NAME).patch +PATCH_FILE_NAME=..$/$(TARFILE_NAME).patch ADDITIONAL_FILES=librdf/makefile.mk -- cgit v1.2.3 From 1f69dbce6033666b8a82981e67564ddf8f1b23d3 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Fri, 18 Jul 2008 08:26:06 +0000 Subject: #i91455# Patch by maho to support FreeBSD. --- redland/raptor-1.4.17.patch | 28 +++++++++++++++++++++++++++- redland/rasqal-0.9.15.patch | 28 +++++++++++++++++++++++++++- redland/redland-1.0.7.patch | 28 +++++++++++++++++++++++++++- 3 files changed, 81 insertions(+), 3 deletions(-) (limited to 'redland') diff --git a/redland/raptor-1.4.17.patch b/redland/raptor-1.4.17.patch index 29a90f8635b9..cb0bd22355c2 100644 --- a/redland/raptor-1.4.17.patch +++ b/redland/raptor-1.4.17.patch @@ -30,7 +30,7 @@ +# +# $RCSfile: raptor-1.4.17.patch,v $ +# -+# $Revision: 1.2 $ ++# $Revision: 1.3 $ +# +# This file is part of OpenOffice.org. +# @@ -245,3 +245,29 @@ #include +--- misc/raptor-1.4.17/ltmain.sh 2008-02-02 22:28:24.000000000 +0900 ++++ misc/build/raptor-1.4.17/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/rasqal-0.9.15.patch b/redland/rasqal-0.9.15.patch index 994b60e09c96..08283e290015 100644 --- a/redland/rasqal-0.9.15.patch +++ b/redland/rasqal-0.9.15.patch @@ -30,7 +30,7 @@ +# +# $RCSfile: rasqal-0.9.15.patch,v $ +# -+# $Revision: 1.2 $ ++# $Revision: 1.3 $ +# +# This file is part of OpenOffice.org. +# @@ -199,3 +199,29 @@ #ifdef _DEBUG #define RASQAL_DEBUG 1 #endif +--- misc/rasqal-0.9.15/ltmain.sh 2006-03-12 03:49:04.000000000 +0900 ++++ misc/build/rasqal-0.9.15/ltmain.sh 2008-07-08 12:00:00.000000000 +0900 +@@ -3195,9 +3195,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 - 1` +@@ -3275,8 +3275,8 @@ + ;; + + freebsd-elf) +- major=".$current" +- versuffix=".$current"; ++ major=.`expr $current - $age` ++ versuffix="$major.$age.$revision" + ;; + + irix | nonstopux) diff --git a/redland/redland-1.0.7.patch b/redland/redland-1.0.7.patch index 4f275064f937..26ffa3d10699 100644 --- a/redland/redland-1.0.7.patch +++ b/redland/redland-1.0.7.patch @@ -30,7 +30,7 @@ +# +# $RCSfile: redland-1.0.7.patch,v $ +# -+# $Revision: 1.2 $ ++# $Revision: 1.3 $ +# +# This file is part of OpenOffice.org. +# @@ -684,3 +684,29 @@ +later version may be used, or where a choice of which version of the +LGPL is applied is otherwise unspecified. + +--- misc/redland-1.0.7/ltmain.sh 2007-11-28 06:23:09.000000000 +0900 ++++ misc/build/redland-1.0.7/ltmain.sh 2008-07-08 11:59:22.000000000 +0900 +@@ -3237,9 +3237,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` +@@ -3319,8 +3319,8 @@ + ;; + + freebsd-elf) +- major=".$current" +- versuffix=".$current"; ++ major=.`expr $current - $age` ++ versuffix="$major.$age.$revision" + ;; + + irix | nonstopux) -- cgit v1.2.3 From ce0c2b9232b851455139eae6a17c8198bb463666 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Fri, 18 Jul 2008 08:57:58 +0000 Subject: #i91599# Patch by mst: fix LDFLAGS and CPPFLAGS. --- redland/raptor/makefile.mk | 11 +++++++---- redland/rasqal/makefile.mk | 11 +++++++---- redland/redland/makefile.mk | 11 +++++++---- 3 files changed, 21 insertions(+), 12 deletions(-) (limited to 'redland') diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index ff3f28214a5b..90e27606b5b5 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # # This file is part of OpenOffice.org. # @@ -81,11 +81,14 @@ LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' .ENDIF # "$(OS)$(COM)"=="SOLARISC52" +# NB: SOLARDIR before SYSBASE, because linux SYSBASE contains obsolete libcrypto +CPPFLAGS+:=-I$(SOLARINCDIR)$/external +LDFLAGS+:=-L$(SOLARLIBDIR) + .IF "$(SYSBASE)"!="" -CPPFLAGS+=-I$(SOLARINCDIR)$/external -I$(SYSBASE)$/usr$/include +CPPFLAGS+:=-I$(SYSBASE)$/usr$/include .IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX" -# NB: SOLARLIBDIR is first, because linux SYSBASE contains obsolete libcrypto -LDFLAGS+:=-L$(SOLARLIBDIR) -L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl +LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl .ENDIF .ENDIF # "$(SYSBASE)"!="" diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index d01f265d050d..28905d5945ac 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # # This file is part of OpenOffice.org. # @@ -81,11 +81,14 @@ LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' .ENDIF # "$(OS)$(COM)"=="SOLARISC52" +# NB: SOLARDIR before SYSBASE, because linux SYSBASE contains obsolete libcrypto +CPPFLAGS+:=-I$(SOLARINCDIR)$/external +LDFLAGS+:=-L$(SOLARLIBDIR) + .IF "$(SYSBASE)"!="" -CPPFLAGS+=-I$(SOLARINCDIR)$/external -I$(SYSBASE)$/usr$/include +CPPFLAGS+:=-I$(SYSBASE)$/usr$/include .IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX" -# NB: SOLARLIBDIR is first, because linux SYSBASE contains obsolete libcrypto -LDFLAGS+:=-L$(SOLARLIBDIR) -L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl +LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl .ENDIF .ENDIF # "$(SYSBASE)"!="" diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 434bc5e199c3..59758fd2d936 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # # This file is part of OpenOffice.org. # @@ -81,11 +81,14 @@ LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' .ENDIF # "$(OS)$(COM)"=="SOLARISC52" +# NB: SOLARDIR before SYSBASE, because linux SYSBASE contains obsolete libcrypto +CPPFLAGS+:=-I$(SOLARINCDIR)$/external +LDFLAGS+:=-L$(SOLARLIBDIR) + .IF "$(SYSBASE)"!="" -CPPFLAGS+=-I$(SOLARINCDIR)$/external -I$(SYSBASE)$/usr$/include +CPPFLAGS+:=-I$(SYSBASE)$/usr$/include .IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX" -# NB: SOLARLIBDIR is first, because linux SYSBASE contains obsolete libcrypto -LDFLAGS+:=-L$(SOLARLIBDIR) -L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl +LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl .ENDIF .ENDIF # "$(SYSBASE)"!="" -- cgit v1.2.3 From bb14408835e53eca5a284e27282897dd4fdb4f9f Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Wed, 27 Aug 2008 12:48:54 +0000 Subject: INTEGRATION: CWS sb91 (1.3.4); FILE MERGED 2008/07/21 10:57:23 sb 1.3.4.2: RESYNC: (1.3-1.6); FILE MERGED 2008/07/11 08:43:09 sb 1.3.4.1: #i91567# adapt to unxsolu4 --- redland/raptor/makefile.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'redland') diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 90e27606b5b5..6c082f10d246 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # # This file is part of OpenOffice.org. # @@ -81,6 +81,11 @@ LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' .ENDIF # "$(OS)$(COM)"=="SOLARISC52" +.IF "$(COM)"=="C52" && "$(CPU)"=="U" +CFLAGS=-m64 +.EXPORT: CFLAGS +.ENDIF + # NB: SOLARDIR before SYSBASE, because linux SYSBASE contains obsolete libcrypto CPPFLAGS+:=-I$(SOLARINCDIR)$/external LDFLAGS+:=-L$(SOLARLIBDIR) -- cgit v1.2.3 From a6a6b401c453bd25c7de9a9cbe81dd0e8ce943bc Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Wed, 27 Aug 2008 12:49:07 +0000 Subject: INTEGRATION: CWS sb91 (1.4.4); FILE MERGED 2008/07/21 10:57:35 sb 1.4.4.2: RESYNC: (1.4-1.7); FILE MERGED 2008/07/11 08:43:09 sb 1.4.4.1: #i91567# adapt to unxsolu4 --- redland/rasqal/makefile.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'redland') diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index 28905d5945ac..8f4ec9738cb7 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # # This file is part of OpenOffice.org. # @@ -81,6 +81,11 @@ LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' .ENDIF # "$(OS)$(COM)"=="SOLARISC52" +.IF "$(COM)"=="C52" && "$(CPU)"=="U" +CFLAGS=-m64 +.EXPORT: CFLAGS +.ENDIF + # NB: SOLARDIR before SYSBASE, because linux SYSBASE contains obsolete libcrypto CPPFLAGS+:=-I$(SOLARINCDIR)$/external LDFLAGS+:=-L$(SOLARLIBDIR) -- cgit v1.2.3 From 4f618f4477a49f4246a01098eee3d929f2970a38 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Wed, 27 Aug 2008 12:49:20 +0000 Subject: INTEGRATION: CWS sb91 (1.4.4); FILE MERGED 2008/07/21 10:57:37 sb 1.4.4.2: RESYNC: (1.4-1.7); FILE MERGED 2008/07/11 08:43:09 sb 1.4.4.1: #i91567# adapt to unxsolu4 --- redland/redland/makefile.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'redland') diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 59758fd2d936..7dd2ae30e12b 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # # This file is part of OpenOffice.org. # @@ -81,6 +81,11 @@ LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' .ENDIF # "$(OS)$(COM)"=="SOLARISC52" +.IF "$(COM)"=="C52" && "$(CPU)"=="U" +CFLAGS=-m64 +.EXPORT: CFLAGS +.ENDIF + # NB: SOLARDIR before SYSBASE, because linux SYSBASE contains obsolete libcrypto CPPFLAGS+:=-I$(SOLARINCDIR)$/external LDFLAGS+:=-L$(SOLARLIBDIR) -- cgit v1.2.3 From c30ae0c43180cf994ea09cc283f0d2d7f1b4b259 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Wed, 1 Oct 2008 07:05:18 +0000 Subject: CWS-TOOLING: integrate CWS mingwport15 --- cppunit/source/win32/makefile.mk | 4 +- external/cairo/makefile.mk | 7 +- external/mingwheaders/makefile.mk | 4 +- external/mingwheaders/mingw_headers.patch | 158 ++++++++++++++---------------- redland/prj/d.lst | 1 + redland/raptor-1.4.17.patch | 36 ++++++- redland/raptor/makefile.mk | 14 ++- redland/rasqal-0.9.15.patch | 20 +++- redland/rasqal/makefile.mk | 14 ++- redland/redland-1.0.7.patch | 65 ++++++++++-- redland/redland/makefile.mk | 14 ++- 11 files changed, 208 insertions(+), 129 deletions(-) (limited to 'redland') diff --git a/cppunit/source/win32/makefile.mk b/cppunit/source/win32/makefile.mk index d7e5eb53ee16..59f67b9e2765 100644 --- a/cppunit/source/win32/makefile.mk +++ b/cppunit/source/win32/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.2.2.1 $ # # This file is part of OpenOffice.org. # @@ -52,7 +52,7 @@ LIB1OBJFILES= \ .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" -LIB2ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a +LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a .ENDIF .ENDIF diff --git a/external/cairo/makefile.mk b/external/cairo/makefile.mk index ff8373027657..28815aa12fdd 100644 --- a/external/cairo/makefile.mk +++ b/external/cairo/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.3.16.1 $ # # This file is part of OpenOffice.org. # @@ -50,6 +50,11 @@ dummy: dummy: @echo "Nothing to do (Cairo not enabled)." +.ELIF "$(BUILD_CAIRO)" != "" + +dummy: + @echo "Not using prebuilt binaries, cairo will be built from source." + .ELIF "$(OS)" != "MACOSX" && "$(GUI)" != "WNT" dummy: diff --git a/external/mingwheaders/makefile.mk b/external/mingwheaders/makefile.mk index 8edf89c558fc..00dfd7dab6a5 100644 --- a/external/mingwheaders/makefile.mk +++ b/external/mingwheaders/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.8.10.1 $ # # This file is part of OpenOffice.org. # @@ -68,7 +68,6 @@ FILES_TO_COPY_FROM_W32API=amvideo.h \ winbase.h \ wininet.h \ winnt.h \ - winuser.h \ winver.h \ wtypes.h @@ -126,6 +125,7 @@ FILES_TO_COPY_FROM_PSDK=adoctint.h \ wincrypt.h \ wingdi.h \ winsock2.h \ + winuser.h \ ws2def.h \ ws2ipdef.h \ ws2tcpip.h \ diff --git a/external/mingwheaders/mingw_headers.patch b/external/mingwheaders/mingw_headers.patch index d3bc1e5cbb3a..96a3ccc73d71 100644 --- a/external/mingwheaders/mingw_headers.patch +++ b/external/mingwheaders/mingw_headers.patch @@ -496,90 +496,6 @@ #ifndef VOID #define VOID void ---- include/winuser.h.orig 2006-11-19 08:08:37.000000000 +0900 -+++ include/winuser.h 2007-01-20 00:22:52.765625000 +0900 -@@ -950,12 +950,14 @@ - #define SM_SLOWMACHINE 73 - #define SM_MIDEASTENABLED 74 - #define SM_MOUSEWHEELPRESENT 75 -+#if (WINVER >= 0x0500) - #define SM_XVIRTUALSCREEN 76 - #define SM_YVIRTUALSCREEN 77 - #define SM_CXVIRTUALSCREEN 78 - #define SM_CYVIRTUALSCREEN 79 - #define SM_CMONITORS 80 - #define SM_SAMEDISPLAYFORMAT 81 -+#endif - #define SM_IMMENABLED 82 - #define SM_CXFOCUSBORDER 83 - #define SM_CYFOCUSBORDER 84 -@@ -2473,7 +2475,9 @@ - typedef BOOL(CALLBACK *DRAWSTATEPROC)(HDC,LPARAM,WPARAM,int,int); - typedef BOOL(CALLBACK *WNDENUMPROC)(HWND,LPARAM); - typedef BOOL(CALLBACK *ENUMWINDOWSPROC)(HWND,LPARAM); -+#if (WINVER >= 0x0500) - typedef BOOL(CALLBACK* MONITORENUMPROC)(HMONITOR,HDC,LPRECT,LPARAM); -+#endif - typedef BOOL(CALLBACK *NAMEENUMPROCA)(LPSTR,LPARAM); - typedef BOOL(CALLBACK *NAMEENUMPROCW)(LPWSTR,LPARAM); - typedef NAMEENUMPROCA DESKTOPENUMPROCA; -@@ -3149,6 +3153,7 @@ - UINT cbSize; - DWORD dwTime; - } LASTINPUTINFO,*PLASTINPUTINFO; -+#if (WINVER >= 0x0500) - typedef struct tagMONITORINFO { - DWORD cbSize; - RECT rcMonitor; -@@ -3181,6 +3186,7 @@ - WCHAR szDevice[CCHDEVICENAME]; - } MONITORINFOEXW,*LPMONITORINFOEXW; - #endif /* __cplusplus */ -+#endif - typedef struct tagKBDLLHOOKSTRUCT { - DWORD vkCode; - DWORD scanCode; -@@ -3549,7 +3555,9 @@ - WINUSERAPI BOOL WINAPI EnumDesktopsA(HWINSTA,DESKTOPENUMPROCA,LPARAM); - WINUSERAPI BOOL WINAPI EnumDesktopsW(HWINSTA,DESKTOPENUMPROCW,LPARAM); - WINUSERAPI BOOL WINAPI EnumDesktopWindows(HDESK,ENUMWINDOWSPROC,LPARAM); -+#if (WINVER >= 0x0500) - WINUSERAPI BOOL WINAPI EnumDisplayMonitors(HDC,LPCRECT,MONITORENUMPROC,LPARAM); -+#endif - #ifndef NOGDI - WINUSERAPI BOOL WINAPI EnumDisplaySettingsA(LPCSTR,DWORD,PDEVMODEA); - WINUSERAPI BOOL WINAPI EnumDisplaySettingsW(LPCWSTR,DWORD,PDEVMODEW); -@@ -3741,8 +3749,10 @@ - WINUSERAPI BOOL WINAPI GetTitleBarInfo(HWND,PTITLEBARINFO); - #endif - WINUSERAPI BOOL WINAPI GetWindowInfo(HWND,PWINDOWINFO); -+#if (WINVER >= 0x0500) - WINUSERAPI BOOL WINAPI GetMonitorInfoA(HMONITOR,LPMONITORINFO); - WINUSERAPI BOOL WINAPI GetMonitorInfoW(HMONITOR,LPMONITORINFO); -+#endif - WINUSERAPI UINT WINAPI GetWindowModuleFileNameA(HWND,LPSTR,UINT); - WINUSERAPI UINT WINAPI GetWindowModuleFileNameW(HWND,LPWSTR,UINT); - WINUSERAPI BOOL WINAPI GrayStringA(HDC,HBRUSH,GRAYSTRINGPROC,LPARAM,int,int,int,int,int); -@@ -4093,7 +4103,9 @@ - typedef CBT_CREATEWNDW CBT_CREATEWND, *LPCBT_CREATEWND; - typedef MDICREATESTRUCTW MDICREATESTRUCT,*LPMDICREATESTRUCT; - typedef MULTIKEYHELPW MULTIKEYHELP,*PMULTIKEYHELP,*LPMULTIKEYHELP; -+#if (WINVER >= 0x0500) - typedef MONITORINFOEXW MONITORINFOEX, *LPMONITORINFOEX; -+#endif - #define AppendMenu AppendMenuW - #define BroadcastSystemMessage BroadcastSystemMessageW - #define BroadcastSystemMessageEx BroadcastSystemMessageExW -@@ -4258,7 +4270,9 @@ - typedef CBT_CREATEWNDA CBT_CREATEWND, *LPCBT_CREATEWND; - typedef MDICREATESTRUCTA MDICREATESTRUCT,*LPMDICREATESTRUCT; - typedef MULTIKEYHELPA MULTIKEYHELP,*PMULTIKEYHELP,*LPMULTIKEYHELP; -+#if (WINVER >= 0x0500) - typedef MONITORINFOEXA MONITORINFOEX, *LPMONITORINFOEX; -+#endif - #define AppendMenu AppendMenuA - #define BroadcastSystemMessage BroadcastSystemMessageA - #define BroadcastSystemMessageEx BroadcastSystemMessageExA --- include/winver.h.orig 2006-03-26 09:21:36.000000000 +0900 +++ include/winver.h 2006-03-26 09:21:42.000000000 +0900 @@ -101,10 +101,10 @@ @@ -2410,7 +2326,7 @@ --- include/specstrings.h.orig 2008-01-18 22:17:38.000000000 +0900 +++ include/specstrings.h 2008-03-26 22:08:28.484125000 +0900 -@@ -6,7 +6,105 @@ +@@ -6,7 +6,106 @@ #if _MSC_VER #pragma once #endif @@ -2475,6 +2391,7 @@ +#define __inout_bcount_full(x) +#define __inout_bcount_opt(x) +#define __inout_bcount_part(x,y) ++#define __inout_bcount_part_opt(x,y) +#define __inout_ecount(x) +#define __inout_ecount_opt(x) +#define __inout_opt @@ -2924,6 +2841,77 @@ +#endif /* _WINSOCK2_H */ +--- include/winuser.h.orig 2008-07-19 14:56:51.278750000 +0900 ++++ include/winuser.h 2008-07-20 08:20:08.111750000 +0900 +@@ -11,6 +11,15 @@ + #ifndef _WINUSER_ + #define _WINUSER_ + ++#define __in ++#define __out ++#ifdef __cplusplus ++#define __inline inline ++#else ++#define __inline static ++#endif ++DECLARE_HANDLE(HHOOK); ++typedef CONST GUID *LPCGUID; + + + #pragma once +@@ -39,7 +48,7 @@ + #define WINVER 0x0500 /* version 5.0 */ + #endif /* !WINVER */ + +-#include ++#include <../include/stdarg.h> + + #ifndef NOUSER + +@@ -215,6 +224,8 @@ + #pragma warning(disable:4995) + #endif + ++WINUSERAPI UINT WINAPI WinExec(LPCSTR,UINT); ++ + WINUSERAPI + int + WINAPI +@@ -10717,7 +10728,7 @@ + #define CDS_RESET 0x40000000 + #define CDS_NORESET 0x10000000 + +-#include ++//#include + + /* Return values for ChangeDisplaySettings */ + #define DISP_CHANGE_SUCCESSFUL 0 +@@ -12571,16 +12582,20 @@ + + + +-#if !defined(RC_INVOKED) /* RC complains about long symbols in #ifs */ +-#if defined(ISOLATION_AWARE_ENABLED) && (ISOLATION_AWARE_ENABLED != 0) +-#include "winuser.inl" +-#endif /* ISOLATION_AWARE_ENABLED */ +-#endif /* RC */ ++//#if !defined(RC_INVOKED) /* RC complains about long symbols in #ifs */ ++//#if defined(ISOLATION_AWARE_ENABLED) && (ISOLATION_AWARE_ENABLED != 0) ++//#include "winuser.inl" ++//#endif /* ISOLATION_AWARE_ENABLED */ ++//#endif /* RC */ + + #ifdef __cplusplus + } + #endif /* __cplusplus */ + ++#undef __in ++#undef __out ++#undef __inline ++ + #endif /* !_WINUSER_ */ + + --- include/ws2ipdef.h.orig 2008-01-18 22:17:44.000000000 +0900 +++ include/ws2ipdef.h 2008-03-27 20:23:19.096125000 +0900 @@ -1,3 +1,6 @@ diff --git a/redland/prj/d.lst b/redland/prj/d.lst index 681b83717500..a5cfec758ae8 100644 --- a/redland/prj/d.lst +++ b/redland/prj/d.lst @@ -3,5 +3,6 @@ ..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT% ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.dll.a %_DEST%\lib%_EXT%\lib*.a ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT% ..\redlandversion.mk %_DEST%\inc%_EXT%\redlandversion.mk diff --git a/redland/raptor-1.4.17.patch b/redland/raptor-1.4.17.patch index cb0bd22355c2..44bce4b18749 100644 --- a/redland/raptor-1.4.17.patch +++ b/redland/raptor-1.4.17.patch @@ -30,7 +30,7 @@ +# +# $RCSfile: raptor-1.4.17.patch,v $ +# -+# $Revision: 1.3 $ ++# $Revision: 1.2.6.2 $ +# +# This file is part of OpenOffice.org. +# @@ -185,7 +185,7 @@ if test "$echo_libtool_libs" = "yes"; then echo @libdir@/@RAPTOR_LIBTOOLLIBS@ --- misc/raptor-1.4.17/src/win32_raptor_config.h Tue Oct 2 06:12:55 2007 -+++ misc/build/raptor-1.4.17/src/win32_raptor_config.h Mon Jun 16 15:55:38 2008 ++++ misc/build/raptor-1.4.17/src/win32_raptor_config.h 2008-07-06 10:27:03.553625000 +0900 @@ -38,6 +38,8 @@ #define HAVE_STDLIB_H 1 @@ -235,7 +235,17 @@ #define snprintf _snprintf #define access _access #define stricmp _stricmp -@@ -125,7 +137,8 @@ +@@ -114,7 +126,9 @@ + + #define RAPTOR_PARSER_GUESS 1 + #define RAPTOR_PARSER_GRDDL 1 ++#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 +@@ -125,7 +139,8 @@ #define RAPTOR_SERIALIZER_RDFXML_ABBREV 1 #define RAPTOR_SERIALIZER_NTRIPLES 1 @@ -271,3 +281,23 @@ ;; irix | nonstopux) +--- misc/raptor-1.4.17/configure 2008-03-17 16:37:20.000000000 +0900 ++++ misc/build/raptor-1.4.17/configure 2008-07-06 09:05:29.974875000 +0900 +@@ -4317,7 +4317,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' + ;; + +@@ -4326,7 +4326,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)?' diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 6c082f10d246..8c929a9c2e14 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -59,14 +59,12 @@ ADDITIONAL_FILES=src/makefile.mk .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" -#CONFIGURE_DIR= -#CONFIGURE_ACTION=.$/configure -#CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CFLAGS=-D_MT LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc -L$(ILIB:s/;/ -L/)" LIBS="-lws2_32 -lmingwthrd" OBJDUMP="$(WRAPCMD) objdump" -#BUILD_ACTION=$(GNUMAKE) -#BUILD_DIR=$(CONFIGURE_DIR) -all: - @echo "FIXME: somebody port me to mingw please..." - exit 1 +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)" +BUILD_ACTION=$(GNUMAKE) +BUILD_FLAGS+= -j$(EXTMAXPROCESS) +BUILD_DIR=$(CONFIGURE_DIR) .ELSE # there is no wntmsci build environment in the tarball; we use custom dmakefile BUILD_ACTION=dmake diff --git a/redland/rasqal-0.9.15.patch b/redland/rasqal-0.9.15.patch index 08283e290015..0abb72874dc9 100644 --- a/redland/rasqal-0.9.15.patch +++ b/redland/rasqal-0.9.15.patch @@ -30,7 +30,7 @@ +# +# $RCSfile: rasqal-0.9.15.patch,v $ +# -+# $Revision: 1.3 $ ++# $Revision: 1.2.6.2 $ +# +# This file is part of OpenOffice.org. +# @@ -200,8 +200,20 @@ #define RASQAL_DEBUG 1 #endif --- misc/rasqal-0.9.15/ltmain.sh 2006-03-12 03:49:04.000000000 +0900 -+++ misc/build/rasqal-0.9.15/ltmain.sh 2008-07-08 12:00:00.000000000 +0900 -@@ -3195,9 +3195,9 @@ ++++ misc/build/rasqal-0.9.15/ltmain.sh 2008-07-06 14:30:56.975375000 +0900 +@@ -1518,6 +1518,11 @@ + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + absdir=`cd "$dir" && pwd` ++ case $host_os in ++ mingw*) ++ absdir=`cygpath -m $absdir` ++ ;; ++ esac + if test -z "$absdir"; then + $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 + absdir="$dir" +@@ -3195,9 +3200,9 @@ revision="$number_revision" ;; freebsd-aout|freebsd-elf|sunos) @@ -214,7 +226,7 @@ ;; irix|nonstopux) current=`expr $number_major + $number_minor - 1` -@@ -3275,8 +3275,8 @@ +@@ -3275,8 +3280,8 @@ ;; freebsd-elf) diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index 8f4ec9738cb7..ddf6a5153ae8 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -59,14 +59,12 @@ ADDITIONAL_FILES=src/makefile.mk .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" -#CONFIGURE_DIR= -#CONFIGURE_ACTION=.$/configure -#CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CFLAGS=-D_MT LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc -L$(ILIB:s/;/ -L/)" LIBS="-lws2_32 -lmingwthrd" OBJDUMP="$(WRAPCMD) objdump" -#BUILD_ACTION=$(GNUMAKE) -#BUILD_DIR=$(CONFIGURE_DIR) -all: - @echo "FIXME: somebody port me to mingw please..." - exit 1 +CONFIGURE_DIR= +CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --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) .ELSE # there is no wntmsci build environment in the tarball; we use custom dmakefile BUILD_ACTION=dmake diff --git a/redland/redland-1.0.7.patch b/redland/redland-1.0.7.patch index 26ffa3d10699..dca6383d855e 100644 --- a/redland/redland-1.0.7.patch +++ b/redland/redland-1.0.7.patch @@ -30,7 +30,7 @@ +# +# $RCSfile: redland-1.0.7.patch,v $ +# -+# $Revision: 1.3 $ ++# $Revision: 1.2.6.2 $ +# +# This file is part of OpenOffice.org. +# @@ -512,7 +512,7 @@ #ifdef WITH_THREADS world = uri->world; --- misc/redland-1.0.7/librdf/win32_rdf_config.h Sun May 6 19:14:36 2007 -+++ misc/build/redland-1.0.7/librdf/win32_rdf_config.h Mon Jun 16 15:55:52 2008 ++++ misc/build/redland-1.0.7/librdf/win32_rdf_config.h Sat Jul 12 08:56:20 2008 @@ -45,7 +45,8 @@ #define HAVE_STRICMP 1 @@ -590,7 +590,7 @@ /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 -@@ -161,22 +162,27 @@ +@@ -161,25 +162,33 @@ #define HAVE_MKTEMP 1 /* MySQL libraries are present */ @@ -619,7 +619,13 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_PTHREAD_H */ -@@ -248,7 +254,7 @@ ++#ifdef __MINGW32__ ++#undef HAVE_PTHREAD_H */ ++#endif + + /* Define to 1 if you have the header file. */ + #define HAVE_STDINT_H 1 +@@ -248,7 +257,7 @@ #define SIZEOF_UNSIGNED_LONG_LONG 8 /* SQLite API version */ @@ -628,7 +634,7 @@ /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 -@@ -256,14 +262,17 @@ +@@ -256,14 +265,17 @@ /* Building file storage */ #define STORAGE_FILE 1 @@ -685,8 +691,20 @@ +LGPL is applied is otherwise unspecified. + --- misc/redland-1.0.7/ltmain.sh 2007-11-28 06:23:09.000000000 +0900 -+++ misc/build/redland-1.0.7/ltmain.sh 2008-07-08 11:59:22.000000000 +0900 -@@ -3237,9 +3237,9 @@ ++++ misc/build/redland-1.0.7/ltmain.sh 2008-07-06 15:44:48.725250000 +0900 +@@ -1557,6 +1557,11 @@ + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + absdir=`cd "$dir" && pwd` ++ case $host_os in ++ mingw*) ++ absdir=`cygpath -m $absdir` ++ ;; ++ esac + if test -z "$absdir"; then + $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 + absdir="$dir" +@@ -3237,9 +3242,9 @@ revision="$number_revision" ;; freebsd-aout|freebsd-elf|sunos) @@ -699,7 +717,7 @@ ;; irix|nonstopux) current=`expr $number_major + $number_minor` -@@ -3319,8 +3319,8 @@ +@@ -3319,8 +3324,8 @@ ;; freebsd-elf) @@ -710,3 +728,34 @@ ;; irix | nonstopux) +--- misc/redland-1.0.7/configure 2007-12-17 16:58:16.000000000 +0900 ++++ misc/build/redland-1.0.7/configure 2008-07-06 15:12:01.397125000 +0900 +@@ -4544,7 +4544,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' + ;; + +@@ -4553,7 +4553,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/redland-1.0.7/utils/rdfproc.c 2007-10-23 23:55:06.000000000 +0900 ++++ misc/build/redland-1.0.7/utils/rdfproc.c 2008-07-06 17:44:47.615875000 +0900 +@@ -30,7 +30,7 @@ + #endif + + #ifdef WIN32 +-#include ++#include + #endif + + #include diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 7dd2ae30e12b..af3b906d7804 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -59,14 +59,12 @@ ADDITIONAL_FILES=librdf/makefile.mk .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" -#CONFIGURE_DIR= -#CONFIGURE_ACTION=.$/configure -#CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CFLAGS=-D_MT LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc -L$(ILIB:s/;/ -L/)" LIBS="-lws2_32 -lmingwthrd" OBJDUMP="$(WRAPCMD) objdump" -#BUILD_ACTION=$(GNUMAKE) -#BUILD_DIR=$(CONFIGURE_DIR) -all: - @echo "FIXME: somebody port me to mingw please..." - exit 1 +CONFIGURE_DIR= +CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --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) .ELSE # there is no wntmsci build environment in the tarball; we use custom dmakefile BUILD_ACTION=dmake -- cgit v1.2.3 From e3ee495f2b9b5e70f00bb54ea983a77ac0e28550 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Tue, 9 Dec 2008 08:43:20 +0000 Subject: CWS-TOOLING: integrate CWS os2port04 2008-11-27 13:22:38 +0100 ydario r264480 : #i96439#: fix build for unix platforms. 2008-11-26 18:32:42 +0100 ydario r264433 : #i96439#: os2 systemshell code (dummy code). 2008-11-26 16:33:48 +0100 ydario r264421 : #i96439#: vcl fix for pdf export of truetype fonts. 2008-11-26 15:04:44 +0100 ydario r264399 : #i96439#: build macros fix scripts, gcc specific flags. 2008-11-26 15:00:15 +0100 ydario r264398 : #i96439#: vcl source code updates. 2008-11-26 13:21:37 +0100 ydario r264378 : #i96439#: os2 build system fixes. 2008-11-26 13:20:27 +0100 ydario r264377 : #i96439#: configuration and build macros updates. 2008-11-26 13:16:35 +0100 ydario r264375 : #i96439#: new launcher code, build system updates. 2008-11-26 13:12:49 +0100 ydario r264373 : #i96439#: use OSL endian macro. 2008-11-26 12:54:50 +0100 ydario r264371 : #i96439#: os2 build system fixes. 2008-11-26 12:30:46 +0100 ydario r264367 : #i96439#: os2 build system fixes. 2008-11-26 12:09:33 +0100 ydario r264365 : #i96439#: _Export is a reserved keyword under gcc for os2. 2008-11-26 12:08:12 +0100 ydario r264364 : #i96439#: new libpath handling. 2008-11-26 11:57:51 +0100 ydario r264363 : #i96439#: use C call, generates proper stabs; fix rtti names. --- cppunit/source/cppunit/makefile.mk | 4 ++-- hyphen/makefile.mk | 4 ++++ lpsolve/lp_solve_5.5.patch | 17 +++++++++++++++++ lpsolve/makefile.mk | 5 ++++- lpsolve/prj/d.lst | 1 + redland/prj/d.lst | 1 + redland/raptor/makefile.mk | 6 ++++++ redland/rasqal/makefile.mk | 5 +++++ redland/redland/makefile.mk | 4 ++++ 9 files changed, 44 insertions(+), 3 deletions(-) (limited to 'redland') diff --git a/cppunit/source/cppunit/makefile.mk b/cppunit/source/cppunit/makefile.mk index 2441bc600259..a65e32c94e42 100644 --- a/cppunit/source/cppunit/makefile.mk +++ b/cppunit/source/cppunit/makefile.mk @@ -87,7 +87,7 @@ LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a LIB1FILES=$(LB)$/c5t_winstuff.lib .ENDIF -.IF "$(GUI)" == "UNX" +.IF "$(GUI)" == "UNX" || "$(GUI)" == "OS2" LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a .ENDIF @@ -103,7 +103,7 @@ LIB2ARCHIV=$(LB)$/lib$(TARGET2)$(DLLPOSTFIX).a .ENDIF .ENDIF -.IF "$(GUI)" == "UNX" +.IF "$(GUI)" == "UNX" || "$(GUI)" == "OS2" LIB2ARCHIV=$(LB)$/lib$(TARGET2)$(DLLPOSTFIX).a .ENDIF diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk index ad3436a6eeef..62f3b4f4a376 100644 --- a/hyphen/makefile.mk +++ b/hyphen/makefile.mk @@ -95,6 +95,10 @@ BUILD_ACTION=dmake OUT2INC += hyphen.h .ENDIF # "$(GUI)"=="WNT" +.IF "$(GUI)"=="OS2" +BUILD_ACTION=dmake +OUT2INC += hyphen.h +.ENDIF # "$(GUI)"=="OS2" # --- Targets ------------------------------------------------------ diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch index e4c71e2cccce..fc446a4e5727 100644 --- a/lpsolve/lp_solve_5.5.patch +++ b/lpsolve/lp_solve_5.5.patch @@ -7,6 +7,23 @@ def= so= +--- misc/lp_solve_5.5/lpsolve55/ccc.os2 2008-11-26 12:49:36.000000000 +0100 ++++ misc/build/lp_solve_5.5/lpsolve55/ccc.os2 2008-09-25 17:27:48.000000000 +0200 +@@ -1 +1,13 @@ +-dummy ++src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' ++c=$CC ++ ++def= ++so= ++ ++opts='-O3' ++ ++$c -s -c -Zomf -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src ++emxomfar rv liblpsolve55.lib `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` ++echo liblpsolve55.a ++ ++rm *.o 2>/dev/null --- misc/lp_solve_5.5/lpsolve55/ccc.osx Thu Jun 23 22:53:08 2005 +++ misc/build/lp_solve_5.5/lpsolve55/ccc.osx Wed May 21 17:19:56 2008 @@ -3,6 +3,10 @@ diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk index 0c319726e298..b36abbebb29b 100644 --- a/lpsolve/makefile.mk +++ b/lpsolve/makefile.mk @@ -46,7 +46,7 @@ TARFILE_NAME=lp_solve_5.5 PATCH_FILE_NAME=lp_solve_5.5-windows.patch .ELSE PATCH_FILE_NAME=lp_solve_5.5.patch -ADDITIONAL_FILES=lpsolve55$/ccc.solaris +ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2 .ENDIF CONFIGURE_DIR= @@ -62,6 +62,9 @@ BUILD_ACTION=cmd /c cvc6.bat OUT2LIB=$(BUILD_DIR)$/lpsolve55.lib .ENDIF OUT2BIN=$(BUILD_DIR)$/lpsolve55.dll +.ELIF "$(GUI)"=="OS2" +BUILD_ACTION=sh ccc.os2 +OUT2LIB=$(BUILD_DIR)$/liblpsolve55.lib .ELSE .IF "$(OS)"=="MACOSX" BUILD_ACTION=sh ccc.osx diff --git a/lpsolve/prj/d.lst b/lpsolve/prj/d.lst index 89980655e68d..64b8c0c97863 100644 --- a/lpsolve/prj/d.lst +++ b/lpsolve/prj/d.lst @@ -3,6 +3,7 @@ mkdir: %_DEST%\inc%_EXT%\lpsolve ..\%__SRC%\inc\lp_*.h %_DEST%\inc%_EXT%\lpsolve\* ..\%__SRC%\lib\liblpsolve55.so %_DEST%\lib%_EXT%\liblpsolve55.so ..\%__SRC%\lib\liblpsolve55.dylib %_DEST%\lib%_EXT%\liblpsolve55.dylib +..\%__SRC%\lib\liblpsolve55.lib %_DEST%\lib%_EXT%\liblpsolve55.lib ..\%__SRC%\lib\lpsolve55.lib %_DEST%\lib%_EXT%\lpsolve55.lib ..\%__SRC%\bin\lpsolve55.dll %_DEST%\bin%_EXT%\lpsolve55.dll diff --git a/redland/prj/d.lst b/redland/prj/d.lst index a5cfec758ae8..1d82c72e7485 100644 --- a/redland/prj/d.lst +++ b/redland/prj/d.lst @@ -3,6 +3,7 @@ ..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT% ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT% +..\%__SRC%\lib\*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\lib*.dll.a %_DEST%\lib%_EXT%\lib*.a ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT% ..\redlandversion.mk %_DEST%\inc%_EXT%\redlandversion.mk diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 8c929a9c2e14..4bd548ede802 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -70,6 +70,7 @@ BUILD_DIR=$(CONFIGURE_DIR) BUILD_ACTION=dmake BUILD_DIR=$(CONFIGURE_DIR)$/src .ENDIF + .ELSE # "WNT" .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" @@ -129,6 +130,11 @@ OUT2BIN+=src/raptor-config .ELSE # if we use dmake, this is done automagically .ENDIF + +.ELIF "$(GUI)"=="OS2" +OUT2LIB+=src$/.libs$/*.a +OUT2BIN+=src$/raptor-config + .ELSE OUT2LIB+=src$/.libs$/libraptor*.so* OUT2BIN+=src/raptor-config diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index ddf6a5153ae8..df4b640e6962 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -129,6 +129,11 @@ OUT2BIN+=src/rasqal-config .ELSE # if we use dmake, this is done automagically .ENDIF + +.ELIF "$(OS)"=="OS2" +OUT2LIB+=src$/.libs$/*.a +OUT2BIN+=src$/rasqal-config + .ELSE OUT2LIB+=src$/.libs$/librasqal*.so* OUT2BIN+=src/rasqal-config diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index af3b906d7804..21ac94b388d7 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -131,6 +131,10 @@ OUT2BIN+=librdf$/.libs$/*.dll .ELSE # if we use dmake, this is done automagically .ENDIF + +.ELIF "$(OS)"=="OS2" +OUT2LIB+=librdf$/.libs$/*.a + .ELSE OUT2LIB+=librdf$/.libs$/librdf*.so* .ENDIF -- cgit v1.2.3 From 4b723a6a5dcff166a2e89d54563406ca916d242f Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Tue, 20 Jan 2009 10:06:44 +0000 Subject: CWS-TOOLING: integrate CWS cloph12 2009-01-13 18:36:51 +0100 cloph r266245 : #i98008# add back the XSLTLIB exports - used when using the internal libxslt (patched xslt-config that uses that var) 2009-01-13 01:51:56 +0100 cloph r266186 : #i97928# missed hu_HU in the initial commit 2009-01-12 22:45:02 +0100 cloph r266183 : #i98008# remove unused XSLTLIB exports 2009-01-12 00:30:16 +0100 cloph r266130 : #i97928# silence timestamp has not been update warning, reduce number of unzip calls 2009-01-11 22:02:28 +0100 cloph r266129 : #i80368# fix ambiguous inference chains, remove duplicated license files, minor other cleanup --- redland/raptor/makefile.mk | 2 +- redland/rasqal/makefile.mk | 2 -- redland/redland/makefile.mk | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) (limited to 'redland') diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 4bd548ede802..d8a614aadf08 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -98,7 +98,7 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl CPPFLAGS+:=$(EXTRA_CFLAGS) LDFLAGS+:=$(EXTRA_LINKFLAGS) -XSLTLIB:=$(XSLTLIB) +XSLTLIB!:=$(XSLTLIB) # expand variable for (internal) xslt-config .EXPORT: CPPFLAGS .EXPORT: LDFLAGS diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index df4b640e6962..14122beb98ec 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -97,13 +97,11 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl CPPFLAGS+:=$(EXTRA_CFLAGS) LDFLAGS+:=$(EXTRA_LINKFLAGS) -XSLTLIB:=$(XSLTLIB) .EXPORT: CPPFLAGS .EXPORT: LDFLAGS .EXPORT: LIBXML2LIB .EXPORT: ZLIB3RDLIB -.EXPORT: XSLTLIB CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 21ac94b388d7..e5814fb549bd 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -101,7 +101,7 @@ LDFLAGS+:=-Wl,-dylib_file,@loader_path/libraptor.1.dylib:$(PWD)/$(LB)/libraptor. CPPFLAGS+:=$(EXTRA_CFLAGS) LDFLAGS+:=$(EXTRA_LINKFLAGS) -XSLTLIB:=$(XSLTLIB) +XSLTLIB!:=$(XSLTLIB) # expand variable for (internal) xslt-config .EXPORT: CPPFLAGS .EXPORT: LDFLAGS -- cgit v1.2.3 From 177eb5d1cde50cdbf06a3175b5b78bcc9c2a5718 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Thu, 19 Feb 2009 07:29:28 +0000 Subject: CWS-TOOLING: integrate CWS ause099 2009-01-29 12:30:57 +0100 hjs r267116 : #i98365# fix unsetting g+s bit 2009-01-23 14:21:19 +0100 hjs r266819 : #i40246# - cleanup 2009-01-23 14:14:07 +0100 hjs r266818 : #i40246# - fix quoting of final echo line 2009-01-23 12:42:33 +0100 hjs r266807 : #i98365# leave higher bits alone 2009-01-23 11:23:42 +0100 rt r266799 : Header 2009-01-22 19:14:25 +0100 hjs r266753 : #i98365# remove unwanted file attributes from archives 2009-01-22 16:22:18 +0100 hjs r266737 : #i98365# remove unwanted file attributes from archives 2009-01-22 16:20:54 +0100 hjs r266736 : #i98365# remove unwanted file attributes from archives 2009-01-22 16:20:24 +0100 hjs r266735 : #i98365# remove unwanted file attributes from archives 2009-01-22 16:08:33 +0100 hjs r266734 : #i40246# renamed variable 2009-01-22 16:05:26 +0100 hjs r266733 : #i40246# renamed variable 2009-01-20 17:46:54 +0100 hjs r266610 : #i98290# cleanup 2009-01-19 19:32:19 +0100 hjs r266522 : CWS-TOOLING: rebase CWS ause099 to trunk@266428 (milestone: DEV300:m39) 2008-12-08 21:00:09 +0100 hjs r265049 : CWS-TOOLING: rebase CWS ause099 to trunk@264807 (milestone: DEV300:m37) 2008-11-27 18:25:18 +0100 hjs r264513 : #i40246# - support multiple patches per archive 2008-11-17 19:00:12 +0100 hjs r263738 : CWS-TOOLING: rebase CWS ause099 to trunk@263288 (milestone: DEV300:m35) --- beanshell/makefile.mk | 2 +- cppunit/makefile.mk | 2 +- epm/makefile.mk | 2 +- external/glibc/makefile.mk | 2 +- fondu/makefile.mk | 2 +- hsqldb/makefile.mk | 2 +- hyphen/makefile.mk | 2 +- icc/makefile.mk | 4 ++-- libtextcat/makefile.mk | 2 +- libwpd/makefile.mk | 2 +- libxmlsec/makefile.mk | 2 +- lpsolve/makefile.mk | 4 ++-- lucene/makefile.mk | 2 +- msfontextract/makefile.mk | 2 +- openssl/makefile.mk | 8 ++++---- redland/raptor/makefile.mk | 2 +- redland/rasqal/makefile.mk | 2 +- redland/redland/makefile.mk | 2 +- rhino/makefile.mk | 2 +- vigra/makefile.mk | 2 +- 20 files changed, 25 insertions(+), 25 deletions(-) (limited to 'redland') diff --git a/beanshell/makefile.mk b/beanshell/makefile.mk index 53924d2068bc..215c59891d0b 100644 --- a/beanshell/makefile.mk +++ b/beanshell/makefile.mk @@ -43,7 +43,7 @@ TARGET=ooo_beanshell TARFILE_NAME=bsh-2.0b1-src TARFILE_ROOTDIR=BeanShell -PATCH_FILE_NAME=bsh-2.0b1-src.patch +PATCH_FILES=bsh-2.0b1-src.patch ADDITIONAL_FILES=makefile.mk diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index 8c05a02e753e..8f636569d8b2 100644 --- a/cppunit/makefile.mk +++ b/cppunit/makefile.mk @@ -115,7 +115,7 @@ ADDITIONAL_FILES=\ src$/win32$/makefile.mk \ src$/win32$/winstuff.cxx -PATCH_FILE_NAME=cppunit-1.8.0-r1.patch +PATCH_FILES=cppunit-1.8.0-r1.patch # CONFIGURE_DIR= # CONFIGURE_ACTION= diff --git a/epm/makefile.mk b/epm/makefile.mk index 869c32a1b7ee..5f4f93db31b1 100644 --- a/epm/makefile.mk +++ b/epm/makefile.mk @@ -41,7 +41,7 @@ TARGET=epm # --- Files -------------------------------------------------------- TARFILE_NAME=epm-3.7 -PATCH_FILE_NAME=epm-3.7.patch +PATCH_FILES=epm-3.7.patch .IF "$(GUI)"=="UNX" && "$(BUILD_EPM)" != "NO" diff --git a/external/glibc/makefile.mk b/external/glibc/makefile.mk index 6134dbc54a4b..8940a0cd2f84 100644 --- a/external/glibc/makefile.mk +++ b/external/glibc/makefile.mk @@ -44,7 +44,7 @@ TARFILE_NAME=glibc-2.1.3-stub TARFILE_ROOTDIR=glibc-2.1.3 ADDITIONAL_FILES=posix$/makefile.mk posix$/config.h posix$/readdir_r.c -PATCH_FILE_NAME=$(PRJ)$/glibc-2.1.3.patch +PATCH_FILES=$(PRJ)$/glibc-2.1.3.patch #CONFIGURE_DIR=glibc-2.1.3/posix CONFIGURE_ACTION= diff --git a/fondu/makefile.mk b/fondu/makefile.mk index 436df25305db..a543eaaa808a 100644 --- a/fondu/makefile.mk +++ b/fondu/makefile.mk @@ -70,4 +70,4 @@ OUT2BIN=$(BUILD_DIR)$/fondu # contains the "magic" to create targets out of the set variables. -.INCLUDE : tg_ext.mk \ No newline at end of file +.INCLUDE : tg_ext.mk diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk index 82b46115bd9e..375cdc33bc0e 100755 --- a/hsqldb/makefile.mk +++ b/hsqldb/makefile.mk @@ -55,7 +55,7 @@ TARFILE_ROOTDIR=hsqldb CONVERTFILES=build$/build.xml \ src$/org$/hsqldb$/persist$/HsqlDatabaseProperties.java -PATCH_FILE_NAME=patches$/accumulated_patches.patch +# PATCH_FILES=patches$/accumulated_patches.patch # ADDITIONAL_FILES= src$/org$/hsqldb$/Collation.java \ # src$/org$/hsqldb$/TxManager.java \ diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk index 62f3b4f4a376..770f3d5e8592 100644 --- a/hyphen/makefile.mk +++ b/hyphen/makefile.mk @@ -44,7 +44,7 @@ TARFILE_NAME=hyphen-2.3.1 ADDITIONAL_FILES += makefile.mk -PATCH_FILE_NAME=hyphen-2.3.patch +PATCH_FILES=hyphen-2.3.patch .IF "$(GUI)"=="UNX" CONFIGURE_DIR=$(BUILD_DIR) diff --git a/icc/makefile.mk b/icc/makefile.mk index 5d1b21a4f845..b688104f3870 100644 --- a/icc/makefile.mk +++ b/icc/makefile.mk @@ -43,9 +43,9 @@ TARGET=icc TARFILE_NAME=SampleICC-1.3.2 #checking for endianess .IF "$(CPU)"=="I" -PATCH_FILE_NAME=$(TARFILE_NAME).patch +PATCH_FILES=$(TARFILE_NAME).patch .ELSE -PATCH_FILE_NAME=$(TARFILE_NAME)-bendian.patch +PATCH_FILES=$(TARFILE_NAME)-bendian.patch .ENDIF CONVERTFILES= \ diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk index c7da97deb094..33c76042be97 100644 --- a/libtextcat/makefile.mk +++ b/libtextcat/makefile.mk @@ -43,7 +43,7 @@ TARGET=libtextcat TARFILE_NAME=libtextcat-2.2 TARFILE_ROOTDIR=libtextcat-2.2 -PATCH_FILE_NAME=libtextcat-2.2.patch +PATCH_FILES=libtextcat-2.2.patch ADDITIONAL_FILES= \ diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk index e97171ed499f..0d66765ba4d8 100644 --- a/libwpd/makefile.mk +++ b/libwpd/makefile.mk @@ -46,7 +46,7 @@ TARGET=wpd .ENDIF TARFILE_NAME=libwpd-0.8.8 -PATCH_FILE_NAME=$(TARFILE_NAME).diff +PATCH_FILES=$(TARFILE_NAME).diff BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) BUILD_DIR=src$/lib diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 376ffc469bec..15531839f067 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -49,7 +49,7 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE XMLSEC1VERSION=1.2.6 TARFILE_NAME=$(PRJNAME)-$(XMLSEC1VERSION) -PATCH_FILE_NAME=$(TARFILE_NAME).patch +PATCH_FILES=$(TARFILE_NAME).patch ADDITIONAL_FILES= \ include$/xmlsec$/nss$/akmngr.h \ diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk index b36abbebb29b..a69d5494d2a2 100644 --- a/lpsolve/makefile.mk +++ b/lpsolve/makefile.mk @@ -43,9 +43,9 @@ TARGET=lpsolve TARFILE_NAME=lp_solve_5.5 .IF "$(GUI)"=="WNT" -PATCH_FILE_NAME=lp_solve_5.5-windows.patch +PATCH_FILES=lp_solve_5.5-windows.patch .ELSE -PATCH_FILE_NAME=lp_solve_5.5.patch +PATCH_FILES=lp_solve_5.5.patch ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2 .ENDIF diff --git a/lucene/makefile.mk b/lucene/makefile.mk index 23173d5a2d5c..2d87f23bd312 100644 --- a/lucene/makefile.mk +++ b/lucene/makefile.mk @@ -53,7 +53,7 @@ LUCENE_CORE_JAR=lucene-core-$(LUCENE_MAJOR).$(LUCENE_MINOR).jar LUCENE_ANALYZERS_JAR=lucene-analyzers-$(LUCENE_MAJOR).$(LUCENE_MINOR).jar TARFILE_NAME=$(LUCENE_NAME) -PATCH_FILE_NAME=lucene.patch +PATCH_FILES=lucene.patch BUILD_DIR=. BUILD_ACTION= ${ANT} -buildfile .$/contrib$/analyzers$/build.xml diff --git a/msfontextract/makefile.mk b/msfontextract/makefile.mk index 174ab5d0b360..bdd1398f3b46 100644 --- a/msfontextract/makefile.mk +++ b/msfontextract/makefile.mk @@ -48,7 +48,7 @@ LIBSALCPPRT= .ENDIF TARFILE_NAME=libmspack -PATCH_FILE_NAME=msfontextract.patch +PATCH_FILES=msfontextract.patch ADDITIONAL_FILES=mspack$/makefile.mk mspack$/msfontextract.c mspack$/ministub.c diff --git a/openssl/makefile.mk b/openssl/makefile.mk index db156b1a3b13..671f77ab22c3 100644 --- a/openssl/makefile.mk +++ b/openssl/makefile.mk @@ -66,7 +66,7 @@ OUT2LIB += libcrypto.* OUT2INC += include/openssl/* .IF "$(OS)" == "LINUX" - PATCH_FILE_NAME=openssllnx.patch + PATCH_FILES=openssllnx.patch ADDITIONAL_FILES:= \ libcrypto_OOo_0_9_8e.map \ libssl_OOo_0_9_8e.map @@ -75,7 +75,7 @@ OUT2INC += include/openssl/* .ENDIF .IF "$(OS)" == "SOLARIS" - PATCH_FILE_NAME=opensslsol.patch + PATCH_FILES=opensslsol.patch ADDITIONAL_FILES:= \ libcrypto_OOo_0_9_8e.map \ libssl_OOo_0_9_8e.map @@ -103,7 +103,7 @@ OUT2INC += include/openssl/* .IF "$(OS)" == "WNT" .IF "$(COM)"=="GCC" -PATCH_FILE_NAME=opensslmingw.patch +PATCH_FILES=opensslmingw.patch .IF "$(USE_MINGW)" == "cygwin" CONFIGURE_ACTION=$(PERL) configure CONFIGURE_FLAGS=mingw shared @@ -126,7 +126,7 @@ OUT2BIN += out/libeay32.dll .ENDIF .ELSE - PATCH_FILE_NAME=openssl.patch + PATCH_FILES=openssl.patch .IF "$(MAKETARGETS)" == "" # The env. vars CC and PERL are used by nmake, and nmake insists on '\'s # If WRAPCMD is set it is prepended before the compiler, don't touch that. diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index d8a614aadf08..e7c80b9b90ef 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -52,7 +52,7 @@ all: RAPTORVERSION=$(RAPTOR_MAJOR).4.17 TARFILE_NAME=raptor-$(RAPTORVERSION) -PATCH_FILE_NAME=..$/$(TARFILE_NAME).patch +PATCH_FILES=..$/$(TARFILE_NAME).patch ADDITIONAL_FILES=src/makefile.mk diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index 14122beb98ec..996d7d7433ae 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -52,7 +52,7 @@ all: RASQALVERSION=0.9.15 TARFILE_NAME=rasqal-$(RASQALVERSION) -PATCH_FILE_NAME=..$/$(TARFILE_NAME).patch +PATCH_FILES=..$/$(TARFILE_NAME).patch ADDITIONAL_FILES=src/makefile.mk diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index e5814fb549bd..f5fc88f8438f 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -52,7 +52,7 @@ all: REDLANDVERSION=1.0.7 TARFILE_NAME=redland-$(REDLANDVERSION) -PATCH_FILE_NAME=..$/$(TARFILE_NAME).patch +PATCH_FILES=..$/$(TARFILE_NAME).patch ADDITIONAL_FILES=librdf/makefile.mk diff --git a/rhino/makefile.mk b/rhino/makefile.mk index 06bc45732f58..24517b6dafd7 100755 --- a/rhino/makefile.mk +++ b/rhino/makefile.mk @@ -48,7 +48,7 @@ TARFILE_ROOTDIR=rhino1_5R5 ADDITIONAL_FILES= \ toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java -PATCH_FILE_NAME=rhino1_5R5.patch +PATCH_FILES=rhino1_5R5.patch .IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= diff --git a/vigra/makefile.mk b/vigra/makefile.mk index 1f5f6655d6f1..97f6b0e29bf6 100644 --- a/vigra/makefile.mk +++ b/vigra/makefile.mk @@ -51,7 +51,7 @@ all: # --- Files -------------------------------------------------------- TARFILE_NAME=vigra1.4.0 -PATCH_FILE_NAME=$(TARFILE_NAME).patch +PATCH_FILES=$(TARFILE_NAME).patch CONFIGURE_DIR= CONFIGURE_ACTION= -- cgit v1.2.3 From 737d42f25fb44d30223ef9be492537e67856169a Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Mon, 2 Mar 2009 08:55:03 +0000 Subject: CWS-TOOLING: integrate CWS os2port05 2009-02-05 19:23:48 +0100 ydario r267438 : i98084: add quotes to paths, required to properly set libpath when installation directory has spaces in it. Fixes ticket:135. 2009-01-22 13:24:00 +0100 ydario r266715 : i98084: use native code to set readonly-hidden flags (see w32), fixes lock files set as readonly and not removable. 2009-01-22 13:22:45 +0100 ydario r266714 : i98084: fix build error with gcc432, requires os2 headers now. 2009-01-21 23:42:58 +0100 ydario r266707 : i98084: properly generates rtti names for unknown symbols, see ticket:138. 2009-01-21 23:41:27 +0100 ydario r266706 : i98084: if xmlsec is not built, certificate is not valid, fixes ticket:138. 2009-01-15 23:39:09 +0100 ydario r266396 : i98084: convert unicode to char for panic dialog messages. 2009-01-15 23:36:13 +0100 ydario r266395 : i98084: use dmake build system instead of configure scripts. 2009-01-15 23:32:05 +0100 ydario r266394 : i98084: add senddoc/open-url integration. changeset 865-866. --- redland/raptor-1.4.17.patch | 323 ++++++++++++++++++++++++++++++++++++++++++- redland/raptor/makefile.mk | 10 +- redland/raptor/raptor2.map | 294 +++++++++++++++++++++++++++++++++++++++ redland/rasqal-0.9.15.patch | 182 +++++++++++++++++++++++- redland/rasqal/makefile.mk | 11 +- redland/rasqal/rasqal2.map | 194 ++++++++++++++++++++++++++ redland/redland-1.0.7.patch | 263 ++++++++++++++++++++++++++++++++++- redland/redland/makefile.mk | 10 +- redland/redland/redland2.map | 316 ++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 1587 insertions(+), 16 deletions(-) create mode 100644 redland/raptor/raptor2.map create mode 100644 redland/rasqal/rasqal2.map create mode 100644 redland/redland/redland2.map (limited to 'redland') diff --git a/redland/raptor-1.4.17.patch b/redland/raptor-1.4.17.patch index 44bce4b18749..c22ff2b53e93 100644 --- a/redland/raptor-1.4.17.patch +++ b/redland/raptor-1.4.17.patch @@ -18,7 +18,7 @@ + --- misc/raptor-1.4.17/src/makefile.mk Mon Jun 16 17:24:23 2008 +++ misc/build/raptor-1.4.17/src/makefile.mk Mon Jun 16 19:25:14 2008 -@@ -1,1 +1,121 @@ +@@ -1,1 +1,128 @@ -dummy +#************************************************************************* +# @@ -64,7 +64,11 @@ + +.INCLUDE : settings.mk + ++.IF "$(GUI)"=="OS2" ++CDEFS+=-DRAPTOR_INTERNAL -DHAVE_CONFIG_H -DNDEBUG ++.ELSE +CDEFS+=-DRAPTOR_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS ++.ENDIF + +# --- Files -------------------------------------------------------- + @@ -127,6 +131,9 @@ +SHL1IMPLIB= lib$(TARGET) + +#SHL1VERSIONMAP=../service/exports.map ++.IF "$(GUI)"=="OS2" ++SHL1VERSIONMAP=$(PRJ)$/raptor$/raptor2.map ++.ENDIF +SHL1DEF=$(MISC)$/$(SHL1TARGET).def +DEF1NAME=$(SHL1TARGET) + @@ -301,3 +308,317 @@ 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.17/src/raptor_config.h 2008-12-26 11:49:30.000000000 +0100 ++++ misc/build/raptor-1.4.17/src/raptor_config.h 2008-12-26 01:10:34.000000000 +0100 +@@ -1 +1,310 @@ +-dummy ++/* src/raptor_config.h. Generated from raptor_config.h.in by configure. */ ++/* src/raptor_config.h.in. Generated from configure.ac by autoheader. */ ++ ++/* does expat crash when it sees an initial UTF8 BOM? */ ++/* #undef EXPAT_UTF8_BOM_CRASH */ ++ ++/* vsnprint has C99 compatible return value */ ++#define HAVE_C99_VSNPRINTF 1 ++ ++/* Have curl/curl.h */ ++/* #undef HAVE_CURL_CURL_H */ ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_DLFCN_H 1 ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_DMALLOC_H */ ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_ERRNO_H 1 ++ ++/* Define to 1 if you have the header file. */ ++//#define HAVE_EXPAT_H 1 ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_FETCH_H */ ++ ++/* Define to 1 if you have the `getopt' function. */ ++#define HAVE_GETOPT 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_GETOPT_H 1 ++ ++/* Define to 1 if you have the `getopt_long' function. */ ++#define HAVE_GETOPT_LONG 1 ++ ++/* INN parsedate function present */ ++/* #undef HAVE_INN_PARSEDATE */ ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_INTTYPES_H 1 ++ ++/* Define to 1 if you have the `isascii' function. */ ++#define HAVE_ISASCII 1 ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_LIBXML_HASH_H */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_LIBXML_HTMLPARSER_H */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_LIBXML_NANOHTTP_H */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_LIBXML_PARSER_H */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_LIBXML_SAX2_H */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_LIBXSLT_XSLT_H */ ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_LIMITS_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_MATH_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_MEMORY_H 1 ++ ++/* Raptor raptor_parse_date available */ ++#define HAVE_RAPTOR_PARSE_DATE 1 ++ ++/* have round() in libm */ ++#define HAVE_ROUND 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STDINT_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STDLIB_H 1 ++ ++/* Define to 1 if you have the `strcasecmp' function. */ ++#define HAVE_STRCASECMP 1 ++ ++/* Define to 1 if you have the `stricmp' function. */ ++#define HAVE_STRICMP 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STRINGS_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STRING_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_PARAM_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_STAT_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_TIME_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_TYPES_H 1 ++ ++/* have trunc() in libm */ ++#define HAVE_TRUNC 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_UNISTD_H 1 ++ ++/* Define to 1 if you have the `vsnprintf' function. */ ++#define HAVE_VSNPRINTF 1 ++ ++/* Define to 1 if you have the `xmlCtxtUseOptions' function. */ ++/* #undef HAVE_XMLCTXTUSEOPTIONS */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_XMLPARSE_H */ ++ ++/* Define to 1 if you have the `xmlSAX2InternalSubset' function. */ ++/* #undef HAVE_XMLSAX2INTERNALSUBSET */ ++ ++/* need 'extern int optind' declaration? */ ++/* #undef NEED_OPTIND_DECLARATION */ ++ ++/* Name of package */ ++#define PACKAGE "raptor" ++ ++/* Define to the address where bug reports for this package should be sent. */ ++#define PACKAGE_BUGREPORT "http://bugs.librdf.org/" ++ ++/* Define to the full name of this package. */ ++#define PACKAGE_NAME "Raptor RDF Parser" ++ ++/* Define to the full name and version of this package. */ ++#define PACKAGE_STRING "Raptor RDF Parser 1.4.17" ++ ++/* Define to the one symbol short name of this package. */ ++#define PACKAGE_TARNAME "raptor" ++ ++/* Define to the version of this package. */ ++#define PACKAGE_VERSION "1.4.17" ++ ++/* does libxml struct xmlEntity have a field etype */ ++/* #undef RAPTOR_LIBXML_ENTITY_ETYPE */ ++ ++/* does libxml struct xmlEntity have a field name_length */ ++/* #undef RAPTOR_LIBXML_ENTITY_NAME_LENGTH */ ++ ++/* does libxml have HTML_PARSE_NONET */ ++/* #undef RAPTOR_LIBXML_HTML_PARSE_NONET */ ++ ++/* does libxml xmlSAXHandler have externalSubset field */ ++/* #undef RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET */ ++ ++/* does libxml xmlSAXHandler have initialized field */ ++/* #undef RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED */ ++ ++/* does libxml have XML_PARSE_NONET */ ++/* #undef RAPTOR_LIBXML_XML_PARSE_NONET */ ++ ++/* Provide a Unicode NFC check */ ++#define RAPTOR_NFC_CHECK 1 ++ ++/* Building GRDDL parser */ ++/* #undef RAPTOR_PARSER_GRDDL */ ++ ++/* Building guess parser */ ++#define RAPTOR_PARSER_GUESS 1 ++ ++/* Building Notation 3 parser */ ++/* #undef RAPTOR_PARSER_N3 */ ++ ++/* Building N-Triples parser */ ++#define RAPTOR_PARSER_NTRIPLES 1 ++ ++/* Building RDF/XML parser */ ++#define RAPTOR_PARSER_RDFXML 1 ++ ++/* Building RSS Tag Soup parser */ ++#define RAPTOR_PARSER_RSS 1 ++ ++/* Building TRiG parser */ ++#define RAPTOR_PARSER_TRIG 1 ++ ++/* Building Turtle parser */ ++#define RAPTOR_PARSER_TURTLE 1 ++ ++/* Building Atom 1.0 serializer */ ++/* #undef RAPTOR_SERIALIZER_ATOM */ ++ ++/* Building GraphViz DOT serializer */ ++//#define RAPTOR_SERIALIZER_DOT 1 ++ ++/* Building JSON serializer */ ++//#define RAPTOR_SERIALIZER_JSON 1 ++ ++/* Building N-Triples serializer */ ++#define RAPTOR_SERIALIZER_NTRIPLES 1 ++ ++/* Building RDF/XML serializer */ ++#define RAPTOR_SERIALIZER_RDFXML 1 ++ ++/* Building RDF/XML-abbreviated serializer */ ++#define RAPTOR_SERIALIZER_RDFXML_ABBREV 1 ++ ++/* Building RSS 1.0 serializer */ ++#define RAPTOR_SERIALIZER_RSS_1_0 1 ++ ++/* Building Turtle serializer */ ++//#define RAPTOR_SERIALIZER_TURTLE 1 ++ ++/* Release version as a decimal */ ++#define RAPTOR_VERSION_DECIMAL 10417 ++ ++/* Major version number */ ++#define RAPTOR_VERSION_MAJOR 1 ++ ++/* Minor version number */ ++#define RAPTOR_VERSION_MINOR 4 ++ ++/* Release version number */ ++#define RAPTOR_VERSION_RELEASE 17 ++ ++/* Have libcurl WWW library */ ++/* #undef RAPTOR_WWW_LIBCURL */ ++ ++/* Have libfetch WWW library */ ++/* #undef RAPTOR_WWW_LIBFETCH */ ++ ++/* Have libxml available as a WWW library */ ++/* #undef RAPTOR_WWW_LIBXML */ ++ ++/* No WWW library */ ++#define RAPTOR_WWW_NONE 1 ++ ++/* Check XML 1.1 Names */ ++/* #undef RAPTOR_XML_1_1 */ ++ ++/* Use expat XML parser */ ++//#define RAPTOR_XML_EXPAT 1 ++ ++/* Use libxml XML parser */ ++/* #undef RAPTOR_XML_LIBXML */ ++ ++/* The size of `unsigned char', as computed by sizeof. */ ++#define SIZEOF_UNSIGNED_CHAR 1 ++ ++/* The size of `unsigned int', as computed by sizeof. */ ++#define SIZEOF_UNSIGNED_INT 4 ++ ++/* The size of `unsigned long', as computed by sizeof. */ ++#define SIZEOF_UNSIGNED_LONG 4 ++ ++/* The size of `unsigned short', as computed by sizeof. */ ++#define SIZEOF_UNSIGNED_SHORT 2 ++ ++/* Define to 1 if you have the ANSI C header files. */ ++#define STDC_HEADERS 1 ++ ++/* Define to 1 if you can safely include both and . */ ++#define TIME_WITH_SYS_TIME 1 ++ ++/* Version number of package */ ++#define VERSION "1.4.17" ++ ++/* Define to 1 if your processor stores words with the most significant byte ++ first (like Motorola and SPARC, unlike Intel and VAX). */ ++/* #undef WORDS_BIGENDIAN */ ++ ++/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a ++ `char[]'. */ ++/* #undef YYTEXT_POINTER */ ++ ++/* Define to empty if `const' does not conform to ANSI C. */ ++/* #undef const */ ++ ++/* 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 ++ ++/* does libxml struct xmlEntity have a field name_length */ ++/*#define RAPTOR_LIBXML_ENTITY_NAME_LENGTH*/ ++ ++/* Define to 1 if you have the `xmlCtxtUseOptions' function. */ ++#define HAVE_XMLCTXTUSEOPTIONS 1 ++ ++/* Define to 1 if you have the `xmlSAX2InternalSubset' function. */ ++#define HAVE_XMLSAX2INTERNALSUBSET 1 ++ ++/* does libxml xmlSAXHandler have externalSubset field */ ++#define RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET 1 ++ ++/* does libxml xmlSAXHandler have initialized field */ ++#define RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED 1 diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index e7c80b9b90ef..f51c915030a4 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -54,10 +54,13 @@ RAPTORVERSION=$(RAPTOR_MAJOR).4.17 TARFILE_NAME=raptor-$(RAPTORVERSION) PATCH_FILES=..$/$(TARFILE_NAME).patch -ADDITIONAL_FILES=src/makefile.mk +ADDITIONAL_FILES=src/makefile.mk src/raptor_config.h +.IF "$(OS)"=="OS2" +BUILD_ACTION=dmake +BUILD_DIR=$(CONFIGURE_DIR)$/src -.IF "$(OS)"=="WNT" +.ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure @@ -132,8 +135,7 @@ OUT2BIN+=src/raptor-config .ENDIF .ELIF "$(GUI)"=="OS2" -OUT2LIB+=src$/.libs$/*.a -OUT2BIN+=src$/raptor-config +# if we use dmake, this is done automagically .ELSE OUT2LIB+=src$/.libs$/libraptor*.so* diff --git a/redland/raptor/raptor2.map b/redland/raptor/raptor2.map new file mode 100644 index 000000000000..8c0cb819f9ff --- /dev/null +++ b/redland/raptor/raptor2.map @@ -0,0 +1,294 @@ +RAPTOR2 { + global: + GetVersionInfo; +raptor_ntriples_string_as_utf8_string; +raptor_ntriples_term_as_string; +raptor_feature_from_uri; +raptor_get_feature_count; +raptor_feature_value_type; +raptor_xml_literal_datatype_uri_string_len; +raptor_xml_literal_datatype_uri_string; +raptor_version_decimal; +raptor_version_release; +raptor_version_minor; +raptor_version_major; +raptor_version_string; +raptor_home_url_string; +raptor_license_string; +raptor_copyright_string; +raptor_short_copyright_string; +raptor_init; +raptor_finish; +raptor_vsnprintf; +raptor_print_ntriples_string; +raptor_free_memory; +raptor_alloc_memory; +raptor_calloc_memory; +raptor_error_handlers_init; +raptor_new_identifier; +raptor_copy_identifier; +raptor_free_identifier; +raptor_new_iostream_to_string; +raptor_new_iostream_to_filename; +raptor_new_iostream_from_filename; +raptor_iostream_write_string; +raptor_iostream_write_uri; +raptor_iostream_write_stringbuffer; +raptor_iostream_format_hexadecimal; +raptor_new_iostream_from_handler; +raptor_new_iostream_to_sink; +raptor_new_iostream_from_sink; +raptor_new_iostream_from_handler2; +raptor_new_iostream_to_file_handle; +raptor_new_iostream_from_file_handle; +raptor_new_iostream_from_string; +raptor_free_iostream; +raptor_iostream_tell; +raptor_iostream_read_eof; +raptor_iostream_read_bytes; +raptor_iostream_write_decimal; +raptor_iostream_get_bytes_written_count; +raptor_iostream_write_end; +raptor_iostream_write_counted_string; +raptor_iostream_write_bytes; +raptor_iostream_write_byte; +raptor_print_locator; +raptor_format_locator; +raptor_locator_uri; +raptor_locator_file; +raptor_locator_byte; +raptor_locator_column; +raptor_locator_line; +raptor_owl_namespace_uri; +raptor_xmlschema_datatypes_namespace_uri; +raptor_rdf_schema_namespace_uri; +raptor_rdf_namespace_uri_len; +raptor_rdf_namespace_uri; +raptor_xml_namespace_uri; +raptor_new_namespaces; +raptor_namespaces_init; +raptor_namespaces_start_namespace_full; +raptor_new_namespace; +raptor_namespace_copy; +raptor_new_namespace_from_uri; +raptor_free_namespaces; +raptor_namespaces_clear; +raptor_namespaces_end_for_depth; +raptor_free_namespace; +raptor_namespaces_format; +raptor_iostream_write_namespace; +raptor_new_namespace_parts_from_string; +raptor_namespaces_qname_from_uri; +raptor_namespaces_find_namespace; +raptor_namespace_get_counted_prefix; +raptor_namespace_get_prefix; +raptor_namespace_get_uri; +raptor_namespaces_namespace_in_scope; +raptor_namespaces_find_namespace_by_uri; +raptor_namespaces_get_default_namespace; +raptor_namespaces_start_namespace; +raptor_new_parser_for_content; +raptor_new_parser; +raptor_parse_file; +raptor_parse_file_stream; +raptor_parse_uri; +raptor_parse_uri_with_connection; +raptor_parse_chunk; +raptor_start_parse; +raptor_free_parser; +raptor_features_enumerate; +raptor_parser_set_feature_string; +raptor_parser_get_feature_string; +raptor_set_default_generate_id_parameters; +raptor_guess_parser_name; +raptor_syntax_name_check; +raptor_parser_get_accept_header; +raptor_parsers_enumerate; +raptor_syntaxes_enumerate; +raptor_get_mime_type; +raptor_get_locator; +raptor_parse_abort; +raptor_get_need_base_uri; +raptor_get_label; +raptor_get_name; +raptor_set_parser_strict; +raptor_get_feature; +raptor_set_feature; +raptor_parser_set_uri_filter; +raptor_set_namespace_handler; +raptor_set_generate_id_handler; +raptor_set_graph_handler; +raptor_set_statement_handler; +raptor_set_warning_handler; +raptor_set_error_handler; +raptor_set_fatal_error_handler; +raptor_new_qname; +raptor_new_qname_from_namespace_local_name; +raptor_qname_copy; +raptor_free_qname; +raptor_qname_equal; +raptor_qname_string_to_uri; +raptor_iostream_write_qname; +raptor_qname_get_counted_value; +raptor_qname_get_value; +raptor_qname_get_local_name; +raptor_qname_get_namespace; +raptor_uri_resolve_uri_reference; +raptor_new_sax2; +raptor_sax2_parse_start; +raptor_free_sax2; +raptor_sax2_parse_chunk; +raptor_sax2_inscope_base_uri; +raptor_sax2_inscope_xml_language; +raptor_xml_element_is_empty; +raptor_sax2_set_namespace_handler; +raptor_sax2_set_external_entity_ref_handler; +raptor_sax2_set_unparsed_entity_decl_handler; +raptor_sax2_set_comment_handler; +raptor_sax2_set_cdata_handler; +raptor_sax2_set_characters_handler; +raptor_sax2_set_end_element_handler; +raptor_sax2_set_start_element_handler; +raptor_compare_strings; +raptor_sequence_sort; +raptor_sequence_print_string; +raptor_sequence_print_uri; +raptor_sequence_print; +raptor_free_sequence; +raptor_sequence_set_at; +raptor_sequence_push; +raptor_sequence_shift; +raptor_sequence_join; +raptor_new_sequence; +raptor_sequence_size; +raptor_sequence_get_at; +raptor_sequence_pop; +raptor_sequence_unshift; +raptor_sequence_set_print_handler; +raptor_serializer_syntax_name_check; +raptor_new_serializer; +raptor_serializers_enumerate; +raptor_serialize_start_to_filename; +raptor_serialize_start_to_string; +raptor_serialize_start_to_file_handle; +raptor_serialize_start; +raptor_serialize_set_namespace_from_namespace; +raptor_serialize_end; +raptor_free_serializer; +raptor_serializer_features_enumerate; +raptor_serializer_set_feature_string; +raptor_serializer_get_feature_string; +raptor_serializer_get_locator; +raptor_serializer_set_warning_handler; +raptor_serializer_set_error_handler; +raptor_serializer_get_feature; +raptor_serializer_set_feature; +raptor_serializer_get_iostream; +raptor_serialize_statement; +raptor_serialize_set_namespace; +raptor_iostream_write_statement_ntriples; +raptor_iostream_write_string_ntriples; +raptor_new_stringbuffer; +raptor_free_stringbuffer; +raptor_stringbuffer_append_decimal; +raptor_stringbuffer_append_counted_string; +raptor_stringbuffer_append_string; +raptor_stringbuffer_append_stringbuffer; +raptor_stringbuffer_prepend_counted_string; +raptor_stringbuffer_prepend_string; +raptor_stringbuffer_as_string; +raptor_stringbuffer_copy_to_string; +raptor_stringbuffer_length; +raptor_uri_set_handler; +raptor_uri_filename_to_uri_string; +raptor_uri_uri_string_to_filename; +raptor_uri_uri_string_to_filename_fragment; +raptor_uri_is_file_uri; +raptor_uri_uri_string_is_file_uri; +raptor_new_uri_for_xmlbase; +raptor_new_uri_for_retrieval; +raptor_new_uri_from_id; +raptor_uri_to_relative_uri_string; +raptor_uri_to_relative_counted_uri_string; +raptor_uri_compare; +raptor_uri_print; +raptor_uri_to_string; +raptor_uri_to_counted_string; +raptor_uri_as_counted_string; +raptor_uri_as_string; +raptor_uri_copy; +raptor_uri_equals; +raptor_free_uri; +raptor_new_uri_for_rdf_concept; +raptor_new_uri_relative_to_base; +raptor_new_uri_from_uri_local_name; +raptor_new_uri; +raptor_uri_get_handler; +raptor_utf8_check; +raptor_unicode_is_xml10_namechar; +raptor_unicode_is_xml10_namestartchar; +raptor_unicode_is_xml11_namechar; +raptor_unicode_is_xml11_namestartchar; +raptor_utf8_to_unicode_char; +raptor_unicode_char_to_utf8; +raptor_www_new; +raptor_www_new_with_connection; +raptor_www_free; +raptor_www_set_user_agent; +raptor_www_set_proxy; +raptor_www_set_http_accept; +raptor_www_set_http_cache_control; +raptor_www_fetch_to_string; +raptor_www_fetch; +raptor_www_get_final_uri; +raptor_www_set_final_uri_handler; +raptor_www_abort; +raptor_www_get_connection; +raptor_www_set_uri_filter; +raptor_www_set_connection_timeout; +raptor_www_set_content_type_handler; +raptor_www_set_write_bytes_handler; +raptor_www_set_error_handler; +raptor_www_finish; +raptor_www_no_www_library_init_finish; +raptor_www_init; +raptor_new_xml_element_from_namespace_local_name; +raptor_new_xml_element; +raptor_free_xml_element; +raptor_xml_element_declare_namespace; +raptor_iostream_write_xml_element; +raptor_xml_escape_string; +raptor_xml_any_escape_string; +raptor_iostream_write_xml_escaped_string; +raptor_iostream_write_xml_any_escaped_string; +raptor_xml_name_check; +raptor_xml_element_get_language; +raptor_xml_element_get_attributes_count; +raptor_xml_element_get_attributes; +raptor_xml_element_set_attributes; +raptor_xml_element_get_name; +raptor_new_xml_writer; +raptor_free_xml_writer; +raptor_xml_writer_empty_element; +raptor_xml_writer_start_element; +raptor_xml_writer_end_element; +raptor_xml_writer_comment; +raptor_xml_writer_cdata; +raptor_xml_writer_comment_counted; +raptor_xml_writer_cdata_counted; +raptor_xml_writer_raw; +raptor_xml_writer_raw_counted; +raptor_xml_writer_features_enumerate; +raptor_xml_writer_set_feature_string; +raptor_xml_writer_get_feature_string; +raptor_xml_writer_get_feature; +raptor_xml_writer_set_feature; +raptor_statement_part_as_string; +raptor_statement_part_as_counted_string; +raptor_print_statement_as_ntriples; +raptor_print_statement_detailed; +raptor_print_statement; +raptor_statement_compare; +raptor_iostream_write_string_turtle; +raptor_iostream_write_string_python; +}; diff --git a/redland/rasqal-0.9.15.patch b/redland/rasqal-0.9.15.patch index 0abb72874dc9..67261f6a1d66 100644 --- a/redland/rasqal-0.9.15.patch +++ b/redland/rasqal-0.9.15.patch @@ -18,7 +18,7 @@ + --- misc/rasqal-0.9.15/src/makefile.mk Mon Jun 16 19:30:20 2008 +++ misc/build/rasqal-0.9.15/src/makefile.mk Mon Jun 16 19:25:48 2008 -@@ -1,1 +1,95 @@ +@@ -1,1 +1,102 @@ -dummy +#************************************************************************* +# @@ -64,7 +64,11 @@ + +.INCLUDE : settings.mk + ++.IF "$(GUI)"=="OS2" ++CDEFS+=-DRASQAL_INTERNAL -DHAVE_CONFIG_H -DNDEBUG -D_MT ++.ELSE +CDEFS+=-DRASQAL_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS -D_MT ++.ENDIF + +# --- Files -------------------------------------------------------- + @@ -101,6 +105,9 @@ +SHL1IMPLIB= lib$(TARGET) + +#SHL1VERSIONMAP=../service/exports.map ++.IF "$(GUI)"=="OS2" ++SHL1VERSIONMAP=$(PRJ)$/rasqal$/rasqal2.map ++.ENDIF +SHL1DEF=$(MISC)$/$(SHL1TARGET).def +DEF1NAME=$(SHL1TARGET) + @@ -237,3 +244,176 @@ ;; irix | nonstopux) +--- misc/rasqal-0.9.15/src/rasqal_config.h Fri Dec 26 00:18:44 2008 ++++ misc/build/rasqal-0.9.15/src/rasqal_config.h Wed Nov 26 23:35:40 2008 +@@ -1 +1,169 @@ +-dummy ++/* src/rasqal_config.h. Generated from rasqal_config.h.in by configure. */ ++/* src/rasqal_config.h.in. Generated from configure.ac by autoheader. */ ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_DLFCN_H 1 ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_DMALLOC_H */ ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_ERRNO_H 1 ++ ++/* Define to 1 if you have the `getopt' function. */ ++#define HAVE_GETOPT 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_GETOPT_H 1 ++ ++/* Define to 1 if you have the `getopt_long' function. */ ++#define HAVE_GETOPT_LONG 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_GMP_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_INTTYPES_H 1 ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_LIBXML_SCHEMASINTERNALS_H */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_LIBXML_XMLSCHEMASTYPES_H */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_LIBXML_XMLSCHEMAS_H */ ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_MEMORY_H 1 ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_MPFR_H */ ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_REGEX_H 1 ++ ++/* have PCRE regex - Perl Compatible Regular Expressions */ ++#define HAVE_REGEX_PCRE 1 ++ ++/* Define to 1 if you have the `srandomdev' function. */ ++#define HAVE_SRANDOMDEV 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STDINT_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STDLIB_H 1 ++ ++/* Define to 1 if you have the `strcasecmp' function. */ ++#define HAVE_STRCASECMP 1 ++ ++/* Define to 1 if you have the `stricmp' function. */ ++#define HAVE_STRICMP 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STRINGS_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STRING_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_STAT_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_TIME_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_TYPES_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_UNISTD_H 1 ++ ++/* Define to 1 if you have the `vsnprintf' function. */ ++#define HAVE_VSNPRINTF 1 ++ ++/* need 'extern int optind' declaration? */ ++/* #undef NEED_OPTIND_DECLARATION */ ++ ++/* Name of package */ ++#define PACKAGE "rasqal" ++ ++/* Define to the address where bug reports for this package should be sent. */ ++#define PACKAGE_BUGREPORT "http://bugs.librdf.org/" ++ ++/* Define to the full name of this package. */ ++#define PACKAGE_NAME "Rasqal RDF Query Library" ++ ++/* Define to the full name and version of this package. */ ++#define PACKAGE_STRING "Rasqal RDF Query Library 0.9.15" ++ ++/* Define to the one symbol short name of this package. */ ++#define PACKAGE_TARNAME "rasqal" ++ ++/* Define to the version of this package. */ ++#define PACKAGE_VERSION "0.9.15" ++ ++/* Use raptor to provide triples */ ++#define RAPTOR_TRIPLES_SOURCE_RAPTOR 1 ++ ++/* Use redland to provide triples */ ++/* #undef RAPTOR_TRIPLES_SOURCE_REDLAND */ ++ ++/* Decimal from GNU MP library */ ++/* #undef RASQAL_DECIMAL_GMP */ ++ ++/* Decimal from MPFR library */ ++/* #undef RASQAL_DECIMAL_MPFR */ ++ ++/* Decimal without a library */ ++#define RASQAL_DECIMAL_NONE 1 ++ ++/* Building LAQRS query */ ++/* #undef RASQAL_QUERY_LAQRS */ ++ ++/* Building RDQL query */ ++#define RASQAL_QUERY_RDQL 1 ++ ++/* Building SPARQL query */ ++#define RASQAL_QUERY_SPARQL 1 ++ ++/* Use no regex library */ ++/* #undef RASQAL_REGEX_NONE */ ++ ++/* Use PCRE regex library */ ++/* #undef RASQAL_REGEX_PCRE */ ++ ++/* Use posix regex library */ ++#define RASQAL_REGEX_POSIX 1 ++ ++/* Release version as a decimal */ ++#define RASQAL_VERSION_DECIMAL 915 ++ ++/* Major version number */ ++#define RASQAL_VERSION_MAJOR 0 ++ ++/* Minor version number */ ++#define RASQAL_VERSION_MINOR 9 ++ ++/* Release version number */ ++#define RASQAL_VERSION_RELEASE 15 ++ ++/* Define to 1 if you have the ANSI C header files. */ ++#define STDC_HEADERS 1 ++ ++/* Define to 1 if you can safely include both and . */ ++#define TIME_WITH_SYS_TIME 1 ++ ++/* Version number of package */ ++#define VERSION "0.9.15" ++ ++/* Define to 1 if your processor stores words with the most significant byte ++ first (like Motorola and SPARC, unlike Intel and VAX). */ ++/* #undef WORDS_BIGENDIAN */ ++ ++/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a ++ `char[]'. */ ++/* #undef YYTEXT_POINTER */ ++ ++/* Define to empty if `const' does not conform to ANSI C. */ ++/* #undef const */ diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index 996d7d7433ae..94ee33869d2d 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -54,10 +54,14 @@ RASQALVERSION=0.9.15 TARFILE_NAME=rasqal-$(RASQALVERSION) PATCH_FILES=..$/$(TARFILE_NAME).patch -ADDITIONAL_FILES=src/makefile.mk +ADDITIONAL_FILES=src/makefile.mk src/rasqal_config.h +.IF "$(OS)"=="OS2" +# there is no wntmsci build environment in the tarball; we use custom dmakefile +BUILD_ACTION=dmake +BUILD_DIR=$(CONFIGURE_DIR)$/src -.IF "$(OS)"=="WNT" +.ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" @@ -129,8 +133,7 @@ OUT2BIN+=src/rasqal-config .ENDIF .ELIF "$(OS)"=="OS2" -OUT2LIB+=src$/.libs$/*.a -OUT2BIN+=src$/rasqal-config +# if we use dmake, this is done automagically .ELSE OUT2LIB+=src$/.libs$/librasqal*.so* diff --git a/redland/rasqal/rasqal2.map b/redland/rasqal/rasqal2.map new file mode 100644 index 000000000000..b36d25c9664b --- /dev/null +++ b/redland/rasqal/rasqal2.map @@ -0,0 +1,194 @@ +RASQAL2 { +global: +GetVersionInfo; +rasqal_xsd_decimal_set_string; +rasqal_xsd_decimal_print; +rasqal_xsd_decimal_as_counted_string; +rasqal_xsd_decimal_as_string; +rasqal_new_xsd_decimal; +rasqal_free_xsd_decimal; +rasqal_xsd_decimal_set_long; +rasqal_xsd_decimal_set_double; +rasqal_xsd_decimal_add; +rasqal_xsd_decimal_subtract; +rasqal_xsd_decimal_multiply; +rasqal_xsd_decimal_divide; +rasqal_xsd_decimal_negate; +rasqal_xsd_decimal_equals; +rasqal_xsd_decimal_compare; +rasqal_xsd_decimal_is_zero; +rasqal_xsd_decimal_get_double; +rasqal_set_triples_source_factory; +rasqal_new_variable; +rasqal_new_variable_typed; +rasqal_data_graph_print; +rasqal_prefix_print; +rasqal_new_data_graph; +rasqal_new_prefix; +rasqal_new_triple; +rasqal_new_triple_from_triple; +rasqal_new_0op_expression; +rasqal_new_1op_expression; +rasqal_new_2op_expression; +rasqal_new_3op_expression; +rasqal_new_string_op_expression; +rasqal_new_literal_expression; +rasqal_new_function_expression; +rasqal_new_cast_expression; +rasqal_free_variable; +rasqal_free_expression; +rasqal_free_data_graph; +rasqal_free_prefix; +rasqal_free_triple; +rasqal_expression_evaluate; +rasqal_variable_set_value; +rasqal_variable_print; +rasqal_expression_print; +rasqal_expression_print_op; +rasqal_triple_print; +rasqal_expression_foreach; +rasqal_expression_visit; +rasqal_new_expression_from_expression; +rasqal_triple_get_origin; +rasqal_triple_set_origin; +rasqal_features_enumerate; +rasqal_feature_from_uri; +rasqal_get_feature_count; +rasqal_feature_value_type; +rasqal_version_decimal; +rasqal_version_release; +rasqal_version_minor; +rasqal_version_major; +rasqal_version_string; +rasqal_home_url_string; +rasqal_license_string; +rasqal_copyright_string; +rasqal_short_copyright_string; +rasqal_init; +rasqal_finish; +rasqal_language_name_check; +rasqal_query_set_default_generate_bnodeid_parameters; +rasqal_free_memory; +rasqal_alloc_memory; +rasqal_calloc_memory; +rasqal_query_set_generate_bnodeid_handler; +rasqal_languages_enumerate; +rasqal_graph_pattern_add_constraint; +rasqal_graph_pattern_print; +rasqal_graph_pattern_add_sub_graph_pattern; +rasqal_graph_pattern_get_flags; +rasqal_graph_pattern_visit; +rasqal_graph_pattern_get_constraint; +rasqal_graph_pattern_get_triple; +rasqal_graph_pattern_get_sub_graph_pattern; +rasqal_graph_pattern_get_sub_graph_pattern_sequence; +rasqal_graph_pattern_get_index; +rasqal_graph_pattern_operator_as_string; +rasqal_graph_pattern_get_operator; +rasqal_graph_pattern_get_constraint_sequence; +rasqal_new_floating_literal; +rasqal_literal_compare; +rasqal_literal_equals; +rasqal_new_double_literal; +rasqal_new_integer_literal; +rasqal_new_float_literal; +rasqal_new_typed_literal; +rasqal_new_decimal_literal; +rasqal_new_decimal_literal_from_decimal; +rasqal_new_string_literal; +rasqal_new_uri_literal; +rasqal_new_boolean_literal; +rasqal_literal_as_node; +rasqal_free_literal; +rasqal_literal_print; +rasqal_literal_print_type; +rasqal_new_pattern_literal; +rasqal_new_simple_literal; +rasqal_new_variable_literal; +rasqal_literal_as_string; +rasqal_literal_as_string_flags; +rasqal_literal_value; +rasqal_literal_datatype; +rasqal_literal_as_variable; +rasqal_new_literal_from_literal; +rasqal_free_query_results; +rasqal_query_results_get_bindings; +rasqal_query_results_get_binding_value; +rasqal_query_results_get_binding_value_by_name; +rasqal_query_results_get_triple; +rasqal_query_results_next; +rasqal_query_results_next_triple; +rasqal_query_results_write; +rasqal_query_results_formatter_write; +rasqal_query_results_get_boolean; +rasqal_query_results_get_bindings_count; +rasqal_query_results_get_binding_name; +rasqal_query_results_finished; +rasqal_query_results_get_count; +rasqal_query_results_is_syntax; +rasqal_query_results_is_graph; +rasqal_query_results_is_boolean; +rasqal_query_results_is_bindings; +rasqal_new_query; +rasqal_free_query; +rasqal_query_set_feature_string; +rasqal_query_get_feature_string; +rasqal_query_add_data_graph; +rasqal_query_set_variable; +rasqal_query_add_prefix; +rasqal_query_add_variable; +rasqal_query_prepare; +rasqal_query_execute; +rasqal_query_print; +rasqal_query_graph_pattern_visit; +rasqal_query_write; +rasqal_query_get_graph_pattern_sequence; +rasqal_query_get_graph_pattern; +rasqal_query_get_data_graph; +rasqal_query_get_variable; +rasqal_query_has_variable; +rasqal_query_get_triple; +rasqal_query_get_prefix; +rasqal_query_get_construct_triple; +rasqal_query_get_order_condition; +rasqal_query_get_group_condition; +rasqal_query_escape_counted_string; +rasqal_query_iostream_write_escaped_counted_string; +rasqal_query_get_group_conditions_sequence; +rasqal_query_get_order_conditions_sequence; +rasqal_query_get_wildcard; +rasqal_query_get_verb; +rasqal_query_set_user_data; +rasqal_query_get_user_data; +rasqal_query_verb_as_string; +rasqal_query_get_construct_triples_sequence; +rasqal_query_get_query_graph_pattern; +rasqal_query_get_prefix_sequence; +rasqal_query_get_triple_sequence; +rasqal_query_get_all_variable_sequence; +rasqal_query_get_anonymous_variable_sequence; +rasqal_query_get_bound_variable_sequence; +rasqal_query_get_data_graph_sequence; +rasqal_query_set_offset; +rasqal_query_get_offset; +rasqal_query_set_limit; +rasqal_query_get_limit; +rasqal_query_set_explain; +rasqal_query_get_explain; +rasqal_query_set_distinct; +rasqal_query_get_distinct; +rasqal_query_get_feature; +rasqal_query_set_feature; +rasqal_query_set_warning_handler; +rasqal_query_set_error_handler; +rasqal_query_set_fatal_error_handler; +rasqal_query_get_label; +rasqal_query_get_name; +rasqal_query_results_formats_check; +rasqal_new_query_results_formatter; +rasqal_new_query_results_formatter_by_mime_type; +rasqal_query_results_formats_enumerate; +rasqal_query_results_formats_enumerate_full; +rasqal_free_query_results_formatter; +rasqal_query_results_formatter_get_mime_type; +}; diff --git a/redland/redland-1.0.7.patch b/redland/redland-1.0.7.patch index dca6383d855e..97f7119e5b31 100644 --- a/redland/redland-1.0.7.patch +++ b/redland/redland-1.0.7.patch @@ -16,9 +16,9 @@ +later version may be used, or where a choice of which version of the +LGPL is applied is otherwise unspecified. + ---- misc/redland-1.0.7/librdf/makefile.mk Mon Jun 16 19:32:46 2008 -+++ misc/build/redland-1.0.7/librdf/makefile.mk Mon Jun 16 19:26:20 2008 -@@ -1,1 +1,114 @@ +--- misc/redland-1.0.7/librdf/makefile.mk 2008-12-26 17:24:00.000000000 +0100 ++++ misc/build/redland-1.0.7/librdf/makefile.mk 2008-12-26 17:20:46.000000000 +0100 +@@ -1 +1,124 @@ -dummy +#************************************************************************* +# @@ -64,7 +64,11 @@ + +.INCLUDE : settings.mk + ++.IF "$(GUI)"=="OS2" ++CDEFS+=-DLIBRDF_INTERNAL -DHAVE_CONFIG_H -DNDEBUG ++.ELSE +CDEFS+=-DLIBRDF_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS ++.ENDIF + +# --- Files -------------------------------------------------------- + @@ -118,6 +122,9 @@ +SHL1USE_EXPORTS=name + +#SHL1VERSIONMAP=../service/exports.map ++.IF "$(GUI)"=="OS2" ++SHL1VERSIONMAP=$(PRJ)$/redland$/redland2.map ++.ENDIF +SHL1DEF=$(MISC)$/$(SHL1TARGET).def +DEF1NAME=$(SHL1TARGET) + @@ -126,6 +133,9 @@ + $(PRJ)$/$(INPATH)$/lib$/libraptor.lib \ + $(PRJ)$/$(INPATH)$/lib$/librasqal.lib \ + ++.IF "$(GUI)"=="OS2" ++SHL1STDLIBS+= pthread.lib ++.ENDIF + +#$(LIBXML2LIB) \ +# $(XSLTLIB) \ @@ -759,3 +769,250 @@ #endif #include +--- misc/redland-1.0.7/librdf/rdf_config.h 2008-12-26 17:24:00.000000000 +0100 ++++ misc/build/redland-1.0.7/librdf/rdf_config.h 2008-12-26 17:20:46.000000000 +0100 +@@ -1 +1,243 @@ +-dummy ++/* librdf/rdf_config.h. Generated from rdf_config.h.in by configure. */ ++/* librdf/rdf_config.h.in. Generated from configure.ac by autoheader. */ ++ ++/* BDB has close method with 2 args */ ++/* #undef HAVE_BDB_CLOSE_2_ARGS */ ++ ++/* BDB defines DBC */ ++/* #undef HAVE_BDB_CURSOR */ ++ ++/* BDB cursor method has 4 arguments */ ++/* #undef HAVE_BDB_CURSOR_4_ARGS */ ++ ++/* BDB defines DB_TXN */ ++/* #undef HAVE_BDB_DB_TXN */ ++ ++/* BDB has fd method with 2 args */ ++/* #undef HAVE_BDB_FD_2_ARGS */ ++ ++/* Have BDB hash support */ ++/* #undef HAVE_BDB_HASH */ ++ ++/* BDB has open method with 6 args */ ++/* #undef HAVE_BDB_OPEN_6_ARGS */ ++ ++/* BDB has open method with 7 args */ ++/* #undef HAVE_BDB_OPEN_7_ARGS */ ++ ++/* BDB has set_flags method */ ++/* #undef HAVE_BDB_SET_FLAGS */ ++ ++/* BDB has dbopen method */ ++/* #undef HAVE_DBOPEN */ ++ ++/* BDB has db_create method */ ++/* #undef HAVE_DB_CREATE */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_DB_H */ ++ ++/* BDB has db_open method */ ++/* #undef HAVE_DB_OPEN */ ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_DLFCN_H 1 ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_DMALLOC_H */ ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_ERRNO_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_FCNTL_H 1 ++ ++/* Define to 1 if you have the `getenv' function. */ ++#define HAVE_GETENV 1 ++ ++/* Define to 1 if you have the `getopt' function. */ ++#define HAVE_GETOPT 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_GETOPT_H 1 ++ ++/* Define to 1 if you have the `getopt_long' function. */ ++#define HAVE_GETOPT_LONG 1 ++ ++/* Define to 1 if you have the `gettimeofday' function. */ ++#define HAVE_GETTIMEOFDAY 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_INTTYPES_H 1 ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_LIBPQ_FE_H */ ++ ++/* Have local MD5 digest */ ++/* #undef HAVE_LOCAL_MD5_DIGEST */ ++ ++/* Have local RIPEMD160 digest */ ++/* #undef HAVE_LOCAL_RIPEMD160_DIGEST */ ++ ++/* Have local SHA1 digest */ ++/* #undef HAVE_LOCAL_SHA1_DIGEST */ ++ ++/* Define to 1 if you have the `memcmp' function. */ ++#define HAVE_MEMCMP 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_MEMORY_H 1 ++ ++/* Define to 1 if you have the `mkstemp' function. */ ++#define HAVE_MKSTEMP 1 ++ ++/* Define to 1 if you have the `mktemp' function. */ ++#define HAVE_MKTEMP 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_OPENSSL_CRYPTO_H 1 ++ ++/* Have openssl MD5 digest */ ++#define HAVE_OPENSSL_CRYPTO_MD5_DIGEST 1 ++ ++/* Have openssl RIPEMD160 digest */ ++#define HAVE_OPENSSL_CRYPTO_RIPEMD160_DIGEST 1 ++ ++/* Have openssl SHA1 digest */ ++#define HAVE_OPENSSL_CRYPTO_SHA1_DIGEST 1 ++ ++/* Have openssl digests */ ++#define HAVE_OPENSSL_DIGESTS 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_PTHREAD_H 1 ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_SQLITE3_H */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_SQLITE_H */ ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STDINT_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STDLIB_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STRINGS_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STRING_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_STAT_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_TIME_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_TYPES_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_TIME_H 1 ++ ++/* Define to 1 if you have the `tmpnam' function. */ ++#define HAVE_TMPNAM 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_UNISTD_H 1 ++ ++/* Run time assertion checks. */ ++#define LIBRDF_ASSERT 1 ++ ++/* Print run time assertion check failure messages. */ ++#define LIBRDF_ASSERT_MESSAGES 1 ++ ++/* Release version as a decimal */ ++#define LIBRDF_VERSION_DECIMAL 10007 ++ ++/* Major version number */ ++#define LIBRDF_VERSION_MAJOR 1 ++ ++/* Minor version number */ ++#define LIBRDF_VERSION_MINOR 0 ++ ++/* Release version number */ ++#define LIBRDF_VERSION_RELEASE 7 ++ ++/* Build storage backends as modules */ ++/* #undef MODULAR_LIBRDF */ ++ ++/* Name of package */ ++#define PACKAGE "redland" ++ ++/* Define to the address where bug reports for this package should be sent. */ ++#define PACKAGE_BUGREPORT "http://bugs.librdf.org/" ++ ++/* Define to the full name of this package. */ ++#define PACKAGE_NAME "Redland RDF Application Framework" ++ ++/* Define to the full name and version of this package. */ ++#define PACKAGE_STRING "Redland RDF Application Framework 1.0.7" ++ ++/* Define to the one symbol short name of this package. */ ++#define PACKAGE_TARNAME "redland" ++ ++/* Define to the version of this package. */ ++#define PACKAGE_VERSION "1.0.7" ++ ++/* The size of `unsigned char', as computed by sizeof. */ ++#define SIZEOF_UNSIGNED_CHAR 1 ++ ++/* The size of `unsigned int', as computed by sizeof. */ ++#define SIZEOF_UNSIGNED_INT 4 ++ ++/* The size of `unsigned long', as computed by sizeof. */ ++#define SIZEOF_UNSIGNED_LONG 4 ++ ++/* The size of `unsigned long long', as computed by sizeof. */ ++#define SIZEOF_UNSIGNED_LONG_LONG 8 ++ ++/* SQLite API version */ ++/* #undef SQLITE_API */ ++ ++/* Define to 1 if you have the ANSI C header files. */ ++#define STDC_HEADERS 1 ++ ++/* Building file storage */ ++#define STORAGE_FILE 1 ++ ++/* Building hashes storage */ ++#define STORAGE_HASHES 1 ++ ++/* Building memory storage */ ++#define STORAGE_MEMORY 1 ++ ++/* Building MySQL storage */ ++/* #undef STORAGE_MYSQL */ ++ ++/* Building PostgreSQL storage */ ++/* #undef STORAGE_POSTGRESQL */ ++ ++/* Building SQLite storage */ ++/* #undef STORAGE_SQLITE */ ++ ++/* Building 3store storage */ ++/* #undef STORAGE_TSTORE */ ++ ++/* Define to 1 if you can safely include both and . */ ++#define TIME_WITH_SYS_TIME 1 ++ ++/* Version number of package */ ++#define VERSION "1.0.7" ++ ++/* Use POSIX threads */ ++#define WITH_THREADS 1 ++ ++/* Define to 1 if your processor stores words with the most significant byte ++ first (like Motorola and SPARC, unlike Intel and VAX). */ ++/* #undef WORDS_BIGENDIAN */ ++ ++/* Define to empty if `const' does not conform to ANSI C. */ ++/* #undef const */ diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index f5fc88f8438f..f448c5a82397 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -54,10 +54,14 @@ REDLANDVERSION=1.0.7 TARFILE_NAME=redland-$(REDLANDVERSION) PATCH_FILES=..$/$(TARFILE_NAME).patch -ADDITIONAL_FILES=librdf/makefile.mk +ADDITIONAL_FILES=librdf/makefile.mk librdf/rdf_config.h +.IF "$(OS)"=="OS2" +# there is no wntmsci build environment in the tarball; we use custom dmakefile +BUILD_ACTION=dmake +BUILD_DIR=$(CONFIGURE_DIR)$/librdf -.IF "$(OS)"=="WNT" +.ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" @@ -133,7 +137,7 @@ OUT2BIN+=librdf$/.libs$/*.dll .ENDIF .ELIF "$(OS)"=="OS2" -OUT2LIB+=librdf$/.libs$/*.a +# if we use dmake, this is done automagically .ELSE OUT2LIB+=librdf$/.libs$/librdf*.so* diff --git a/redland/redland/redland2.map b/redland/redland/redland2.map new file mode 100644 index 000000000000..660f80a0b8a4 --- /dev/null +++ b/redland/redland/redland2.map @@ -0,0 +1,316 @@ +REDLAND2 { +global: +GetVersionInfo; +librdf_get_concept_resource_by_index; +librdf_get_concept_uri_by_index; +librdf_new_digest; +librdf_digest_update_string; +librdf_digest_final; +librdf_digest_print; +librdf_digest_to_string; +librdf_free_digest; +librdf_digest_get_digest_length; +librdf_digest_get_digest; +librdf_digest_update; +librdf_digest_init; +librdf_new_hash_from_string; +librdf_new_hash_from_array_of_strings; +librdf_hash_get_del; +librdf_hash_get_as_boolean; +librdf_hash_get_as_long; +librdf_hash_get; +librdf_hash_interpret_template; +librdf_hash_print; +librdf_hash_print_keys; +librdf_hash_print_values; +librdf_new_hash_from_hash; +librdf_free_hash; +librdf_hash_put_strings; +librdf_version_decimal; +librdf_version_release; +librdf_version_minor; +librdf_version_major; +librdf_version_string; +librdf_copyright_string; +librdf_short_copyright_string; +librdf_init_world; +librdf_new_world; +librdf_destroy_world; +librdf_free_world; +librdf_world_open; +librdf_world_init_mutex; +librdf_world_set_feature; +librdf_world_get_feature; +librdf_world_set_digest; +librdf_world_set_logger; +librdf_world_set_warning; +librdf_world_set_error; +librdf_iterator_have_elements; +librdf_iterator_end; +librdf_iterator_next; +librdf_iterator_get_object; +librdf_iterator_get_context; +librdf_iterator_get_key; +librdf_iterator_get_value; +librdf_free_iterator; +librdf_iterator_add_map; +librdf_new_iterator; +librdf_new_empty_iterator; +librdf_log_message_locator; +librdf_log_message_message; +librdf_log_message_facility; +librdf_log_message_level; +librdf_log_message_code; +librdf_new_model; +librdf_new_model_with_options; +librdf_model_enumerate; +librdf_free_model; +librdf_model_add_typed_literal_statement; +librdf_model_add_string_literal_statement; +librdf_model_add; +librdf_model_get_source; +librdf_model_get_arc; +librdf_model_get_target; +librdf_model_add_submodel; +librdf_model_remove_submodel; +librdf_model_print; +librdf_model_add_statement; +librdf_model_remove_statement; +librdf_model_contains_statement; +librdf_model_context_add_statements; +librdf_model_context_add_statement; +librdf_model_context_remove_statements; +librdf_model_context_remove_statement; +librdf_model_find_statements_with_options; +librdf_model_find_statements_in_context; +librdf_new_model_from_model; +librdf_model_size; +librdf_model_add_statements; +librdf_model_as_stream; +librdf_model_serialise; +librdf_model_find_statements; +librdf_model_get_sources; +librdf_model_get_arcs; +librdf_model_get_targets; +librdf_model_get_arcs_in; +librdf_model_get_arcs_out; +librdf_model_has_arc_in; +librdf_model_has_arc_out; +librdf_model_contains_context; +librdf_model_context_as_stream; +librdf_model_context_serialize; +librdf_model_query_execute; +librdf_model_sync; +librdf_model_get_storage; +librdf_model_get_contexts; +librdf_model_get_feature; +librdf_model_set_feature; +librdf_model_load; +librdf_model_to_string; +librdf_model_to_counted_string; +librdf_model_transaction_get_handle; +librdf_model_transaction_rollback; +librdf_model_transaction_commit; +librdf_model_transaction_start_with_handle; +librdf_model_transaction_start; +librdf_new_node_from_uri_local_name; +librdf_new_node_from_normalised_uri_string; +librdf_node_decode; +librdf_new_node_from_uri_string; +librdf_new_node_from_uri; +librdf_new_node_from_literal; +librdf_new_node_from_typed_literal; +librdf_new_node_from_typed_counted_literal; +librdf_new_node; +librdf_new_node_from_blank_identifier; +librdf_free_node; +librdf_node_get_literal_value_as_latin1; +librdf_node_get_literal_value_is_wf_xml; +librdf_node_get_li_ordinal; +librdf_node_print; +librdf_node_to_string; +librdf_node_to_counted_string; +librdf_node_encode; +librdf_node_static_iterator_create; +librdf_new_node_from_node; +librdf_node_get_uri; +librdf_node_get_type; +librdf_node_get_literal_value; +librdf_node_get_literal_value_as_counted_string; +librdf_node_get_literal_value_language; +librdf_node_get_literal_value_datatype_uri; +librdf_node_get_blank_identifier; +librdf_node_is_resource; +librdf_node_is_literal; +librdf_node_is_blank; +librdf_node_equals; +librdf_parser_register_factory; +librdf_new_parser; +librdf_parser_enumerate; +librdf_new_parser_from_factory; +librdf_free_parser; +librdf_parser_parse_as_stream; +librdf_parser_parse_into_model; +librdf_parser_parse_string_as_stream; +librdf_parser_parse_string_into_model; +librdf_parser_parse_counted_string_as_stream; +librdf_parser_parse_counted_string_into_model; +librdf_parser_get_feature; +librdf_parser_set_feature; +librdf_parser_guess_name; +librdf_parser_get_uri_filter; +librdf_parser_set_uri_filter; +librdf_parser_get_namespaces_seen_count; +librdf_parser_get_namespaces_seen_uri; +librdf_parser_get_namespaces_seen_prefix; +librdf_parser_get_accept_header; +librdf_parser_set_warning; +librdf_parser_set_error; +librdf_query_register_factory; +librdf_new_query; +librdf_new_query_from_query; +librdf_new_query_from_factory; +librdf_free_query; +librdf_query_execute; +librdf_query_set_offset; +librdf_query_get_offset; +librdf_query_set_limit; +librdf_query_get_limit; +librdf_free_query_results; +librdf_query_results_to_string; +librdf_query_results_to_counted_string; +librdf_query_results_to_file; +librdf_query_results_to_file_handle; +librdf_query_results_get_count; +librdf_query_results_next; +librdf_query_results_finished; +librdf_query_results_get_bindings; +librdf_query_results_get_binding_value; +librdf_query_results_get_binding_name; +librdf_query_results_get_binding_value_by_name; +librdf_query_results_get_bindings_count; +librdf_query_results_is_bindings; +librdf_query_results_is_boolean; +librdf_query_results_is_graph; +librdf_query_results_is_syntax; +librdf_query_results_get_boolean; +librdf_query_results_as_stream; +librdf_query_results_formats_check; +librdf_query_results_formats_enumerate; +librdf_query_results_formatter_write; +librdf_free_query_results_formatter; +librdf_new_query_results_formatter_by_mime_type; +librdf_new_query_results_formatter; +librdf_serializer_register_factory; +librdf_new_serializer; +librdf_serializer_enumerate; +librdf_new_serializer_from_factory; +librdf_free_serializer; +librdf_serializer_serialize_stream_to_file; +librdf_serializer_serialize_model_to_file; +librdf_serializer_set_namespace; +librdf_serializer_serialize_stream_to_file_handle; +librdf_serializer_serialize_model; +librdf_serializer_serialize_model_to_file_handle; +librdf_serializer_serialize_stream_to_counted_string; +librdf_serializer_serialize_model_to_counted_string; +librdf_serializer_serialize_stream_to_string; +librdf_serializer_serialize_model_to_string; +librdf_serializer_serialize_stream_to_iostream; +librdf_serializer_serialize_model_to_iostream; +librdf_serializer_get_feature; +librdf_serializer_set_feature; +librdf_serializer_set_warning; +librdf_serializer_set_error; +librdf_new_statement_from_statement; +librdf_new_statement_from_nodes; +librdf_new_statement; +librdf_statement_init; +librdf_free_statement; +librdf_statement_is_complete; +librdf_statement_print; +librdf_statement_to_string; +librdf_statement_equals; +librdf_statement_match; +librdf_statement_encode; +librdf_statement_encode_parts; +librdf_statement_decode; +librdf_statement_decode_parts; +librdf_statement_clear; +librdf_statement_get_subject; +librdf_statement_set_subject; +librdf_statement_get_predicate; +librdf_statement_set_predicate; +librdf_statement_get_object; +librdf_statement_set_object; +librdf_storage_register_factory; +librdf_new_storage; +librdf_new_storage_with_options; +librdf_storage_enumerate; +librdf_new_storage_from_factory; +librdf_storage_context_add_statements; +librdf_storage_add_statements; +librdf_storage_context_add_statement; +librdf_storage_add_statement; +librdf_storage_contains_statement; +librdf_storage_find_statements; +librdf_storage_has_arc_in; +librdf_storage_get_sources; +librdf_storage_get_arcs; +librdf_storage_has_arc_out; +librdf_storage_get_targets; +librdf_storage_get_arcs_in; +librdf_storage_get_arcs_out; +librdf_new_storage_from_storage; +librdf_storage_remove_reference; +librdf_free_storage; +librdf_storage_context_remove_statements; +librdf_storage_find_statements_with_options; +librdf_storage_find_statements_in_context; +librdf_storage_open; +librdf_storage_close; +librdf_storage_size; +librdf_storage_remove_statement; +librdf_storage_context_remove_statement; +librdf_storage_context_serialise; +librdf_storage_context_as_stream; +librdf_storage_supports_query; +librdf_storage_query_execute; +librdf_storage_sync; +librdf_storage_get_contexts; +librdf_storage_get_feature; +librdf_storage_set_feature; +librdf_storage_transaction_get_handle; +librdf_storage_transaction_rollback; +librdf_storage_transaction_commit; +librdf_storage_transaction_start_with_handle; +librdf_storage_transaction_start; +librdf_storage_serialise; +librdf_storage_add_reference; +librdf_free_stream; +librdf_stream_print; +librdf_stream_end; +librdf_stream_next; +librdf_stream_get_object; +librdf_stream_get_context; +librdf_stream_add_map; +librdf_new_stream_from_node_iterator; +librdf_new_stream; +librdf_new_empty_stream; +librdf_new_uri_from_uri_local_name; +librdf_new_uri_normalised_to_base; +librdf_new_uri_relative_to_base; +librdf_new_uri_from_filename; +librdf_new_uri; +librdf_free_uri; +librdf_uri_print; +librdf_uri_to_string; +librdf_uri_to_counted_string; +librdf_uri_is_file_uri; +librdf_uri_to_filename; +librdf_new_uri_from_uri; +librdf_uri_as_string; +librdf_uri_as_counted_string; +librdf_uri_equals; +librdf_uri_compare; +}; -- cgit v1.2.3 From 9f1d152466ea3f3ae3712dc5b06c08bdb0ad6020 Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Fri, 6 Mar 2009 15:01:38 +0000 Subject: #i10000# AUGMENT_LIBRARY_PATH missing --- redland/rasqal/makefile.mk | 2 +- redland/redland/makefile.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'redland') diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index 94ee33869d2d..0a14095fedc4 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -110,7 +110,7 @@ LDFLAGS+:=$(EXTRA_LINKFLAGS) CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" 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 -BUILD_ACTION=$(GNUMAKE) +BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) #INSTALL_ACTION=$(GNUMAKE) install diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index f448c5a82397..9508d66f530d 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -116,7 +116,7 @@ XSLTLIB!:=$(XSLTLIB) # expand variable for (internal) xslt-config CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml -BUILD_ACTION=$(GNUMAKE) +BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) #INSTALL_ACTION=$(GNUMAKE) install -- cgit v1.2.3 From 010c6b93aefa966e9c92dd64ea79065353304a49 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Mon, 27 Apr 2009 11:24:10 +0000 Subject: CWS-TOOLING: integrate CWS sb107 2009-04-14 13:09:13 +0200 sb r270758 : CWS-TOOLING: rebase CWS sb107 to trunk@270723 (milestone: DEV300:m46) 2009-04-06 14:11:54 +0200 sb r270545 : #i100884# improve pagein effectiveness: wrap system libs in --as-needed on unxlngi6/unxlngx6 to avoid needing them where unneeded; link pagein as C program to avoid unneeded C++ runtime dependency; reorder pagein and javaldx in soffice startup script so that javaldx benefits from pagein 2009-03-31 16:40:23 +0200 sb r270287 : decrease collisions in hashCode computation 2009-03-30 11:48:39 +0200 sb r270207 : #i100668# corrected explicit template instantiation 2009-03-26 14:16:26 +0100 sb r270078 : #i100408# inadvertently dropped libexslt dynamic library in previous rev 269789 2009-03-26 10:52:51 +0100 sb r270058 : #i100576# fixed erroneous modification of RPM in previous rev 270057 2009-03-26 10:46:36 +0100 sb r270057 : #i100576# Enable HAVE_LD_HASH_STYLE in sdev300.ini for unxlgni6 and unxlngx6; corrected unxlngx6.mk so that HAVE_LD_HASH_STYLE actually has an effect on ultimate LINKFLAGS value. 2009-03-25 16:53:39 +0100 sb r270038 : #i85679# applied speed-symbolic-functions.diff provided by pmladek; re-ran autoconf; enabled HAVE_LD_BSYMBOLIC_FUNCTIONS for unxlngi6 and unxlngx6 in sdev300.ini 2009-03-25 15:29:12 +0100 sb r270031 : #i100408# missing fixes in addition to -c 269789 (to actually only put single instances of certain libraries into installation sets) 2009-03-25 15:17:10 +0100 sb r270029 : #i10084# revert masterfix additions of libraries to APPnSTDLIBs (during -r269000:269199) and instead use -rpath-link to avoid linker warnings on unxlngi6 and unxlngx6 2009-03-25 14:15:23 +0100 sb r270023 : added svn:ignore 2009-03-25 10:25:08 +0100 sb r270002 : #i10000# copied over trunk -c 269820 2009-03-23 10:16:00 +0100 sb r269858 : CWS-TOOLING: rebase CWS sb107 to trunk@269781 (milestone: DEV300:m44) 2009-03-20 11:22:27 +0100 sb r269789 : #i100408# reduce (multiple copies of) libraries delivered to solver; for that to work fine, deliver symlink feature got improved to only create a symlink if the original file exists 2009-03-20 09:21:32 +0100 sb r269782 : #i100396# replace s(HTML|RTF)_xxx declarations with OOO_STRING_SVTOOLS_(HTML|RTF)_xxx macros to reduce symbolic relocations at load time (at least on ELF systems). 2009-03-19 11:34:56 +0100 sb r269734 : #i100348# added VISIBILITY_HIDDEN=TRUE so that symbols from the resulting archive are not erroneously exported from dynamic libraries including the archive 2009-03-19 11:32:20 +0100 sb r269733 : #i100348# as a prerequisite for following changes, brought jpeg-6b.patch into "dmake create_patch" format and removed application/octet-stream svn:mime-type 2009-03-12 10:39:08 +0100 sb r269370 : duplicated cws/odfmetadata2/solenv/inc/target.mk -c 268831 2009-03-04 17:25:16 +0100 sb r268849 : #i99880# missing AUGMENT_LIBRARY_PATH 2009-02-25 17:54:34 +0100 sb r268459 : CWS-TOOLING: rebase CWS sb107 to trunk@268395 (milestone: DEV300:m42) 2009-02-25 09:23:15 +0100 sb r268413 : #i99584# avoid undefined operations on nOffset (patch by cmc) 2009-02-23 10:02:25 +0100 sb r268344 : #i99519 removed unnecessary library dependencies 2009-02-18 17:54:24 +0100 sb r268250 : avoid warnings about format specifier and argument mismatch (on 64bit debug builds) 2009-02-18 17:50:34 +0100 sb r268249 : avoid erroneous warning that control reaches end of non-void function 2009-02-18 17:33:53 +0100 sb r268248 : sdext/source/pdfimport/misc/pdfihelper.cxx: #include --- redland/prj/d.lst | 15 ++++++++++++--- redland/raptor/makefile.mk | 5 ++--- redland/rasqal/makefile.mk | 5 ++--- redland/redland/makefile.mk | 5 ++--- redland/redlandversion.mk | 6 ------ 5 files changed, 18 insertions(+), 18 deletions(-) (limited to 'redland') diff --git a/redland/prj/d.lst b/redland/prj/d.lst index 1d82c72e7485..03bbd21147ea 100644 --- a/redland/prj/d.lst +++ b/redland/prj/d.lst @@ -1,7 +1,16 @@ ..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\*.h -..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% -..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT% -..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT% +..\%__SRC%\lib\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so.1 +symlink: %_DEST%\lib%_EXT%\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so +..\%__SRC%\lib\libraptor.1.dylib %_DEST%\lib%_EXT%\libraptor.1.dylib +symlink: %_DEST%\lib%_EXT%\libraptor.1.dylib %_DEST%\lib%_EXT%\libraptor.dylib +..\%__SRC%\lib\librasqal.so.0 %_DEST%\lib%_EXT%\librasqal.so.0 +symlink: %_DEST%\lib%_EXT%\librasqal.so.0 %_DEST%\lib%_EXT%\librasqal.so +..\%__SRC%\lib\librasqal.0.dylib %_DEST%\lib%_EXT%\librasqal.0.dylib +symlink: %_DEST%\lib%_EXT%\librasqal.0.dylib %_DEST%\lib%_EXT%\librasqal.dylib +..\%__SRC%\lib\librdf.so.0 %_DEST%\lib%_EXT%\librdf.so.0 +symlink: %_DEST%\lib%_EXT%\librdf.so.0 %_DEST%\lib%_EXT%\librdf.so +..\%__SRC%\lib\librdf.0.dylib %_DEST%\lib%_EXT%\librdf.0.dylib +symlink: %_DEST%\lib%_EXT%\librdf.0.dylib %_DEST%\lib%_EXT%\librdf.dylib ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\lib*.dll.a %_DEST%\lib%_EXT%\lib*.a diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index f51c915030a4..12479a355f00 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -48,7 +48,6 @@ all: .INCLUDE : ../redlandversion.mk -#RAPTORVERSION=$(RAPTOR_MAJOR).$(RAPTOR_MINOR).$(RAPTOR_MICRO) RAPTORVERSION=$(RAPTOR_MAJOR).4.17 TARFILE_NAME=raptor-$(RAPTORVERSION) @@ -123,7 +122,7 @@ BUILD_DIR=$(CONFIGURE_DIR) OUT2INC+=src$/raptor.h .IF "$(OS)"=="MACOSX" -OUT2LIB+=src$/.libs$/libraptor*.dylib +OUT2LIB+=src$/.libs$/libraptor.1.dylib src$/.libs$/libraptor.dylib OUT2BIN+=src/raptor-config .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" @@ -138,7 +137,7 @@ OUT2BIN+=src/raptor-config # if we use dmake, this is done automagically .ELSE -OUT2LIB+=src$/.libs$/libraptor*.so* +OUT2LIB+=src$/.libs$/libraptor.so.1 src$/.libs$/libraptor.so OUT2BIN+=src/raptor-config .ENDIF diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index 0a14095fedc4..e739671eef13 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -48,7 +48,6 @@ all: .INCLUDE : ../redlandversion.mk -#RASQALVERSION=$(RASQAL_MAJOR).$(RASQAL_MINOR).$(RASQAL_MICRO) RASQALVERSION=0.9.15 TARFILE_NAME=rasqal-$(RASQALVERSION) @@ -121,7 +120,7 @@ BUILD_DIR=$(CONFIGURE_DIR) OUT2INC+=src$/rasqal.h .IF "$(OS)"=="MACOSX" -OUT2LIB+=src$/.libs$/librasqal*.dylib +OUT2LIB+=src$/.libs$/librasqal.0.dylib src$/.libs$/librasqal.dylib OUT2BIN+=src/rasqal-config .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" @@ -136,7 +135,7 @@ OUT2BIN+=src/rasqal-config # if we use dmake, this is done automagically .ELSE -OUT2LIB+=src$/.libs$/librasqal*.so* +OUT2LIB+=src$/.libs$/librasqal.so.0 src$/.libs$/librasqal.so OUT2BIN+=src/rasqal-config .ENDIF diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 9508d66f530d..e8b473769821 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -48,7 +48,6 @@ all: .INCLUDE : ../redlandversion.mk -#REDLANDVERSION=$(REDLAND_MAJOR).$(REDLAND_MINOR).$(REDLAND_MICRO) REDLANDVERSION=1.0.7 TARFILE_NAME=redland-$(REDLANDVERSION) @@ -127,7 +126,7 @@ BUILD_DIR=$(CONFIGURE_DIR) OUT2INC+=librdf$/*.h .IF "$(OS)"=="MACOSX" -OUT2LIB+=librdf$/.libs$/librdf*.dylib +OUT2LIB+=librdf$/.libs$/librdf.0.dylib .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" OUT2LIB+=librdf$/.libs$/*.a @@ -140,7 +139,7 @@ OUT2BIN+=librdf$/.libs$/*.dll # if we use dmake, this is done automagically .ELSE -OUT2LIB+=librdf$/.libs$/librdf*.so* +OUT2LIB+=librdf$/.libs$/librdf.so.0 .ENDIF # --- Targets ------------------------------------------------------ diff --git a/redland/redlandversion.mk b/redland/redlandversion.mk index a95bdb82cbea..9b7f73665c9b 100644 --- a/redland/redlandversion.mk +++ b/redland/redlandversion.mk @@ -30,14 +30,8 @@ #************************************************************************* RAPTOR_MAJOR=1 -RAPTOR_MINOR=1 -RAPTOR_MICRO=0 # rasqal has no stable abi RASQAL_MAJOR=0 -RASQAL_MINOR=0 -RASQAL_MICRO=0 # redland has no stable abi REDLAND_MAJOR=0 -REDLAND_MINOR=0 -REDLAND_MICRO=0 -- cgit v1.2.3 From 3552ce84b28ac58129175b6e08fd97f212abb017 Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Thu, 2 Jul 2009 09:05:03 +0000 Subject: CWS-TOOLING: integrate CWS odfmetadata2 2009-06-22 11:48:36 +0200 mst r273206 : - connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx: + add "include ustrbuf.hxx" to work around warning caused by solaris declaring a global "long l ;" 2009-06-19 14:25:25 +0200 mst r273159 : - scp2/source/ooo/file_library_ooo.scp: + fix MinGW build 2009-06-08 12:52:33 +0200 mst r272727 : - redland/raptor-1.4.18.patch.mingw, redland/raptor/makefile.mk: + disable parsers that do not build on MinGW (thanks for patch by tono) 2009-05-15 17:31:07 +0200 mst r271957 : fix typos 2009-05-15 17:28:57 +0200 mst r271956 : #i101965# - offapi/com/sun/star/text/TextPortion: + add missing properties: SoftPageBreak, DocumentIndexMark, ReferenceMark, Footnote, TextField + fix read-only status of properties: Bookmark, IsStart, IsCollapsed - offapi/type_reference/{typelibrary_history.txt,types.rdb}: + update reference types.rdb 2009-05-07 14:41:38 +0200 mst r271669 : - sw/inc/{fmtftn.hxx,unocoll.hxx,doc.hxx,editsh.hxx,ftninfo.hxx}, sw/source/core/layout/{flowfrm.cxx,ftnfrm.cxx}, sw/source/core/doc/docftn.cxx, sw/source/core/edit/edattr.cxx, sw/source/core/txtnode/atrftn.cxx, sw/source/core/unocore/unocoll.cxx, sw/source/ui/fldui/fldref.cxx: + fix warning ... the hard way + also fix signature of SwDoc::SetCurFtn 2009-05-05 19:52:55 +0200 mst r271556 : - sw/inc/undobj.hxx: + make some members const 2009-05-05 19:34:40 +0200 mst r271555 : - sw/inc/rolbck.hxx, sw/source/core/undo/rolbck.cxx: + make some members const 2009-05-05 19:13:14 +0200 mst r271553 : - sw/inc/{undobj.hxx,rolbck.hxx}, sw/source/core/undo/{unbkmk.cxx,rolbck.cxx}: + fix rebase merge error + rename SwHstryBookmark to SwHistoryBookmark + clean up SwUndoBookmark 2009-05-05 19:05:53 +0200 mst r271552 : - sw/source/core/unocore/unoportenum.cxx: + fix annoying assertion 2009-05-05 15:34:48 +0200 mst r271522 : CWS-TOOLING: rebase CWS odfmetadata2 to trunk@271427 (milestone: DEV300:m47) 2009-05-04 12:37:01 +0200 mst r271444 : trivial 2009-04-22 13:30:37 +0200 mst r271102 : - sfx2/inc/sfx2/dinfdlg.hxx: + trivial change 2009-04-21 16:46:58 +0200 mst r271043 : - sw/inc/hintids.hxx: + introduce some predicates for the various hints, and use them 2009-04-21 16:19:03 +0200 mst r271041 : - sw/inc/undobj.hxx, sw/source/core/doc/{docfly.cxx,docfmt.cxx,docftn.cxx,doctxm.cxx}, sw/source/core/undo/{unattr.cxx,unins.cxx}: + clean up unattr.cxx: remove/fix casts, prefix members, use auto_ptr, etc. 2009-04-21 15:34:23 +0200 mst r271039 : - sw/inc/{rolbck.hxx,undobj.hxx}, sw/source/core/doc/docfmt.cxx, sw/source/core/txtnode/{thints.cxx,txtedt.cxx}, sw/source/core/undo/{rolbck.cxx,undel.cxx,undobj.cxx,unins.cxx,unmove.cxx, unovwr.cxx,unsect.cxx,unspnd.cxx,untbl.cxx,untblk.cxx,unattr.cxx}: + clean up SwHistory, SwRegHistory and SwHistoryHint etc.: remove/fix casts, prefix members, remove wrong const annotations, use auto_ptr, remove unused members, etc. 2009-04-20 19:17:36 +0200 mst r271013 : - sw/inc/ndhints.hxx, sw/source/core/text/{itrtxt.cxx,txtftn.cxx,itratr.cxx,porfly.cxx, txtfrm.cxx,txtdrop.cxx,frmform.cxx}, sw/source/core/txtnode/{ndtxt.cxx,ndhints.cxx,thints.cxx,txtedt.cxx}, sw/source/core/edit/acorrect.cxx, sw/source/core/doc/{docedt.cxx,docfmt.cxx}, sw/source/filter/html/swhtml.cxx: + clean up SwHintsArray and its subclasses: remove/fix casts, prefix members 2009-04-20 18:42:07 +0200 mst r271007 : - sw/source/core/text/txtio.cxx, sw/source/core/edit/edattr.cxx, sw/source/core/undo/rolbck.cxx: + remove JP_NEWCORE dead code 2009-04-20 18:38:09 +0200 mst r271006 : - sw/source/core/unocore/unochart.cxx: + silence unxlngi warning (debug=t) 2009-04-20 16:36:13 +0200 mst r270991 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx, sfx2/source/doc/objserv.cxx, sw/source/ui/fldui/flddinf.hxx: + trivial cleanups 2009-04-20 15:28:52 +0200 mst r270990 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx, sfx2/source/doc/objserv.cxx: + fix bug: replaying a macro with a DocumentInfoItem removes all user-defined properties 2009-03-10 15:08:20 +0100 mst r269273 : - sfx2/source/doc/Metadatable.cxx: + add missing SolarMutex guards 2009-03-10 14:46:29 +0100 mst r269272 : - unoxml/source/rdf/librdf_repository.cxx: + never free rdf_world because that would call libxm2 xmlCleanupParser (and, to add insult to injury, other libxml2 functions later...) 2009-03-06 19:02:44 +0100 mst r269041 : argh! undo... 2009-03-06 19:00:58 +0100 mst r269040 : fix #i99931# - sw/source/ui/uno/unomod.cxx: + SwXViewSettings::_getSingleValue returns uninitialized memory for the ZoomType property if the value is PAGE_WIDTH_EXACT 2009-03-06 18:59:28 +0100 mst r269039 : - sw/inc/ndtxt.hxx, sw/source/core/txtnode/ndtxt.cxx, sw/source/core/unocore/unoportenum.cxx: + fix some more wntmsci12 warnings... 2009-03-06 18:56:46 +0100 mst r269038 : - sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx: + work around spurious warning on unxsoli4 debug=t 2009-03-05 14:02:01 +0100 mst r268902 : - sw/inc/txatbase.hxx: + back to c-style casts, they also compile on wntmsci12... 2009-03-05 10:23:25 +0100 mst r268882 : - comphelper/inc/comphelper/processfactory.hxx, comphelper/source/processfactory/processfactory.cxx: + revert change of return type of comphelper_getProcessComponentContext to Reference: does not build on wntmsci12 2009-03-04 19:08:09 +0100 mst r268861 : - sw/source/core/txtnode/{atrtox.cxx,ndtxt.cxx}: + fix initialization 2009-03-04 14:37:30 +0100 mst r268831 : - solenv/inc/target.mk: + fix CLASSPATH so complex tests run (fix by sb) 2009-03-04 14:36:30 +0100 mst r268830 : - sw/inc/unoobj.hxx, sw/source/core/unocore/{unoparagraph.cxx,unoobj.cxx,unoobj2.cxx}: + SwXParaFrameEnumeration constructor now takes SwPaM, not SwUnoCrsr + move SwParaSelection into unoparagraph.cxx, as it is only used there + bugfix: replace SwUnoCrsrs on stack with SwCursors 2009-03-04 14:34:46 +0100 mst r268829 : - sw/inc/pam.hxx, sw/source/core/crsr/pam.cxx, sw/source/core/edit/eddel.cxx, sw/source/core/doc/docredln.cxx, sw/source/core/undo/{untbl.cxx,undel.cxx}, sw/source/filter/rtf/swparrtf.cxx: + clean up SwPaM: prefix members + new constructor SwPosition(SwCntntNode&, xub_StrLen) + fix several broken SwPosition and SwPaM constructors + SwPam::DeleteMark now actually resets the unused position to default 2009-03-02 12:07:09 +0100 mst r268646 : - sw/inc/fmtcol.hxx: + fix annoying warning (gcc 4) 2009-03-02 12:06:27 +0100 mst r268645 : - odk/util/check.pl, odk/examples/DevelopersGuide/Text/TextDocuments.java: + rename module from FieldMaster to fieldmaster 2009-02-27 19:49:56 +0100 mst r268614 : - sfx2/inc/sfx2/Metadatable.hxx, sfx2/prj/d.lst, sfx2/source/doc/{Metadatable.cxx,makefile.mk}, sw/inc/{SwMetadatable.hxx,unoobj.hxx,undobj.hxx,ndtxt.hxx}, sw/source/core/doc/{SwMetadatable.cxx,makefile.mk,docnew.cxx}, sw/source/core/undo/{untbl.cxx,unins.cxx}, sw/source/core/unocore/unoparagraph.cxx, sw/source/ui/app/docsh.cxx: + move Metadatable implementation from sw to sfx2 2009-02-27 17:58:55 +0100 mst r268608 : - sw/inc/{SwMetadatable.hxx,undobj.hxx}, sw/source/core/doc/SwMetadatable.cxx, sw/source/core/undo/{untbl.cxx,unins.cxx,undel.cxx}: + CreateUndo now returns an opaque MetadatableUndo object 2009-02-27 13:15:44 +0100 mst r268587 : - sw/inc/ndtxt.hxx, sw/source/core/doc/docfmt.cxx, sw/source/core/text/{itratr.cxx,porlay.cxx}, sw/source/core/txtnode/{txtedt.cxx,ndtxt.cxx,thints.cxx}: + clean up SwTxtNode: fix casts, prefix members + factor out inline function SwTxtNode::TryDeleteSwpHints() 2009-02-27 13:14:30 +0100 mst r268586 : - svx/inc/svx/emphitem.hxx: + fix borken header guard 2009-02-27 13:13:56 +0100 mst r268585 : - sfx2/source/bastyp/progress.cxx: + fix use of compiler specific macro 2009-02-27 11:00:32 +0100 mst r268564 : - sw/inc/{txatbase.hxx,txtatr.hxx,txtinet.hxx,txtfld.hxx,txtftn.hxx, txtflcnt.hxx,txttxmrk.hxx,txtrfmrk.hxx}, sw/source/core/txtnode/{atrtox.cxx,atrref.cxx,atrflyin.cxx,atrftn.cxx, txtatr2.cxx,txatbase.cxx,atrfld.cxx,txtedt.cxx}, sw/source/core/text/atrstck.cxx, sw/source/core/access/acchyperlink.cxx, sw/source/core/doc/visiturl.cxx, sw/source/ui/wrtsh/wrtsh2.cxx: + clean up SwTxtAttr and its subclasses: remove/fix casts, prefix members + SwTxtINetFmt: remove unused member bColor - sw/source/core/text/txtfld.cxx: + move SwTxtFld methods to atrfld.cxx 2009-02-27 10:58:44 +0100 mst r268563 : - sfx2/inc/sfx2/sfxbasemodel.hxx: + don't privately inherit BaseMutex, ScModelObj wants to access it 2009-02-27 10:58:02 +0100 mst r268562 : - xmloff/source/core/{RDFaExportHelper.cxx,RDFaImportHelper.cxx}: + arrrgh!!! someone thought it would be a good idea to have 2 different versions of boost in external! and they're NOT compatible!!! insert an ugly fragile hack that maybe works with both... 2009-02-26 17:42:26 +0100 mst r268544 : - comphelper/inc/comphelper/storagehelper.hxx. sfx2/source/doc/DocumentMetadataAccess.cxx: + someone made IsValidZipEntryFileName a static method and didn't tell me 2009-02-26 15:52:56 +0100 mst r268529 : redland: split up patches 2009-02-26 13:17:56 +0100 mst r268509 : migration of cws odfmetadata2 from CVS (resync to m42): module sw #i95863# - sw/inc/segdefs{,_}.hxx: + remove obsolete files - sw/source/ui/inc/itemdef.hxx: + remove itemdef.hxx - sw/source/ui/app/[apphdl.cxx,docsh.cxx}, sw/source/ui/misc/glshell.cxx, sw/source/ui/shells/*.cxx, sw/source/ui/uiview/*.cxx, sw/source/ui/web/*.cxx: + use sfx2/msg.hxx instead of itemdef.hxx - sw/source/core/edit/eddel.cxx: + @ JP: SwEditShell::Replace: you're right, deleting the text to be replaced first, and then inserting a space, and then replacing that space is unnecessary. whew, i'm so happy that we finally answered that question after 11 years. - sw/inc/edimp.hxx: + remove FOREACHCURSOR_START, FOREACHCURSOR_END - sw/inc/{swcrsr.hxx,unocrsr.hxx,viscrs.hxx}, sw/source/core/crsr/{crsrsh.cxx,swcrsr.cxx,trvlreg.cxx,trvltbl.cxx, unocrsr.cxx,viscrs.cxx}, sw/source/core/doc/{docbm.cxx,doccorr.cxx}, sw/source/core/docnode/{ndtbl.cxx,ndtbl1.cxx}, sw/source/core/edit/editsh.cxx, sw/source/core/frmedt/{fefly1.cxx,fetab.cxx,tblsel.cxx}, sw/source/core/layout/trvlfrm.cxx, sw/source/core/unocore/{unochart.cxx,unoobj2.cxx,unoparagraph.cxx, unoportenum.cxx,unotbl.cxx}, sw/source/core/view/vprint.cxx: + remove the hideous virtual operator SwFooCursor* + make SwCursor::IsReadOnlyAvailable() virtual + make SwUnoCrsr::Clone() virtual + refactor SwCursor methods IsSelOver(), LeftRight(), UpDown(), GotoTable(): replace dynamic_cast<...>(this) with new virtual methods 2009-02-26 13:14:58 +0100 mst r268508 : migration of cws odfmetadata2 from CVS (resync to m42): module sw - sw/source/filter/xml/swxml.cxx: + XMLReader::Read: load RDF metadata of the ODF document - sw/source/filter/xml/wrtxml.cxx: + SwXMLWriter::_Write: write RDF metadata of the ODF document if ODF >= 1.2 #i90620#: import xml:id in text tables (does not actually work yet) - sw/source/filter/xml/xmltbli{.hxx,.cxx}: + SwXMLTableCellAttrTokens,aTableCellAttrTokenMap: add XML_TOK_TABLE_XMLID + SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl: attribute xml:id + SwXMLTableCellContext_Impl::CreateChildContext: attribute xml:id + SwXMLTableColContext_Impl::SwXMLTableColContext_Impl: attribute xml:id + SwXMLTableContext::SwXMLTableContext: attribute xml:id fix #i98530# - sw/inc/unoport.hxx, sw/source/core/unocore/unoport.cxx: + SwXTextPortion: make constructor params const& - sw/source/core/unocore/unoportenum.cxx: + refactor to remove some code duplication + fix bug: paragraph w/out hints: bookmark before frame gets lost #i97274# handle invalid tables - sw/source/core/layout/tabfrm.cxx, sw/source/filter/xml/xmltbli.cxx: + SwXMLTableContext::MakeTable(): check that the table actually contains cells, and abort (removing the inserted table nodes) if not 2009-02-26 13:11:48 +0100 mst r268507 : migration of cws odfmetadata2 from CVS (resync to m42): module sw refactor SwXTextRange and SwXParagraph - sw/inc/unoobj.hxx, sw/source/core/unocore/unoobj2.cxx: + remove 3 constructors of SwXTextRange + new method SwXTextRange::CreateParentXText + refactor SwXTextRange::CreateTextRangeFromPosition and SwXTextRange::getText - sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx: + SwXParagraph no longer uses a cursor; it registers directly at SwTxtNode + replace SwXParagraph::GetCrsr with SwXParagraph::GetTxtNode - sw/source/core/unocore/unotext.cxx, sw/source/ui/uno/unotxvw.cxx: + adapt to new SwXParagraph #i90620# - sw/inc/SwMetadatable.hxx, sw/source/core/doc/SwMetadatable.cxx: + new files: base classes sw::Metadatable and sw::MetadatableMixin; also, 2 implementations of IXmlIdRegistry: sw::XmlIdRegistryDocument and sw::XmlIdRegistryClipboard + setMetadataReference: handle empty stream name as auto-detect - sw/source/core/doc/makefile.mk: + add SwMetadatable add a XmlIdRegistry to SwDoc - sw/inc/doc.hxx: + SwDoc: add member m_pXmlIdRegistry, method GetXmlIdRegistry() - sw/source/core/doc/docnew.cxx: + initialize XmlIdRegistry in SwDoc::GetXmlIdRegistry, not in constructor, because the constructor is not told whether the SwDoc is a clipboard - sw/inc/docsh.hxx, sw/source/ui/app/docsh.cxx: + SwDocShell: override GetXmlIdRegistry() #i91563#: make the SwTxtNode metadatable - sw/inc/ndtxt.hxx + SwTxtNode inherits sw::Metadatable - sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx: + SwXParagraph inherits sw::MetadatableMixin #i91563#: handle SwTxtNode's metadata for delete - sw/source/core/txtnode/ndtxt.cxx: + SwTxtNode::SplitCntntNode: handle XmlId + SwTxtNode::JoinNext: merge XmlIds - sw/source/core/doc/docedt.cxx: + lcl_GetJoinFlags: document postcondition + SwDoc::Delete: remove XmlId only if SwTxtNode _becomes_ empty #i91563#: handle SwTxtNode's metadata for delete with undo - sw/inc/undobj.hxx + SwUndoDelete: new members m_pMetadataUndoStart, m_pMetadataUndoEnd - sw/source/core/undo/undel.cxx: + SwUndoDelete::SaveCntnt: save XmlIds for start and end SwTxtNode + SwUndoDelete::SaveCntnt: remove XmlId only if SwTxtNode _becomes_ empty + SwUndoDelete::Undo: restore saved XmlIds for start and end SwTxtNode - sw/source/core/docnode/ndcopy.cxx: + SwTxtNode::MakeCopy: register copy at XmlIdRegistry #i91563#: handle SwTxtNode's metadata for find/replace with undo - sw/source/core/undo/unins.cxx: + _UnReplaceData: rename members: add prefix m_ + _UnReplaceData: new members m_pMetadataUndoStart, m_pMetadataUndoEnd + _UnReplaceData::_UnReplaceData: save XmlIds for start and end SwTxtNode + _UnReplaceData::Undo: restore saved XmlIds for start and end SwTxtNode #i91563#: handle SwTxtNode's metadata for table-to-text with undo - sw/source/core/undo/untbl.cxx: + SwTblToTxtSave: rename members: add prefix m_ + SwTblToTxtSave: new members m_pMetadataUndoStart, m_pMetadataUndoEnd + SwTblToTxtSave::SwTblToTxtSave: save XmlIds for start and end SwTxtNode + SwTblToTxtSave::SwTblToTxtSave, SwNodes::UndoTableToText: always store the index of the first SwTxtNode in the cell, instead of the index of the first SwTxtNode in case of the first cell in a row, and the cell start node in other cases + SwNodes::UndoTableToText: restore saved XmlIds for start and end SwTxtNode - sw/source/core/docnode/ndtbl.cxx: + lcl_DelBox: simplify for refactored start index handling in SwTblToTxtSave 2009-02-26 13:02:28 +0100 mst r268505 : migration of cws odfmetadata2 from CVS (resync to m42): module sd - sd/source/ui/table/tableobjectbar.cxx,sd/source/ui/view/*.cxx: + remove invocations of SFX_DECL_TYPE - sd/source/ui/slideshow/SlideShowRestarter.cxx, sd/source/ui/toolpanel/LayoutMenu.cxx, sd/source/ui/unoidl/DrawController.cxx, sd/source/ui/view/{ViewShellBase.cxx,ViewTabBar.cxx,frmview.cxx}: + fix abuses of comphelper_getProcessComponentContext (missing release) 2009-02-26 13:01:24 +0100 mst r268504 : migration of cws odfmetadata2 from CVS (resync to m42): module starmath - starmath/source/document.cxx: + don't touch SfxObjectShell's privates 2009-02-26 13:00:37 +0100 mst r268503 : migration of cws odfmetadata2 from CVS (resync to m42): module sfx2 #i90620# - sfx2/inc/sfx2/XmlIdRegistry.hxx: + new file: interfaces sfx2::IXmlIdRegistry and sfx2::IXmlIdRegistrySupplier and a couple of utility functions - sfx2/inc/sfx2/DocumentMetadataAccess.hxx, sfx2/source/doc/DocumentMetadataAccess.cxx: + new class sfx2::DocumentMetadataAccess, implements XDocumentMetadataAccess + the URI of the DocumentMetadataAccess is now the URI from which the document was loaded; for a new document, use a vnd.sun.star.tdoc URI + add new function sfx2::createBaseURI() + prevent using reserved file names + try not to recurse into embedded subdocuments - sfx2/source/doc/makefile.mk: + add DocumentMetadataAccess - sfx2/util/makefile.mk: + link libsfx2 against libxml2 (needed for xmlValidateNCName) - sfx2/source/doc/makefile.mk: + add LIBXML_CFLAGS to CFLAGS - sfx2/prj/build.lst: + add dependence on libxml2 - sfx2/prj/d.lst: + add XmlIdRegistry.hxx, DocumentMetadataAccess.hxx - sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objxtor.cxx: + make SfxObjectShell's members private + new method SfxObjectShell::GetAutoStyleFilterIndex + SfxObjectShell inherits sfx2::IXmlIdRegistrySupplier - sfx2/source/dialog/templdlg.cxx, sfx2/source/doc/sfxbasemodel.cxx: + don't touch SfxObjectShell's privates - sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx: + SfxBaseModel inherits BaseMutex instead of IMPL_SfxBaseModel_MutexContainer + SfxBaseModel implements additional interface XDocumentMetadataAccess + IMPL_SfxBaseModel_DataContainer has new member: a sfx2::DocumentMetadataAccess + implementation of XDocumentMetadataAccess forwards to the sfx2::DocumentMetadataAccess member - sfx2/qa/complex/DocumentMetadataAccessTest.java, sfx2/qa/complex/{tests.sce,makefile.mk}, sfx2/qa/complex/testdocuments/TESTRDFA.odt: + add complex test: DocumentMetadataAccessTest + add RDFa test document #i95863# - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx: + refactor SfxDocumentItem so it no longer requires a XDocumentInfo + move struct CustomProperty to implementation file + remove class SfxDocumentUserPage + QueryValue,PutValue: remove MID_DOCINFO_FIELD* - sfx2/source/doc/objserv.cxx: + adapt to SfxDocumentItem change - sfx2/inc/sfx2/sfx.hrc, sfx2/sdi/sfxslots.sdi, sfx2/inc/sfx2/msg.hxx: + remove MID_DOCINFO_FIELD* + put all invocations of SFX_DECL_TYPE in msg.hxx, and undef SFX_DECL_TYPE - sfx2/source/doc/objxtor.cxx: + fix abuses of comphelper_getProcessComponentContext (missing release) - sfx2/source/doc/docfile.cxx: + SfxMedium::SfxMedium: don't dereference NULL, throw exception instead - sfx2/source/doc/objstor.cxx: + SfxObjectShell::DoLoad: fix bug: DocumentBaseURI is not initialized 2009-02-26 12:58:07 +0100 mst r268502 : migration of cws odfmetadata2 from CVS (resync to m42): module xmloff #i90620#: implement RDFa import (interface change) - xmloff/inc/xmloff/xmlimp.hxx. xmloff/source/core/xmlimp.cxx: + make SvXMLImport::GetAbsoluteReference() const + add SvXMLImport::GetComponentContext() + SvXMLImport::_InitCtor(): add RDFa namespace + add SvXMLImport::AddRDFa() + SvXMLImport::endDocument() inserts RDFa into document repository - xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/xmltoken.cxx: + new tokens for RDFa: XML_ABOUT, XML_DATATYPE - xmloff/inc/RDFaImportHelper.hxx, xmloff/source/core/RDFaImportHelper.cxx: + new class RDFaImportHelper + adapt the code to the bleak reality of broken C++ implementations + handle empty xhtml:about attributes properly, which are actually valid relative URIs + work around broken SvXMLImport::GetAbsoluteReference - xmloff/source/core/makefile.mk: + add RDFaImportHelper.cxx #i90620#: implement RDFa export - xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx: + add SvXMLExport::EnsureNamespace(), and a stack of namespace maps + add SvXMLExport::GetComponentContext() + add SvXMLExport::AddAttributesRDFa() - xmloff/inc/RDFaExportHelper.hxx, xmloff/source/core/RDFaExportHelper.cxx: + new class RDFaExportHelper + don't use std::map::data_type, which is actually called std::map::mapped_type by libstdc++ - xmloff/source/core/makefile.mk: + add RDFaExportHelper.cxx #i91563# - xmloff/inc/xmloff/txtimp.hxx, xmloff/source/text/txtimp.cxx: + XMLTextPAttrTokens: add RDFa tokens - xmloff/source/text/txtparai{.hxx,.cxx}: + import RDFa for text:p - xmloff/source/text/txtparae.cxx: + export RDFa for text:p interface change: use XHTML namespace instead of RDFA - xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/{xmltoken.cxx,xmlimp.cxx,xmlexp.cxx,RDFaExportHelper.cxx}, xmloff/source/text/txtimp.cxx: + use XHTML namespace instead of RDFA #i91565#, #i91566#: (preliminary) import for text:meta, text:meta-field - xmloff/source/text/txtparai.cxx: + new class XMLMetaImportContextBase with subclasses to import text:meta and text:meta-field - xmloff/source/text/XMLTextMarkImportContext.cxx: + change XMLTextMarkImportContext::CreateAndInsertMark to handle marks with no name (text:meta) #i91565#, #i91566#: (preliminary) export for text:meta, text:meta-field - xmloff/inc/txtflde.hxx, xmloff/source/text/txtflde.cxx: + add FIELD_ID_META to FieldIdEnum + new method XMLTextFieldExport::ExportMetaField() + change XMLTextFieldExport::ExportField{,AutoStyle,Helper} to take additional parameter for progress bar - xmloff/inc/xmloff/txtparae.hxx, xmloff/source/text/txtparae.cxx: + make XMLTextParagraphExport::exportTextRangeEnumeration() public + new method XMLTextParagraphExport::exportMeta() #i90620# - xmloff/inc/xmloff/xmlimp.hxx, xmloff/source/core/xmlimp.cxx, xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx: + rename SvXML{Im,Ex}port::GetStreamPath() to GetStreamName() + fix xml:id {im,ex}port for embedded documents and non-packages + adapt to API change: XMetadatable #i90620# GRDDL - xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/{xmltoken.cxx,xmlexp.cxx}: + add GRDDL namespace + add token XML_TRANSFORMATION + add grddl:transformation attribute to root elements for meta.xml, content.xml and styles.xml 2009-02-26 12:54:40 +0100 mst r268501 : migration of cws odfmetadata2 from CVS (resync to m42): module unoxml #i90620# - unoxml/source/rdf/librdf_repository.cxx: + librdf_Repository::importGraph: allocate buffer sized length of stream + switch from one librdf_world per repository to a single static world because redland has global variables with a brain-damaged life-cycle... + exportGraph: use new raptor 1.4.18 feature to disable writing an xml:base attribute in RDF/XML files - unoxml/source/rdf/librdf_repository.cxx: unoxml/qa/complex/RDFRepositoryTest.java: + adapt to predicate is URI change + adapt to RDFa API change + adapt to API change: RDFa has multiple predicates... + adapt to API change: XMetadatable derives from XURI + allow xhtml:datatype without xhtml:content + adapt to API change: attribute MetadataReference is StringPair - unoxml/source/rdf/CURI.cxx: + add some more URI constants 2009-02-26 12:53:32 +0100 mst r268500 : migration of cws odfmetadata2 from CVS (resync to m42): module package - package/inc/ImplValidCharacters.hxx: + remove (moved to comphelper) 2009-02-26 12:52:49 +0100 mst r268499 : migration of cws odfmetadata2 from CVS (resync to m42): module comphelper - comphelper/inc/comphelper/processfactory.hxx, comphelper/source/processfactory/processfactory.cxx: + add getProcessComponentContext() + change return type of comphelper_getProcessComponentContext to Reference - comphelper/inc/comphelper/stl_types.hxx: + add OUStringBufferAppender + add algorithm intersperse - comphelper/source/misc/string.cxx: + rewrite convertCommaSeparated with intersperse and OUStringBufferAppender - comphelper/inc/comphelper/stlunosequence.hxx: + fix bug: begin() on empty sequence != end() 2009-02-26 12:50:47 +0100 mst r268498 : migration of cws odfmetadata2 from CVS (resync to m42): module offapi #i96209# - offapi/com/sun/star/text/fieldmaster/*.idl: + rename module from FieldMaster to fieldmaster - offapi/type_reference/{typelibrary_history.txt,types.rdb}: + update reference types.rdb #i90620# - offapi/com/sun/star/rdf/{XMetadatable.idl,XDocumentMetadataAccess.idl}: + API change: XMetadatable derives from XURI + API change: replace XmlId (string) with MetadataReference (StringPair) - offapi/com/sun/star/rdf/{Statement.idl,XDocumentRepository.idl, XNamedGraph.idl,XRepository.idl}: + the predicate of a statement is a URI, not a Resource - offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl: + rename: s/Package/Document/ + remove uuid + remove everything related to mapping + graph names are now generated from base URI and file names + load methods: improve error handling with XInteractionHandler - offapi/com/sun/star/rdf/XDocumentRepository.idl: + change: RDFa permits using multiple predicates in one attribute + setStatementRDFa: subject is now XResource, object is now XMetadatable - offapi/com/sun/star/rdf/URIs.idl: + add some more URI constants - offapi/com/sun/star/rdf: + fix @since tags and replace with 2009-02-26 12:47:24 +0100 mst r268497 : migration of cws odfmetadata2 from CVS (resync to m42): module redland fix #i93768# - redland/raptor-1.4.17.patch, redland/raptor/makefile.mk: + disable GRDDL parser to prevent call to libxslt xsltSetDefaultSecurityPrefs, which breaks xmlhelp - redland/raptor/makefile.mk, redland/raptor-1.4.17.patch, redland/raptor-1.4.18.patch: + upgrade raptor to 1.4.18 + deactivate serializer for RSS/Atom (does not build) - redland/rasqal/makefile.mk, redland/rasqal-0.9.15.patch, redland/rasqal-0.9.16.patch, + upgrade rasqal to 0.9.16 - redland/redland/makefile.mk, redland/redland-1.0.7.patch, redland/redland-1.0.8.patch: + upgrade redland to 1.0.8 - redland/redlandversion.mk: + the librasqal SONAME has changed --- redland/README | 13 + redland/prj/d.lst | 8 +- redland/raptor-1.4.17.patch | 624 ------------ redland/raptor/makefile.mk | 32 +- redland/raptor/raptor-1.4.18.patch.autotools | 46 + redland/raptor/raptor-1.4.18.patch.dmake | 126 +++ redland/raptor/raptor-1.4.18.patch.legal | 18 + redland/raptor/raptor-1.4.18.patch.mingw | 30 + redland/raptor/raptor-1.4.18.patch.ooo_build | 43 + redland/raptor/raptor-1.4.18.patch.win32 | 78 ++ redland/rasqal-0.9.15.patch | 419 -------- redland/rasqal/makefile.mk | 26 +- redland/rasqal/rasqal-0.9.16.patch.autotools | 38 + redland/rasqal/rasqal-0.9.16.patch.dmake | 101 ++ redland/rasqal/rasqal-0.9.16.patch.legal | 18 + redland/rasqal/rasqal-0.9.16.patch.ooo_build | 34 + redland/rasqal/rasqal-0.9.16.patch.win32 | 43 + redland/redland-1.0.7.patch | 1018 -------------------- redland/redland/makefile.mk | 28 +- redland/redland/redland-1.0.8.patch.autotools | 58 ++ redland/redland/redland-1.0.8.patch.dmake | 118 +++ redland/redland/redland-1.0.8.patch.free_null | 174 ++++ redland/redland/redland-1.0.8.patch.legal | 54 ++ ....storage_hashes_context_serialize_get_statement | 35 + ...land-1.0.8.patch.storage_hashes_list_duplicates | 170 ++++ redland/redland/redland-1.0.8.patch.win32 | 154 +++ redland/redlandversion.mk | 3 +- 27 files changed, 1412 insertions(+), 2097 deletions(-) delete mode 100644 redland/raptor-1.4.17.patch create mode 100644 redland/raptor/raptor-1.4.18.patch.autotools create mode 100644 redland/raptor/raptor-1.4.18.patch.dmake create mode 100644 redland/raptor/raptor-1.4.18.patch.legal create mode 100644 redland/raptor/raptor-1.4.18.patch.mingw create mode 100644 redland/raptor/raptor-1.4.18.patch.ooo_build create mode 100644 redland/raptor/raptor-1.4.18.patch.win32 delete mode 100644 redland/rasqal-0.9.15.patch create mode 100644 redland/rasqal/rasqal-0.9.16.patch.autotools create mode 100644 redland/rasqal/rasqal-0.9.16.patch.dmake create mode 100644 redland/rasqal/rasqal-0.9.16.patch.legal create mode 100644 redland/rasqal/rasqal-0.9.16.patch.ooo_build create mode 100644 redland/rasqal/rasqal-0.9.16.patch.win32 delete mode 100644 redland/redland-1.0.7.patch create mode 100644 redland/redland/redland-1.0.8.patch.autotools create mode 100644 redland/redland/redland-1.0.8.patch.dmake create mode 100644 redland/redland/redland-1.0.8.patch.free_null create mode 100644 redland/redland/redland-1.0.8.patch.legal create mode 100644 redland/redland/redland-1.0.8.patch.storage_hashes_context_serialize_get_statement create mode 100644 redland/redland/redland-1.0.8.patch.storage_hashes_list_duplicates create mode 100644 redland/redland/redland-1.0.8.patch.win32 (limited to 'redland') diff --git a/redland/README b/redland/README index 57397ccc10d7..d01ae085cc66 100644 --- a/redland/README +++ b/redland/README @@ -19,3 +19,16 @@ It consists of 3 parts: Libraries: libraptor, librasqal, librdf +Patches: +There are several patches, most of which contain only hacks to get it to +build with OOo build system. +There are also 3 patches that fix bugs in redland and are of general interest: +- redland-1.0.8.patch.free_null: + redland destructor functions don't check if argument is NULL +- redland-1.0.8.patch.storage_hashes_context_serialize_get_statement: + hashes storage: the function to create statements during serialization does + not fill in the context propery (i.e. context is NULL) +- redland-1.0.8.patch.storage_hashes_list_duplicates: + hashes, list storage: if contexts are enabled, then it is possible to add + duplicate statements + diff --git a/redland/prj/d.lst b/redland/prj/d.lst index 03bbd21147ea..6363f9bbe330 100644 --- a/redland/prj/d.lst +++ b/redland/prj/d.lst @@ -3,10 +3,10 @@ symlink: %_DEST%\lib%_EXT%\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so ..\%__SRC%\lib\libraptor.1.dylib %_DEST%\lib%_EXT%\libraptor.1.dylib symlink: %_DEST%\lib%_EXT%\libraptor.1.dylib %_DEST%\lib%_EXT%\libraptor.dylib -..\%__SRC%\lib\librasqal.so.0 %_DEST%\lib%_EXT%\librasqal.so.0 -symlink: %_DEST%\lib%_EXT%\librasqal.so.0 %_DEST%\lib%_EXT%\librasqal.so -..\%__SRC%\lib\librasqal.0.dylib %_DEST%\lib%_EXT%\librasqal.0.dylib -symlink: %_DEST%\lib%_EXT%\librasqal.0.dylib %_DEST%\lib%_EXT%\librasqal.dylib +..\%__SRC%\lib\librasqal.so.1 %_DEST%\lib%_EXT%\librasqal.so.1 +symlink: %_DEST%\lib%_EXT%\librasqal.so.1 %_DEST%\lib%_EXT%\librasqal.so +..\%__SRC%\lib\librasqal.1.dylib %_DEST%\lib%_EXT%\librasqal.1.dylib +symlink: %_DEST%\lib%_EXT%\librasqal.1.dylib %_DEST%\lib%_EXT%\librasqal.dylib ..\%__SRC%\lib\librdf.so.0 %_DEST%\lib%_EXT%\librdf.so.0 symlink: %_DEST%\lib%_EXT%\librdf.so.0 %_DEST%\lib%_EXT%\librdf.so ..\%__SRC%\lib\librdf.0.dylib %_DEST%\lib%_EXT%\librdf.0.dylib diff --git a/redland/raptor-1.4.17.patch b/redland/raptor-1.4.17.patch deleted file mode 100644 index c22ff2b53e93..000000000000 --- a/redland/raptor-1.4.17.patch +++ /dev/null @@ -1,624 +0,0 @@ ---- misc/raptor-1.4.17/LICENSE.txt Sun Mar 30 06:52:22 2008 -+++ misc/build/raptor-1.4.17/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. -+ ---- misc/raptor-1.4.17/src/makefile.mk Mon Jun 16 17:24:23 2008 -+++ misc/build/raptor-1.4.17/src/makefile.mk Mon Jun 16 19:25:14 2008 -@@ -1,1 +1,128 @@ --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.17.patch,v $ -+# -+# $Revision: 1.2.6.2 $ -+# -+# 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 -+# -+# for a copy of the LGPLv3 License. -+# -+#************************************************************************* -+ -+PRJ=..$/..$/..$/..$/.. -+ -+PRJNAME=redland -+TARGET=raptor -+LIBTARGET=NO -+ -+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE -+ -+ -+# --- Settings ----------------------------------------------------- -+ -+.INCLUDE : settings.mk -+ -+.IF "$(GUI)"=="OS2" -+CDEFS+=-DRAPTOR_INTERNAL -DHAVE_CONFIG_H -DNDEBUG -+.ELSE -+CDEFS+=-DRAPTOR_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS -+.ENDIF -+ -+# --- 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_rss.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_grddl.obj \ -+ $(SLO)$/raptor_abbrev.obj \ -+ $(SLO)$/raptor_avltree.obj \ -+ $(SLO)$/raptor_statement.obj \ -+ $(SLO)$/raptor_turtle_writer.obj \ -+ -+ -+SHL1DEPN= makefile.mk -+SHL1OBJS= $(SLOFILES) -+SHL1USE_EXPORTS=name -+ -+#SHL1TARGET= $(TARGET)$(DLLPOSTFIX) -+SHL1TARGET= $(TARGET) -+SHL1IMPLIB= lib$(TARGET) -+ -+#SHL1VERSIONMAP=../service/exports.map -+.IF "$(GUI)"=="OS2" -+SHL1VERSIONMAP=$(PRJ)$/raptor$/raptor2.map -+.ENDIF -+SHL1DEF=$(MISC)$/$(SHL1TARGET).def -+DEF1NAME=$(SHL1TARGET) -+ -+SHL1STDLIBS= \ -+ $(LIBXML2LIB) \ -+ $(XSLTLIB) \ -+ -+# --- Targets ------------------------------------------------------ -+ -+.INCLUDE : target.mk -+ -+$(MISC)$/raptor_strcasecmp.c : strcasecmp.c -+ $(COPY) $< $@ -+ ---- misc/raptor-1.4.17/src/raptor-config.in Sat Jan 6 05:02:00 2007 -+++ misc/build/raptor-1.4.17/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@ ---- misc/raptor-1.4.17/src/win32_raptor_config.h Tue Oct 2 06:12:55 2007 -+++ misc/build/raptor-1.4.17/src/win32_raptor_config.h 2008-07-06 10:27:03.553625000 +0900 -@@ -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 -@@ -114,7 +126,9 @@ - - #define RAPTOR_PARSER_GUESS 1 - #define RAPTOR_PARSER_GRDDL 1 -+#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 -@@ -125,7 +139,8 @@ - #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 ---- misc/raptor-1.4.17/ltmain.sh 2008-02-02 22:28:24.000000000 +0900 -+++ misc/build/raptor-1.4.17/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) ---- misc/raptor-1.4.17/configure 2008-03-17 16:37:20.000000000 +0900 -+++ misc/build/raptor-1.4.17/configure 2008-07-06 09:05:29.974875000 +0900 -@@ -4317,7 +4317,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' - ;; - -@@ -4326,7 +4326,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.17/src/raptor_config.h 2008-12-26 11:49:30.000000000 +0100 -+++ misc/build/raptor-1.4.17/src/raptor_config.h 2008-12-26 01:10:34.000000000 +0100 -@@ -1 +1,310 @@ --dummy -+/* src/raptor_config.h. Generated from raptor_config.h.in by configure. */ -+/* src/raptor_config.h.in. Generated from configure.ac by autoheader. */ -+ -+/* does expat crash when it sees an initial UTF8 BOM? */ -+/* #undef EXPAT_UTF8_BOM_CRASH */ -+ -+/* vsnprint has C99 compatible return value */ -+#define HAVE_C99_VSNPRINTF 1 -+ -+/* Have curl/curl.h */ -+/* #undef HAVE_CURL_CURL_H */ -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_DLFCN_H 1 -+ -+/* Define to 1 if you have the header file. */ -+/* #undef HAVE_DMALLOC_H */ -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_ERRNO_H 1 -+ -+/* Define to 1 if you have the header file. */ -+//#define HAVE_EXPAT_H 1 -+ -+/* Define to 1 if you have the header file. */ -+/* #undef HAVE_FETCH_H */ -+ -+/* Define to 1 if you have the `getopt' function. */ -+#define HAVE_GETOPT 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_GETOPT_H 1 -+ -+/* Define to 1 if you have the `getopt_long' function. */ -+#define HAVE_GETOPT_LONG 1 -+ -+/* INN parsedate function present */ -+/* #undef HAVE_INN_PARSEDATE */ -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_INTTYPES_H 1 -+ -+/* Define to 1 if you have the `isascii' function. */ -+#define HAVE_ISASCII 1 -+ -+/* Define to 1 if you have the header file. */ -+/* #undef HAVE_LIBXML_HASH_H */ -+ -+/* Define to 1 if you have the header file. */ -+/* #undef HAVE_LIBXML_HTMLPARSER_H */ -+ -+/* Define to 1 if you have the header file. */ -+/* #undef HAVE_LIBXML_NANOHTTP_H */ -+ -+/* Define to 1 if you have the header file. */ -+/* #undef HAVE_LIBXML_PARSER_H */ -+ -+/* Define to 1 if you have the header file. */ -+/* #undef HAVE_LIBXML_SAX2_H */ -+ -+/* Define to 1 if you have the header file. */ -+/* #undef HAVE_LIBXSLT_XSLT_H */ -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_LIMITS_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_MATH_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_MEMORY_H 1 -+ -+/* Raptor raptor_parse_date available */ -+#define HAVE_RAPTOR_PARSE_DATE 1 -+ -+/* have round() in libm */ -+#define HAVE_ROUND 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_STDINT_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_STDLIB_H 1 -+ -+/* Define to 1 if you have the `strcasecmp' function. */ -+#define HAVE_STRCASECMP 1 -+ -+/* Define to 1 if you have the `stricmp' function. */ -+#define HAVE_STRICMP 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_STRINGS_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_STRING_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_PARAM_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_STAT_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_TIME_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_TYPES_H 1 -+ -+/* have trunc() in libm */ -+#define HAVE_TRUNC 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_UNISTD_H 1 -+ -+/* Define to 1 if you have the `vsnprintf' function. */ -+#define HAVE_VSNPRINTF 1 -+ -+/* Define to 1 if you have the `xmlCtxtUseOptions' function. */ -+/* #undef HAVE_XMLCTXTUSEOPTIONS */ -+ -+/* Define to 1 if you have the header file. */ -+/* #undef HAVE_XMLPARSE_H */ -+ -+/* Define to 1 if you have the `xmlSAX2InternalSubset' function. */ -+/* #undef HAVE_XMLSAX2INTERNALSUBSET */ -+ -+/* need 'extern int optind' declaration? */ -+/* #undef NEED_OPTIND_DECLARATION */ -+ -+/* Name of package */ -+#define PACKAGE "raptor" -+ -+/* Define to the address where bug reports for this package should be sent. */ -+#define PACKAGE_BUGREPORT "http://bugs.librdf.org/" -+ -+/* Define to the full name of this package. */ -+#define PACKAGE_NAME "Raptor RDF Parser" -+ -+/* Define to the full name and version of this package. */ -+#define PACKAGE_STRING "Raptor RDF Parser 1.4.17" -+ -+/* Define to the one symbol short name of this package. */ -+#define PACKAGE_TARNAME "raptor" -+ -+/* Define to the version of this package. */ -+#define PACKAGE_VERSION "1.4.17" -+ -+/* does libxml struct xmlEntity have a field etype */ -+/* #undef RAPTOR_LIBXML_ENTITY_ETYPE */ -+ -+/* does libxml struct xmlEntity have a field name_length */ -+/* #undef RAPTOR_LIBXML_ENTITY_NAME_LENGTH */ -+ -+/* does libxml have HTML_PARSE_NONET */ -+/* #undef RAPTOR_LIBXML_HTML_PARSE_NONET */ -+ -+/* does libxml xmlSAXHandler have externalSubset field */ -+/* #undef RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET */ -+ -+/* does libxml xmlSAXHandler have initialized field */ -+/* #undef RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED */ -+ -+/* does libxml have XML_PARSE_NONET */ -+/* #undef RAPTOR_LIBXML_XML_PARSE_NONET */ -+ -+/* Provide a Unicode NFC check */ -+#define RAPTOR_NFC_CHECK 1 -+ -+/* Building GRDDL parser */ -+/* #undef RAPTOR_PARSER_GRDDL */ -+ -+/* Building guess parser */ -+#define RAPTOR_PARSER_GUESS 1 -+ -+/* Building Notation 3 parser */ -+/* #undef RAPTOR_PARSER_N3 */ -+ -+/* Building N-Triples parser */ -+#define RAPTOR_PARSER_NTRIPLES 1 -+ -+/* Building RDF/XML parser */ -+#define RAPTOR_PARSER_RDFXML 1 -+ -+/* Building RSS Tag Soup parser */ -+#define RAPTOR_PARSER_RSS 1 -+ -+/* Building TRiG parser */ -+#define RAPTOR_PARSER_TRIG 1 -+ -+/* Building Turtle parser */ -+#define RAPTOR_PARSER_TURTLE 1 -+ -+/* Building Atom 1.0 serializer */ -+/* #undef RAPTOR_SERIALIZER_ATOM */ -+ -+/* Building GraphViz DOT serializer */ -+//#define RAPTOR_SERIALIZER_DOT 1 -+ -+/* Building JSON serializer */ -+//#define RAPTOR_SERIALIZER_JSON 1 -+ -+/* Building N-Triples serializer */ -+#define RAPTOR_SERIALIZER_NTRIPLES 1 -+ -+/* Building RDF/XML serializer */ -+#define RAPTOR_SERIALIZER_RDFXML 1 -+ -+/* Building RDF/XML-abbreviated serializer */ -+#define RAPTOR_SERIALIZER_RDFXML_ABBREV 1 -+ -+/* Building RSS 1.0 serializer */ -+#define RAPTOR_SERIALIZER_RSS_1_0 1 -+ -+/* Building Turtle serializer */ -+//#define RAPTOR_SERIALIZER_TURTLE 1 -+ -+/* Release version as a decimal */ -+#define RAPTOR_VERSION_DECIMAL 10417 -+ -+/* Major version number */ -+#define RAPTOR_VERSION_MAJOR 1 -+ -+/* Minor version number */ -+#define RAPTOR_VERSION_MINOR 4 -+ -+/* Release version number */ -+#define RAPTOR_VERSION_RELEASE 17 -+ -+/* Have libcurl WWW library */ -+/* #undef RAPTOR_WWW_LIBCURL */ -+ -+/* Have libfetch WWW library */ -+/* #undef RAPTOR_WWW_LIBFETCH */ -+ -+/* Have libxml available as a WWW library */ -+/* #undef RAPTOR_WWW_LIBXML */ -+ -+/* No WWW library */ -+#define RAPTOR_WWW_NONE 1 -+ -+/* Check XML 1.1 Names */ -+/* #undef RAPTOR_XML_1_1 */ -+ -+/* Use expat XML parser */ -+//#define RAPTOR_XML_EXPAT 1 -+ -+/* Use libxml XML parser */ -+/* #undef RAPTOR_XML_LIBXML */ -+ -+/* The size of `unsigned char', as computed by sizeof. */ -+#define SIZEOF_UNSIGNED_CHAR 1 -+ -+/* The size of `unsigned int', as computed by sizeof. */ -+#define SIZEOF_UNSIGNED_INT 4 -+ -+/* The size of `unsigned long', as computed by sizeof. */ -+#define SIZEOF_UNSIGNED_LONG 4 -+ -+/* The size of `unsigned short', as computed by sizeof. */ -+#define SIZEOF_UNSIGNED_SHORT 2 -+ -+/* Define to 1 if you have the ANSI C header files. */ -+#define STDC_HEADERS 1 -+ -+/* Define to 1 if you can safely include both and . */ -+#define TIME_WITH_SYS_TIME 1 -+ -+/* Version number of package */ -+#define VERSION "1.4.17" -+ -+/* Define to 1 if your processor stores words with the most significant byte -+ first (like Motorola and SPARC, unlike Intel and VAX). */ -+/* #undef WORDS_BIGENDIAN */ -+ -+/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a -+ `char[]'. */ -+/* #undef YYTEXT_POINTER */ -+ -+/* Define to empty if `const' does not conform to ANSI C. */ -+/* #undef const */ -+ -+/* 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 -+ -+/* does libxml struct xmlEntity have a field name_length */ -+/*#define RAPTOR_LIBXML_ENTITY_NAME_LENGTH*/ -+ -+/* Define to 1 if you have the `xmlCtxtUseOptions' function. */ -+#define HAVE_XMLCTXTUSEOPTIONS 1 -+ -+/* Define to 1 if you have the `xmlSAX2InternalSubset' function. */ -+#define HAVE_XMLSAX2INTERNALSUBSET 1 -+ -+/* does libxml xmlSAXHandler have externalSubset field */ -+#define RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET 1 -+ -+/* does libxml xmlSAXHandler have initialized field */ -+#define RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED 1 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..aa0f5ab29117 --- /dev/null +++ b/redland/raptor/raptor-1.4.18.patch.dmake @@ -0,0 +1,126 @@ +--- 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,122 @@ +-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 ++# ++# for a copy of the LGPLv3 License. ++# ++#************************************************************************* ++ ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=redland ++TARGET=raptor ++LIBTARGET=NO ++ ++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 diff --git a/redland/rasqal-0.9.15.patch b/redland/rasqal-0.9.15.patch deleted file mode 100644 index 67261f6a1d66..000000000000 --- a/redland/rasqal-0.9.15.patch +++ /dev/null @@ -1,419 +0,0 @@ ---- misc/rasqal-0.9.15/LICENSE.txt Sun Apr 22 23:09:08 2007 -+++ misc/build/rasqal-0.9.15/LICENSE.txt Mon Jun 16 15:55:45 2008 -@@ -61,3 +61,15 @@ - - Copyright (C) 2003-2007 Dave Beckett - Copyright (C) 2003-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. -+ ---- misc/rasqal-0.9.15/src/makefile.mk Mon Jun 16 19:30:20 2008 -+++ misc/build/rasqal-0.9.15/src/makefile.mk Mon Jun 16 19:25:48 2008 -@@ -1,1 +1,102 @@ --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: rasqal-0.9.15.patch,v $ -+# -+# $Revision: 1.2.6.2 $ -+# -+# 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 -+# -+# for a copy of the LGPLv3 License. -+# -+#************************************************************************* -+ -+PRJ=..$/..$/..$/..$/.. -+ -+PRJNAME=redland -+TARGET=rasqal -+LIBTARGET=NO -+ -+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE -+ -+ -+# --- Settings ----------------------------------------------------- -+ -+.INCLUDE : settings.mk -+ -+.IF "$(GUI)"=="OS2" -+CDEFS+=-DRASQAL_INTERNAL -DHAVE_CONFIG_H -DNDEBUG -D_MT -+.ELSE -+CDEFS+=-DRASQAL_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS -D_MT -+.ENDIF -+ -+# --- Files -------------------------------------------------------- -+ -+SLOFILES = \ -+ $(SLO)$/rasqal_datetime.obj \ -+ $(SLO)$/rasqal_decimal.obj \ -+ $(SLO)$/rasqal_engine.obj \ -+ $(SLO)$/rasqal_expr.obj \ -+ $(SLO)$/rasqal_feature.obj \ -+ $(SLO)$/rasqal_general.obj \ -+ $(SLO)$/rasqal_graph_pattern.obj \ -+ $(SLO)$/rasqal_literal.obj \ -+ $(SLO)$/rasqal_map.obj \ -+ $(SLO)$/rasqal_query_results.obj \ -+ $(SLO)$/rasqal_query.obj \ -+ $(SLO)$/rasqal_raptor.obj \ -+ $(SLO)$/rasqal_result_formats.obj \ -+ $(SLO)$/rasqal_xsd_datatypes.obj \ -+ $(SLO)$/rdql_lexer.obj \ -+ $(SLO)$/rdql_parser.obj \ -+ $(SLO)$/sparql_lexer.obj \ -+ $(SLO)$/sparql_parser.obj \ -+ $(SLO)$/strcasecmp.obj \ -+ -+ -+# $(SLO)$/rasqal_redland.obj \ -+ -+SHL1DEPN= makefile.mk -+SHL1OBJS= $(SLOFILES) -+SHL1USE_EXPORTS=name -+ -+#SHL1TARGET= $(TARGET)$(DLLPOSTFIX) -+SHL1TARGET= $(TARGET) -+SHL1IMPLIB= lib$(TARGET) -+ -+#SHL1VERSIONMAP=../service/exports.map -+.IF "$(GUI)"=="OS2" -+SHL1VERSIONMAP=$(PRJ)$/rasqal$/rasqal2.map -+.ENDIF -+SHL1DEF=$(MISC)$/$(SHL1TARGET).def -+DEF1NAME=$(SHL1TARGET) -+ -+SHL1STDLIBS= \ -+ $(PRJ)$/$(INPATH)$/lib$/libraptor.lib \ -+ -+ -+#$(LIBXML2LIB) \ -+# $(XSLTLIB) \ -+ -+# --- Targets ------------------------------------------------------ -+ -+.INCLUDE : target.mk -+ ---- misc/rasqal-0.9.15/src/rasqal-config.in Sun Apr 22 22:58:51 2007 -+++ misc/build/rasqal-0.9.15/src/rasqal-config.in Mon Jun 16 15:55:45 2008 -@@ -22,13 +22,22 @@ - # - # - --prefix=@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@ -+# -+#if test "@includedir@" != /usr/include ; then -+# includes="-I@includedir@" -+#else -+# includes= -+#fi - - - usage() -@@ -109,7 +118,8 @@ - echo $includes - fi - if test "$echo_libs" = "yes"; then -- echo -L@libdir@ -lrasqal -+# echo -L@libdir@ -lrasqal -+ echo -L${libdir} -lrasqal - fi - if test "$echo_libtool_libs" = "yes"; then - echo @libdir@/@RASQAL_LIBTOOLLIBS@ ---- misc/rasqal-0.9.15/src/win32_rasqal_config.h Mon Apr 23 09:18:27 2007 -+++ misc/build/rasqal-0.9.15/src/win32_rasqal_config.h Mon Jun 16 15:55:45 2008 -@@ -39,10 +39,13 @@ - - #define HAVE_STDLIB_H 1 - -+#define HAVE_ERRNO_H 1 -+ - #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 -@@ -87,6 +90,9 @@ - #include - #include - -+// argh! stupid winnt.h... -+#undef DELETE -+ - /* This is a SPARQL token define */ - #ifdef OPTIONAL - #undef OPTIONAL -@@ -118,8 +124,14 @@ - /* #define RAPTOR_TRIPLES_SOURCE_REDLAND 1 */ - - /* Use PCRE regex library */ --#define RASQAL_REGEX_PCRE 1 -+//#define RASQAL_REGEX_PCRE 1 - -+#define HAVE_LIBXML_SCHEMASINTERNALS_H 1 -+#define HAVE_LIBXML_XMLSCHEMASTYPES_H 1 -+#define HAVE_LIBXML_XMLSCHEMAS_H 1 -+ -+#define RASQAL_DECIMAL_NONE 1 -+ - #ifdef _DEBUG - #define RASQAL_DEBUG 1 - #endif ---- misc/rasqal-0.9.15/ltmain.sh 2006-03-12 03:49:04.000000000 +0900 -+++ misc/build/rasqal-0.9.15/ltmain.sh 2008-07-06 14:30:56.975375000 +0900 -@@ -1518,6 +1518,11 @@ - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - absdir=`cd "$dir" && pwd` -+ case $host_os in -+ mingw*) -+ absdir=`cygpath -m $absdir` -+ ;; -+ esac - if test -z "$absdir"; then - $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - absdir="$dir" -@@ -3195,9 +3200,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 - 1` -@@ -3275,8 +3280,8 @@ - ;; - - freebsd-elf) -- major=".$current" -- versuffix=".$current"; -+ major=.`expr $current - $age` -+ versuffix="$major.$age.$revision" - ;; - - irix | nonstopux) ---- misc/rasqal-0.9.15/src/rasqal_config.h Fri Dec 26 00:18:44 2008 -+++ misc/build/rasqal-0.9.15/src/rasqal_config.h Wed Nov 26 23:35:40 2008 -@@ -1 +1,169 @@ --dummy -+/* src/rasqal_config.h. Generated from rasqal_config.h.in by configure. */ -+/* src/rasqal_config.h.in. Generated from configure.ac by autoheader. */ -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_DLFCN_H 1 -+ -+/* Define to 1 if you have the header file. */ -+/* #undef HAVE_DMALLOC_H */ -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_ERRNO_H 1 -+ -+/* Define to 1 if you have the `getopt' function. */ -+#define HAVE_GETOPT 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_GETOPT_H 1 -+ -+/* Define to 1 if you have the `getopt_long' function. */ -+#define HAVE_GETOPT_LONG 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_GMP_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_INTTYPES_H 1 -+ -+/* Define to 1 if you have the header file. */ -+/* #undef HAVE_LIBXML_SCHEMASINTERNALS_H */ -+ -+/* Define to 1 if you have the header file. */ -+/* #undef HAVE_LIBXML_XMLSCHEMASTYPES_H */ -+ -+/* Define to 1 if you have the header file. */ -+/* #undef HAVE_LIBXML_XMLSCHEMAS_H */ -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_MEMORY_H 1 -+ -+/* Define to 1 if you have the header file. */ -+/* #undef HAVE_MPFR_H */ -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_REGEX_H 1 -+ -+/* have PCRE regex - Perl Compatible Regular Expressions */ -+#define HAVE_REGEX_PCRE 1 -+ -+/* Define to 1 if you have the `srandomdev' function. */ -+#define HAVE_SRANDOMDEV 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_STDINT_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_STDLIB_H 1 -+ -+/* Define to 1 if you have the `strcasecmp' function. */ -+#define HAVE_STRCASECMP 1 -+ -+/* Define to 1 if you have the `stricmp' function. */ -+#define HAVE_STRICMP 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_STRINGS_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_STRING_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_STAT_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_TIME_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_TYPES_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_UNISTD_H 1 -+ -+/* Define to 1 if you have the `vsnprintf' function. */ -+#define HAVE_VSNPRINTF 1 -+ -+/* need 'extern int optind' declaration? */ -+/* #undef NEED_OPTIND_DECLARATION */ -+ -+/* Name of package */ -+#define PACKAGE "rasqal" -+ -+/* Define to the address where bug reports for this package should be sent. */ -+#define PACKAGE_BUGREPORT "http://bugs.librdf.org/" -+ -+/* Define to the full name of this package. */ -+#define PACKAGE_NAME "Rasqal RDF Query Library" -+ -+/* Define to the full name and version of this package. */ -+#define PACKAGE_STRING "Rasqal RDF Query Library 0.9.15" -+ -+/* Define to the one symbol short name of this package. */ -+#define PACKAGE_TARNAME "rasqal" -+ -+/* Define to the version of this package. */ -+#define PACKAGE_VERSION "0.9.15" -+ -+/* Use raptor to provide triples */ -+#define RAPTOR_TRIPLES_SOURCE_RAPTOR 1 -+ -+/* Use redland to provide triples */ -+/* #undef RAPTOR_TRIPLES_SOURCE_REDLAND */ -+ -+/* Decimal from GNU MP library */ -+/* #undef RASQAL_DECIMAL_GMP */ -+ -+/* Decimal from MPFR library */ -+/* #undef RASQAL_DECIMAL_MPFR */ -+ -+/* Decimal without a library */ -+#define RASQAL_DECIMAL_NONE 1 -+ -+/* Building LAQRS query */ -+/* #undef RASQAL_QUERY_LAQRS */ -+ -+/* Building RDQL query */ -+#define RASQAL_QUERY_RDQL 1 -+ -+/* Building SPARQL query */ -+#define RASQAL_QUERY_SPARQL 1 -+ -+/* Use no regex library */ -+/* #undef RASQAL_REGEX_NONE */ -+ -+/* Use PCRE regex library */ -+/* #undef RASQAL_REGEX_PCRE */ -+ -+/* Use posix regex library */ -+#define RASQAL_REGEX_POSIX 1 -+ -+/* Release version as a decimal */ -+#define RASQAL_VERSION_DECIMAL 915 -+ -+/* Major version number */ -+#define RASQAL_VERSION_MAJOR 0 -+ -+/* Minor version number */ -+#define RASQAL_VERSION_MINOR 9 -+ -+/* Release version number */ -+#define RASQAL_VERSION_RELEASE 15 -+ -+/* Define to 1 if you have the ANSI C header files. */ -+#define STDC_HEADERS 1 -+ -+/* Define to 1 if you can safely include both and . */ -+#define TIME_WITH_SYS_TIME 1 -+ -+/* Version number of package */ -+#define VERSION "0.9.15" -+ -+/* Define to 1 if your processor stores words with the most significant byte -+ first (like Motorola and SPARC, unlike Intel and VAX). */ -+/* #undef WORDS_BIGENDIAN */ -+ -+/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a -+ `char[]'. */ -+/* #undef YYTEXT_POINTER */ -+ -+/* Define to empty if `const' does not conform to ANSI C. */ -+/* #undef const */ diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index e739671eef13..99d67b501f96 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.8.2.2 $ # # This file is part of OpenOffice.org. # @@ -48,18 +48,26 @@ all: .INCLUDE : ../redlandversion.mk -RASQALVERSION=0.9.15 +RASQALVERSION=0.9.16 TARFILE_NAME=rasqal-$(RASQALVERSION) -PATCH_FILES=..$/$(TARFILE_NAME).patch ADDITIONAL_FILES=src/makefile.mk src/rasqal_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" -# there is no wntmsci build environment in the tarball; we use custom dmakefile BUILD_ACTION=dmake BUILD_DIR=$(CONFIGURE_DIR)$/src - .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" CONFIGURE_DIR= @@ -100,11 +108,13 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl CPPFLAGS+:=$(EXTRA_CFLAGS) LDFLAGS+:=$(EXTRA_LINKFLAGS) +XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config .EXPORT: CPPFLAGS .EXPORT: LDFLAGS .EXPORT: LIBXML2LIB .EXPORT: ZLIB3RDLIB +.EXPORT: XSLTLIB CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" @@ -120,7 +130,7 @@ BUILD_DIR=$(CONFIGURE_DIR) OUT2INC+=src$/rasqal.h .IF "$(OS)"=="MACOSX" -OUT2LIB+=src$/.libs$/librasqal.0.dylib src$/.libs$/librasqal.dylib +OUT2LIB+=src$/.libs$/librasqal.$(RASQAL_MAJOR).dylib src$/.libs$/librasqal.dylib OUT2BIN+=src/rasqal-config .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" @@ -130,12 +140,10 @@ OUT2BIN+=src/rasqal-config .ELSE # if we use dmake, this is done automagically .ENDIF - .ELIF "$(OS)"=="OS2" # if we use dmake, this is done automagically - .ELSE -OUT2LIB+=src$/.libs$/librasqal.so.0 src$/.libs$/librasqal.so +OUT2LIB+=src$/.libs$/librasqal.so.$(RASQAL_MAJOR) src$/.libs$/librasqal.so OUT2BIN+=src/rasqal-config .ENDIF diff --git a/redland/rasqal/rasqal-0.9.16.patch.autotools b/redland/rasqal/rasqal-0.9.16.patch.autotools new file mode 100644 index 000000000000..100499dd3ed8 --- /dev/null +++ b/redland/rasqal/rasqal-0.9.16.patch.autotools @@ -0,0 +1,38 @@ +--- misc/rasqal-0.9.16/ltmain.sh Tue Apr 29 23:33:55 2008 ++++ misc/build/rasqal-0.9.16/ltmain.sh Wed Feb 18 13:25:00 2009 +@@ -1565,6 +1565,11 @@ + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + absdir=`cd "$dir" && pwd` ++ case $host_os in ++ mingw*) ++ absdir=`cygpath -m $absdir` ++ ;; ++ esac + if test -z "$absdir"; then + $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 + absdir="$dir" +@@ -3262,9 +3267,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 +3349,8 @@ + ;; + + freebsd-elf) +- major=".$current" +- versuffix=".$current"; ++ major=.`expr $current - $age` ++ versuffix="$major.$age.$revision" + ;; + + irix | nonstopux) diff --git a/redland/rasqal/rasqal-0.9.16.patch.dmake b/redland/rasqal/rasqal-0.9.16.patch.dmake new file mode 100644 index 000000000000..adfade9670bb --- /dev/null +++ b/redland/rasqal/rasqal-0.9.16.patch.dmake @@ -0,0 +1,101 @@ +--- misc/rasqal-0.9.16/src/makefile.mk Thu Nov 6 15:56:45 2008 ++++ misc/build/rasqal-0.9.16/src/makefile.mk Thu Nov 6 15:55:09 2008 +@@ -1,1 +1,97 @@ +-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: rasqal-0.9.16.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 ++# ++# for a copy of the LGPLv3 License. ++# ++#************************************************************************* ++ ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=redland ++TARGET=rasqal ++LIBTARGET=NO ++ ++EXTERNAL_WARNINGS_NOT_ERRORS=TRUE ++ ++ ++# --- Settings ----------------------------------------------------- ++ ++.INCLUDE : settings.mk ++ ++CDEFS+=-DRASQAL_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS -D_MT ++ ++# --- Files -------------------------------------------------------- ++ ++SLOFILES = \ ++ $(SLO)$/rasqal_datetime.obj \ ++ $(SLO)$/rasqal_decimal.obj \ ++ $(SLO)$/rasqal_engine.obj \ ++ $(SLO)$/rasqal_expr.obj \ ++ $(SLO)$/rasqal_feature.obj \ ++ $(SLO)$/rasqal_general.obj \ ++ $(SLO)$/rasqal_graph_pattern.obj \ ++ $(SLO)$/rasqal_literal.obj \ ++ $(SLO)$/rasqal_map.obj \ ++ $(SLO)$/rasqal_query_results.obj \ ++ $(SLO)$/rasqal_query.obj \ ++ $(SLO)$/rasqal_raptor.obj \ ++ $(SLO)$/rasqal_result_formats.obj \ ++ $(SLO)$/rasqal_rowsource.obj \ ++ $(SLO)$/rasqal_sparql_xml.obj \ ++ $(SLO)$/rasqal_xsd_datatypes.obj \ ++ $(SLO)$/rdql_lexer.obj \ ++ $(SLO)$/rdql_parser.obj \ ++ $(SLO)$/sparql_lexer.obj \ ++ $(SLO)$/sparql_parser.obj \ ++ $(SLO)$/strcasecmp.obj \ ++ ++ ++# $(SLO)$/rasqal_redland.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= \ ++ $(PRJ)$/$(INPATH)$/lib$/libraptor.lib \ ++ ++ ++#$(LIBXML2LIB) \ ++# $(XSLTLIB) \ ++ ++# --- Targets ------------------------------------------------------ ++ ++.INCLUDE : target.mk ++ diff --git a/redland/rasqal/rasqal-0.9.16.patch.legal b/redland/rasqal/rasqal-0.9.16.patch.legal new file mode 100644 index 000000000000..59b125d6b64e --- /dev/null +++ b/redland/rasqal/rasqal-0.9.16.patch.legal @@ -0,0 +1,18 @@ +--- misc/rasqal-0.9.16/LICENSE.txt Fri Jun 27 04:24:52 2008 ++++ misc/build/rasqal-0.9.16/LICENSE.txt Thu Nov 6 12:06:55 2008 +@@ -60,3 +60,15 @@ + + Copyright (C) 2003-2008 Dave Beckett + Copyright (C) 2003-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/rasqal/rasqal-0.9.16.patch.ooo_build b/redland/rasqal/rasqal-0.9.16.patch.ooo_build new file mode 100644 index 000000000000..eb4d24bb9c45 --- /dev/null +++ b/redland/rasqal/rasqal-0.9.16.patch.ooo_build @@ -0,0 +1,34 @@ +--- misc/rasqal-0.9.16/src/rasqal-config.in Sun Jun 22 07:07:12 2008 ++++ misc/build/rasqal-0.9.16/src/rasqal-config.in Thu Nov 6 12:10:52 2008 +@@ -22,10 +22,19 @@ + # + # + +-prefix=@prefix@ +-includes="-I@includedir@/@PACKAGE@" ++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} + ++#prefix=@prefix@ ++#includes="-I@includedir@/@PACKAGE@" + ++ + usage() + { + cat< + #include + ++// argh! stupid winnt.h... ++#undef DELETE ++ + /* This is a SPARQL token define */ + #ifdef OPTIONAL + #undef OPTIONAL +@@ -116,8 +122,14 @@ + /* #define RAPTOR_TRIPLES_SOURCE_REDLAND 1 */ + + /* Use PCRE regex library */ +-#define RASQAL_REGEX_PCRE 1 ++//#define RASQAL_REGEX_PCRE 1 + ++#define HAVE_LIBXML_SCHEMASINTERNALS_H 1 ++#define HAVE_LIBXML_XMLSCHEMASTYPES_H 1 ++#define HAVE_LIBXML_XMLSCHEMAS_H 1 ++ ++#define RASQAL_DECIMAL_NONE 1 ++ + #ifdef _DEBUG + #define RASQAL_DEBUG 1 + #endif diff --git a/redland/redland-1.0.7.patch b/redland/redland-1.0.7.patch deleted file mode 100644 index 97f7119e5b31..000000000000 --- a/redland/redland-1.0.7.patch +++ /dev/null @@ -1,1018 +0,0 @@ ---- misc/redland-1.0.7/LICENSE.txt Wed May 2 07:45:42 2007 -+++ misc/build/redland-1.0.7/LICENSE.txt Mon Jun 16 15:55:51 2008 -@@ -77,3 +77,15 @@ - 10. NOTICE - 11. http://purl.org/net/dajobe/ - 12. http://www.bristol.ac.uk/ -+ -+ -+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. -+ ---- misc/redland-1.0.7/librdf/makefile.mk 2008-12-26 17:24:00.000000000 +0100 -+++ misc/build/redland-1.0.7/librdf/makefile.mk 2008-12-26 17:20:46.000000000 +0100 -@@ -1 +1,124 @@ --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: redland-1.0.7.patch,v $ -+# -+# $Revision: 1.2.6.2 $ -+# -+# 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 -+# -+# for a copy of the LGPLv3 License. -+# -+#************************************************************************* -+ -+PRJ=..$/..$/..$/..$/.. -+ -+PRJNAME=redland -+TARGET=librdf -+LIBTARGET=NO -+ -+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE -+ -+ -+# --- Settings ----------------------------------------------------- -+ -+.INCLUDE : settings.mk -+ -+.IF "$(GUI)"=="OS2" -+CDEFS+=-DLIBRDF_INTERNAL -DHAVE_CONFIG_H -DNDEBUG -+.ELSE -+CDEFS+=-DLIBRDF_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS -+.ENDIF -+ -+# --- Files -------------------------------------------------------- -+ -+SLOFILES = \ -+ $(SLO)$/rdf_concepts.obj \ -+ $(SLO)$/rdf_digest.obj \ -+ $(SLO)$/rdf_digest_md5.obj \ -+ $(SLO)$/rdf_digest_openssl.obj \ -+ $(SLO)$/rdf_digest_sha1.obj \ -+ $(SLO)$/rdf_files.obj \ -+ $(SLO)$/rdf_hash.obj \ -+ $(SLO)$/rdf_hash_cursor.obj \ -+ $(SLO)$/rdf_hash_memory.obj \ -+ $(SLO)$/rdf_heuristics.obj \ -+ $(SLO)$/rdf_init.obj \ -+ $(SLO)$/rdf_iterator.obj \ -+ $(SLO)$/rdf_list.obj \ -+ $(SLO)$/rdf_log.obj \ -+ $(SLO)$/rdf_model.obj \ -+ $(SLO)$/rdf_model_storage.obj \ -+ $(SLO)$/rdf_node.obj \ -+ $(SLO)$/rdf_parser.obj \ -+ $(SLO)$/rdf_parser_raptor.obj \ -+ $(SLO)$/rdf_query.obj \ -+ $(SLO)$/rdf_query_rasqal.obj \ -+ $(SLO)$/rdf_query_results.obj \ -+ $(SLO)$/rdf_query_triples.obj \ -+ $(SLO)$/rdf_serializer.obj \ -+ $(SLO)$/rdf_serializer_raptor.obj \ -+ $(SLO)$/rdf_statement.obj \ -+ $(SLO)$/rdf_storage.obj \ -+ $(SLO)$/rdf_storage_file.obj \ -+ $(SLO)$/rdf_storage_list.obj \ -+ $(SLO)$/rdf_storage_hashes.obj \ -+ $(SLO)$/rdf_stream.obj \ -+ $(SLO)$/rdf_uri.obj \ -+ $(SLO)$/rdf_utf8.obj \ -+ -+ -+# $(SLO)$/rdf_hash_bdb.obj \ -+# $(SLO)$/rdf_storage_mysql.obj \ -+# $(SLO)$/rdf_storage_sqlite.obj \ -+ -+ -+SHL1DEPN= makefile.mk -+SHL1OBJS= $(SLOFILES) -+ -+#SHL1TARGET= $(TARGET)$(DLLPOSTFIX) -+SHL1TARGET= $(TARGET) -+SHL1IMPLIB= $(TARGET) -+SHL1USE_EXPORTS=name -+ -+#SHL1VERSIONMAP=../service/exports.map -+.IF "$(GUI)"=="OS2" -+SHL1VERSIONMAP=$(PRJ)$/redland$/redland2.map -+.ENDIF -+SHL1DEF=$(MISC)$/$(SHL1TARGET).def -+DEF1NAME=$(SHL1TARGET) -+ -+SHL1STDLIBS= \ -+ $(OPENSSLLIB) \ -+ $(PRJ)$/$(INPATH)$/lib$/libraptor.lib \ -+ $(PRJ)$/$(INPATH)$/lib$/librasqal.lib \ -+ -+.IF "$(GUI)"=="OS2" -+SHL1STDLIBS+= pthread.lib -+.ENDIF -+ -+#$(LIBXML2LIB) \ -+# $(XSLTLIB) \ -+ -+# --- Targets ------------------------------------------------------ -+ -+.INCLUDE : target.mk -+ ---- misc/redland-1.0.7/librdf/rdf_digest.c Wed Dec 5 18:25:18 2007 -+++ misc/build/redland-1.0.7/librdf/rdf_digest.c Mon Jun 16 15:55:51 2008 -@@ -250,6 +250,8 @@ - void - librdf_free_digest(librdf_digest *digest) - { -+ if(!digest) -+ return; - if(digest->context) - LIBRDF_FREE(digest_context, digest->context); - if(digest->digest) ---- misc/redland-1.0.7/librdf/rdf_hash.c Thu Dec 20 22:39:42 2007 -+++ misc/build/redland-1.0.7/librdf/rdf_hash.c Mon Jun 16 15:55:51 2008 -@@ -490,6 +490,8 @@ - void - librdf_free_hash(librdf_hash* hash) - { -+ if(!hash) -+ return; - if(hash->context) { - if(hash->is_open) - librdf_hash_close(hash); ---- misc/redland-1.0.7/librdf/rdf_init.c Tue Nov 6 16:26:18 2007 -+++ misc/build/redland-1.0.7/librdf/rdf_init.c Mon Jun 16 15:55:51 2008 -@@ -178,6 +178,9 @@ - void - librdf_free_world(librdf_world *world) - { -+ if(!world) -+ return; -+ - /* NOTE: raptor is always initialised as a parser and may - * be also used as a serializer, but it is NOT finished - * in the serializer_raptor registration. Therefore, always ---- misc/redland-1.0.7/librdf/rdf_list.c Thu Dec 20 22:39:42 2007 -+++ misc/build/redland-1.0.7/librdf/rdf_list.c Mon Jun 16 15:55:51 2008 -@@ -108,6 +108,8 @@ - void - librdf_free_list(librdf_list* list) - { -+ if(!list) -+ return; - LIBRDF_ASSERT_RETURN(list->iterator_count, - "Iterators were active on freeing list", ); - ---- misc/redland-1.0.7/librdf/rdf_model.c Tue Oct 23 16:55:06 2007 -+++ misc/build/redland-1.0.7/librdf/rdf_model.c Mon Jun 16 15:55:51 2008 -@@ -393,7 +393,8 @@ - librdf_iterator* iterator; - librdf_model* m; - -- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(model, librdf_model); -+ if(!model) -+ return; - - if(--model->usage) - return; ---- misc/redland-1.0.7/librdf/rdf_node.c Thu Dec 20 22:39:42 2007 -+++ misc/build/redland-1.0.7/librdf/rdf_node.c Mon Jun 16 15:55:51 2008 -@@ -726,7 +726,8 @@ - librdf_world *world; - #endif - -- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(node, librdf_node); -+ if(!node) -+ return; - - #ifdef WITH_THREADS - world = node->world; ---- misc/redland-1.0.7/librdf/rdf_parser.c Mon Dec 17 08:19:11 2007 -+++ misc/build/redland-1.0.7/librdf/rdf_parser.c Mon Jun 16 15:55:51 2008 -@@ -371,7 +371,8 @@ - void - librdf_free_parser(librdf_parser *parser) - { -- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(parser, librdf_parser); -+ if(!parser) -+ return; - - if(parser->context) { - if(parser->factory->terminate) ---- misc/redland-1.0.7/librdf/rdf_query.c Tue Oct 23 16:55:06 2007 -+++ misc/build/redland-1.0.7/librdf/rdf_query.c Mon Jun 16 15:55:51 2008 -@@ -388,7 +388,8 @@ - void - librdf_free_query(librdf_query* query) - { -- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(query, librdf_query); -+ if(!query) -+ return; - - if(--query->usage) - return; ---- misc/redland-1.0.7/librdf/rdf_query_results.c Fri Oct 26 04:23:36 2007 -+++ misc/build/redland-1.0.7/librdf/rdf_query_results.c Mon Jun 16 15:55:51 2008 -@@ -244,7 +244,8 @@ - void - librdf_free_query_results(librdf_query_results* query_results) - { -- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(query_results, librdf_query_results); -+ if(!query_results) -+ return; - - if(query_results->query->factory->free_results) - query_results->query->factory->free_results(query_results); -@@ -636,6 +637,8 @@ - void - librdf_free_query_results_formatter(librdf_query_results_formatter* formatter) - { -+ if(!formatter) -+ return; - if(formatter->query_results->query->factory->free_results_formatter) - formatter->query_results->query->factory->free_results_formatter(formatter); - } ---- misc/redland-1.0.7/librdf/rdf_serializer.c Tue Oct 23 16:55:06 2007 -+++ misc/build/redland-1.0.7/librdf/rdf_serializer.c Mon Jun 16 15:55:51 2008 -@@ -373,7 +373,8 @@ - void - librdf_free_serializer(librdf_serializer *serializer) - { -- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(serializer, librdf_serializer); -+ if(!serializer) -+ return; - - if(serializer->context) { - if(serializer->factory->terminate) ---- misc/redland-1.0.7/librdf/rdf_statement.c Tue Nov 6 16:26:18 2007 -+++ misc/build/redland-1.0.7/librdf/rdf_statement.c Mon Jun 16 15:55:51 2008 -@@ -255,7 +255,8 @@ - librdf_world *world; - #endif - -- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(statement, librdf_statement); -+ if(!statement) -+ return; - - #ifdef WITH_THREADS - world = statement->world; ---- misc/redland-1.0.7/librdf/rdf_storage.c Thu Dec 20 22:39:42 2007 -+++ misc/build/redland-1.0.7/librdf/rdf_storage.c Mon Jun 16 15:55:51 2008 -@@ -608,7 +608,8 @@ - void - librdf_free_storage (librdf_storage* storage) - { -- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(storage, librdf_storage); -+ if(!storage) -+ return; - - if(--storage->usage) - return; ---- misc/redland-1.0.7/librdf/rdf_storage_hashes.c Thu Dec 20 22:39:42 2007 -+++ misc/build/redland-1.0.7/librdf/rdf_storage_hashes.c Mon Jun 16 15:55:51 2008 -@@ -1389,6 +1389,66 @@ - LIBRDF_STATEMENT_OBJECT); - } - -+ -+/* return -1 on failure, 1 if context contains stmt, 0 if not */ -+static int -+librdf_storage_hashes_context_contains_statement(librdf_storage* storage, -+ librdf_node* context_node, -+ librdf_statement* statement) -+{ -+ librdf_storage_hashes_context* context=(librdf_storage_hashes_context*)storage->context; -+ librdf_hash_datum key, value; /* on stack - not allocated */ -+ size_t size; -+ int status; -+ -+ if(context->contexts_index < 0) { -+ librdf_log(storage->world, 0, LIBRDF_LOG_WARN, LIBRDF_FROM_STORAGE, NULL, -+ "Storage was created without context support"); -+ return -1; -+ } -+ -+ /* ENCODE KEY */ -+ size=librdf_node_encode(context_node, NULL, 0); -+ if (!size) -+ return -1; -+ key.data=(char*)LIBRDF_MALLOC(cstring, size); -+ if (!key.data) -+ return -1; -+ key.size=librdf_node_encode(context_node, -+ (unsigned char*)key.data, size); -+ if (!key.size) { -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ -+ /* ENCODE VALUE */ -+ size=librdf_statement_encode(statement, NULL, 0); -+ if (!size) { -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ value.data=(char*)LIBRDF_MALLOC(cstring, size); -+ if (!value.data) { -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ value.size=librdf_statement_encode(statement, (unsigned char*)value.data, size); -+ if (!value.size) { -+ LIBRDF_FREE(data, value.data); -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ -+ status=librdf_hash_exists(context->hashes[context->contexts_index], &key, &value); -+ LIBRDF_FREE(data, value.data); -+ LIBRDF_FREE(data, key.data); -+ -+ /* DO NOT free statement, ownership was not passed in */ -+ return status; -+} -+ -+ -+ - /** - * librdf_storage_hashes_context_add_statement: - * @storage: #librdf_storage object -@@ -1414,7 +1474,15 @@ - "Storage was created without context support"); - return 1; - } -- -+ -+ /* Do not add duplicate statements */ -+ status=librdf_storage_hashes_context_contains_statement(storage, context_node, statement); -+ if(status) -+ if(status < 0) -+ return 1; -+ else -+ return 0; -+ - if(librdf_storage_hashes_add_remove_statement(storage, - statement, context_node, 1)) - return 1; -@@ -1595,7 +1663,6 @@ - { - librdf_storage_hashes_context_serialise_stream_context* scontext=(librdf_storage_hashes_context_serialise_stream_context*)context; - librdf_hash_datum* v; -- librdf_node** cnp=NULL; - - switch(flags) { - case LIBRDF_ITERATOR_GET_METHOD_GET_OBJECT: -@@ -1608,20 +1675,14 @@ - return scontext->context_node; - } - -- /* current stuff is out of date - get new cached answers */ -- if(scontext->index_contexts) { -- if(scontext->context_node) -- librdf_free_node(scontext->context_node); -- scontext->context_node=NULL; -- cnp=&scontext->context_node; -- } -- -+ /* note: scontext->context_node is still valid */ -+ - librdf_statement_clear(&scontext->current); - - v=(librdf_hash_datum*)librdf_iterator_get_value(scontext->iterator); -- -+ - /* decode value content and optional context */ -- if(!librdf_statement_decode_parts(&scontext->current, cnp, -+ if(!librdf_statement_decode_parts(&scontext->current, NULL, - (unsigned char*)v->data, v->size)) { - return NULL; - } ---- misc/redland-1.0.7/librdf/rdf_storage_list.c Thu Dec 20 22:39:42 2007 -+++ misc/build/redland-1.0.7/librdf/rdf_storage_list.c Mon Jun 16 15:55:51 2008 -@@ -459,6 +459,64 @@ - } - - -+/* return -1 on failure, 1 if context contains stmt, 0 if not */ -+static int -+librdf_storage_list_context_contains_statement(librdf_storage* storage, -+ librdf_node* context_node, -+ librdf_statement* statement) -+{ -+ librdf_storage_list_context* context=(librdf_storage_list_context*)storage->context; -+ librdf_hash_datum key, value; /* on stack - not allocated */ -+ size_t size; -+ int status; -+ -+ if(!context->index_contexts) { -+ librdf_log(storage->world, 0, LIBRDF_LOG_WARN, LIBRDF_FROM_STORAGE, NULL, -+ "Storage was created without context support"); -+ return -1; -+ } -+ -+ /* ENCODE KEY */ -+ size=librdf_node_encode(context_node, NULL, 0); -+ if (!size) -+ return -1; -+ key.data=(char*)LIBRDF_MALLOC(cstring, size); -+ if (!key.data) -+ return -1; -+ key.size=librdf_node_encode(context_node, -+ (unsigned char*)key.data, size); -+ if (!key.size) { -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ -+ /* ENCODE VALUE */ -+ size=librdf_statement_encode(statement, NULL, 0); -+ if (!size) { -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ value.data=(char*)LIBRDF_MALLOC(cstring, size); -+ if (!value.data) { -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ value.size=librdf_statement_encode(statement, (unsigned char*)value.data, size); -+ if (!value.size) { -+ LIBRDF_FREE(data, value.data); -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ -+ status=librdf_hash_exists(context->contexts, &key, &value); -+ LIBRDF_FREE(data, value.data); -+ LIBRDF_FREE(data, key.data); -+ -+ /* DO NOT free statement, ownership was not passed in */ -+ return status; -+} -+ -+ - /** - * librdf_storage_list_context_add_statement: - * @storage: #librdf_storage object -@@ -485,7 +543,15 @@ - "Storage was created without context support"); - return 1; - } -- -+ -+ /* Do not add duplicate statements */ -+ status=librdf_storage_list_context_contains_statement(storage, context_node, statement); -+ if(status) -+ if(status < 0) -+ return 1; -+ else -+ return 0; -+ - /* Store statement + node in the storage_list */ - sln=(librdf_storage_list_node*)LIBRDF_MALLOC(librdf_storage_list_node, sizeof(librdf_storage_list_node)); - if(!sln) ---- misc/redland-1.0.7/librdf/rdf_stream.c Mon Dec 24 00:23:10 2007 -+++ misc/build/redland-1.0.7/librdf/rdf_stream.c Mon Jun 16 15:55:52 2008 -@@ -126,6 +126,9 @@ - void - librdf_free_stream(librdf_stream* stream) - { -+ if(!stream) -+ return; -+ - if(stream->finished_method) - stream->finished_method(stream->context); - ---- misc/redland-1.0.7/librdf/rdf_uri.c Tue Oct 23 16:55:06 2007 -+++ misc/build/redland-1.0.7/librdf/rdf_uri.c Mon Jun 16 15:55:52 2008 -@@ -409,7 +409,8 @@ - librdf_world *world; - #endif - -- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(uri, librdf_uri); -+ if(!uri) -+ return; - - #ifdef WITH_THREADS - world = uri->world; ---- misc/redland-1.0.7/librdf/win32_rdf_config.h Sun May 6 19:14:36 2007 -+++ misc/build/redland-1.0.7/librdf/win32_rdf_config.h Sat Jul 12 08:56:20 2008 -@@ -45,7 +45,8 @@ - #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 -@@ -74,40 +75,40 @@ - */ - - /* BDB has close method with 2 args */ --#define HAVE_BDB_CLOSE_2_ARGS 1 -+// #define HAVE_BDB_CLOSE_2_ARGS 1 - - /* BDB defines DBC */ --#define HAVE_BDB_CURSOR 1 -+// #define HAVE_BDB_CURSOR 1 - - /* BDB cursor method has 4 arguments */ --#define HAVE_BDB_CURSOR_4_ARGS 1 -+// #define HAVE_BDB_CURSOR_4_ARGS 1 - - /* BDB defines DB_TXN */ --#define HAVE_BDB_DB_TXN 1 -+// #define HAVE_BDB_DB_TXN 1 - - /* BDB has fd method with 2 args */ --#define HAVE_BDB_FD_2_ARGS 1 -+// #define HAVE_BDB_FD_2_ARGS 1 - - /* Have BDB hash support */ --#define HAVE_BDB_HASH 1 -+// #define HAVE_BDB_HASH 1 - - /* BDB has open method with 6 args */ - /* #undef HAVE_BDB_OPEN_6_ARGS */ - - /* BDB has open method with 7 args */ --#define HAVE_BDB_OPEN_7_ARGS 1 -+// #define HAVE_BDB_OPEN_7_ARGS 1 - - /* BDB has set_flags method */ --#define HAVE_BDB_SET_FLAGS 1 -+// #define HAVE_BDB_SET_FLAGS 1 - - /* BDB has dbopen method */ - /* #undef HAVE_DBOPEN */ - - /* BDB has db_create method */ --#define HAVE_DB_CREATE 1 -+// #define HAVE_DB_CREATE 1 - - /* Define to 1 if you have the header file. */ --#define HAVE_DB_H 1 -+// #define HAVE_DB_H 1 - - /* Define to 1 if you have the header file. */ - /* undef HAVE_DLFCN_H */ -@@ -143,13 +144,13 @@ - /* #undef HAVE_LIBWWW */ - - /* Have local MD5 digest */ --#define HAVE_LOCAL_MD5_DIGEST 1 -+// #define HAVE_LOCAL_MD5_DIGEST 1 - - /* Have local RIPEMD160 digest */ - /* #undef HAVE_LOCAL_RIPEMD160_DIGEST */ - - /* Have local SHA1 digest */ --#define HAVE_LOCAL_SHA1_DIGEST 1 -+// #define HAVE_LOCAL_SHA1_DIGEST 1 - - /* Define to 1 if you have the header file. */ - #define HAVE_MEMORY_H 1 -@@ -161,25 +162,33 @@ - #define HAVE_MKTEMP 1 - - /* MySQL libraries are present */ --#define HAVE_MYSQL 1 -+// #define HAVE_MYSQL 1 - - /* Define to 1 if you have the header file. */ - /* #undef HAVE_OPENSSL_CRYPTO_H */ -+#define HAVE_OPENSSL_CRYPTO_H 1 - - /* Have openssl MD5 digest */ - /* #undef HAVE_OPENSSL_CRYPTO_MD5_DIGEST */ -+#define HAVE_OPENSSL_CRYPTO_MD5_DIGEST 1 - - /* Have openssl RIPEMD160 digest */ - /* #undef HAVE_OPENSSL_CRYPTO_RIPEMD160_DIGEST */ -+#define HAVE_OPENSSL_CRYPTO_RIPEMD160_DIGEST 1 - - /* Have openssl SHA1 digest */ - /* #undef HAVE_OPENSSL_CRYPTO_SHA1_DIGEST */ -+#define HAVE_OPENSSL_CRYPTO_SHA1_DIGEST 1 - - /* Have openssl digests */ - /* #undef HAVE_OPENSSL_DIGESTS */ -+#define HAVE_OPENSSL_DIGESTS 1 - - /* Define to 1 if you have the header file. */ - /* #undef HAVE_PTHREAD_H */ -+#ifdef __MINGW32__ -+#undef HAVE_PTHREAD_H */ -+#endif - - /* Define to 1 if you have the header file. */ - #define HAVE_STDINT_H 1 -@@ -248,7 +257,7 @@ - #define SIZEOF_UNSIGNED_LONG_LONG 8 - - /* SQLite API version */ --#define SQLITE_API 3 -+// #define SQLITE_API 3 - - /* Define to 1 if you have the ANSI C header files. */ - #define STDC_HEADERS 1 -@@ -256,14 +265,17 @@ - /* Building file storage */ - #define STORAGE_FILE 1 - -+#define STORAGE_HASHES 1 -+#define STORAGE_MEMORY 1 -+ - /* Building MySQL storage */ --#define STORAGE_MYSQL 1 -+// #define STORAGE_MYSQL 1 - - /* Building PostgreSQL storage */ - /*#undef STORAGE_POSTGRESQL*/ - - /* Building SQLite storage */ --#define STORAGE_SQLITE 1 -+// #define STORAGE_SQLITE 1 - - /* Building 3store storage */ - /*#undef STORAGE_TSTORE*/ ---- misc/redland-1.0.7/raptor/LICENSE.txt Fri Mar 23 06:28:24 2007 -+++ misc/build/redland-1.0.7/raptor/LICENSE.txt Mon Jun 16 15:55:52 2008 -@@ -61,3 +61,15 @@ - - Copyright (C) 2000-2007 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. -+ ---- misc/redland-1.0.7/rasqal/LICENSE.txt Sun Apr 22 23:09:08 2007 -+++ misc/build/redland-1.0.7/rasqal/LICENSE.txt Mon Jun 16 15:55:52 2008 -@@ -61,3 +61,15 @@ - - Copyright (C) 2003-2007 Dave Beckett - Copyright (C) 2003-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. -+ ---- misc/redland-1.0.7/ltmain.sh 2007-11-28 06:23:09.000000000 +0900 -+++ misc/build/redland-1.0.7/ltmain.sh 2008-07-06 15:44:48.725250000 +0900 -@@ -1557,6 +1557,11 @@ - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - absdir=`cd "$dir" && pwd` -+ case $host_os in -+ mingw*) -+ absdir=`cygpath -m $absdir` -+ ;; -+ esac - if test -z "$absdir"; then - $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - absdir="$dir" -@@ -3237,9 +3242,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` -@@ -3319,8 +3324,8 @@ - ;; - - freebsd-elf) -- major=".$current" -- versuffix=".$current"; -+ major=.`expr $current - $age` -+ versuffix="$major.$age.$revision" - ;; - - irix | nonstopux) ---- misc/redland-1.0.7/configure 2007-12-17 16:58:16.000000000 +0900 -+++ misc/build/redland-1.0.7/configure 2008-07-06 15:12:01.397125000 +0900 -@@ -4544,7 +4544,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' - ;; - -@@ -4553,7 +4553,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/redland-1.0.7/utils/rdfproc.c 2007-10-23 23:55:06.000000000 +0900 -+++ misc/build/redland-1.0.7/utils/rdfproc.c 2008-07-06 17:44:47.615875000 +0900 -@@ -30,7 +30,7 @@ - #endif - - #ifdef WIN32 --#include -+#include - #endif - - #include ---- misc/redland-1.0.7/librdf/rdf_config.h 2008-12-26 17:24:00.000000000 +0100 -+++ misc/build/redland-1.0.7/librdf/rdf_config.h 2008-12-26 17:20:46.000000000 +0100 -@@ -1 +1,243 @@ --dummy -+/* librdf/rdf_config.h. Generated from rdf_config.h.in by configure. */ -+/* librdf/rdf_config.h.in. Generated from configure.ac by autoheader. */ -+ -+/* BDB has close method with 2 args */ -+/* #undef HAVE_BDB_CLOSE_2_ARGS */ -+ -+/* BDB defines DBC */ -+/* #undef HAVE_BDB_CURSOR */ -+ -+/* BDB cursor method has 4 arguments */ -+/* #undef HAVE_BDB_CURSOR_4_ARGS */ -+ -+/* BDB defines DB_TXN */ -+/* #undef HAVE_BDB_DB_TXN */ -+ -+/* BDB has fd method with 2 args */ -+/* #undef HAVE_BDB_FD_2_ARGS */ -+ -+/* Have BDB hash support */ -+/* #undef HAVE_BDB_HASH */ -+ -+/* BDB has open method with 6 args */ -+/* #undef HAVE_BDB_OPEN_6_ARGS */ -+ -+/* BDB has open method with 7 args */ -+/* #undef HAVE_BDB_OPEN_7_ARGS */ -+ -+/* BDB has set_flags method */ -+/* #undef HAVE_BDB_SET_FLAGS */ -+ -+/* BDB has dbopen method */ -+/* #undef HAVE_DBOPEN */ -+ -+/* BDB has db_create method */ -+/* #undef HAVE_DB_CREATE */ -+ -+/* Define to 1 if you have the header file. */ -+/* #undef HAVE_DB_H */ -+ -+/* BDB has db_open method */ -+/* #undef HAVE_DB_OPEN */ -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_DLFCN_H 1 -+ -+/* Define to 1 if you have the header file. */ -+/* #undef HAVE_DMALLOC_H */ -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_ERRNO_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_FCNTL_H 1 -+ -+/* Define to 1 if you have the `getenv' function. */ -+#define HAVE_GETENV 1 -+ -+/* Define to 1 if you have the `getopt' function. */ -+#define HAVE_GETOPT 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_GETOPT_H 1 -+ -+/* Define to 1 if you have the `getopt_long' function. */ -+#define HAVE_GETOPT_LONG 1 -+ -+/* Define to 1 if you have the `gettimeofday' function. */ -+#define HAVE_GETTIMEOFDAY 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_INTTYPES_H 1 -+ -+/* Define to 1 if you have the header file. */ -+/* #undef HAVE_LIBPQ_FE_H */ -+ -+/* Have local MD5 digest */ -+/* #undef HAVE_LOCAL_MD5_DIGEST */ -+ -+/* Have local RIPEMD160 digest */ -+/* #undef HAVE_LOCAL_RIPEMD160_DIGEST */ -+ -+/* Have local SHA1 digest */ -+/* #undef HAVE_LOCAL_SHA1_DIGEST */ -+ -+/* Define to 1 if you have the `memcmp' function. */ -+#define HAVE_MEMCMP 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_MEMORY_H 1 -+ -+/* Define to 1 if you have the `mkstemp' function. */ -+#define HAVE_MKSTEMP 1 -+ -+/* Define to 1 if you have the `mktemp' function. */ -+#define HAVE_MKTEMP 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_OPENSSL_CRYPTO_H 1 -+ -+/* Have openssl MD5 digest */ -+#define HAVE_OPENSSL_CRYPTO_MD5_DIGEST 1 -+ -+/* Have openssl RIPEMD160 digest */ -+#define HAVE_OPENSSL_CRYPTO_RIPEMD160_DIGEST 1 -+ -+/* Have openssl SHA1 digest */ -+#define HAVE_OPENSSL_CRYPTO_SHA1_DIGEST 1 -+ -+/* Have openssl digests */ -+#define HAVE_OPENSSL_DIGESTS 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_PTHREAD_H 1 -+ -+/* Define to 1 if you have the header file. */ -+/* #undef HAVE_SQLITE3_H */ -+ -+/* Define to 1 if you have the header file. */ -+/* #undef HAVE_SQLITE_H */ -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_STDINT_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_STDLIB_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_STRINGS_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_STRING_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_STAT_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_TIME_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_TYPES_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_TIME_H 1 -+ -+/* Define to 1 if you have the `tmpnam' function. */ -+#define HAVE_TMPNAM 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_UNISTD_H 1 -+ -+/* Run time assertion checks. */ -+#define LIBRDF_ASSERT 1 -+ -+/* Print run time assertion check failure messages. */ -+#define LIBRDF_ASSERT_MESSAGES 1 -+ -+/* Release version as a decimal */ -+#define LIBRDF_VERSION_DECIMAL 10007 -+ -+/* Major version number */ -+#define LIBRDF_VERSION_MAJOR 1 -+ -+/* Minor version number */ -+#define LIBRDF_VERSION_MINOR 0 -+ -+/* Release version number */ -+#define LIBRDF_VERSION_RELEASE 7 -+ -+/* Build storage backends as modules */ -+/* #undef MODULAR_LIBRDF */ -+ -+/* Name of package */ -+#define PACKAGE "redland" -+ -+/* Define to the address where bug reports for this package should be sent. */ -+#define PACKAGE_BUGREPORT "http://bugs.librdf.org/" -+ -+/* Define to the full name of this package. */ -+#define PACKAGE_NAME "Redland RDF Application Framework" -+ -+/* Define to the full name and version of this package. */ -+#define PACKAGE_STRING "Redland RDF Application Framework 1.0.7" -+ -+/* Define to the one symbol short name of this package. */ -+#define PACKAGE_TARNAME "redland" -+ -+/* Define to the version of this package. */ -+#define PACKAGE_VERSION "1.0.7" -+ -+/* The size of `unsigned char', as computed by sizeof. */ -+#define SIZEOF_UNSIGNED_CHAR 1 -+ -+/* The size of `unsigned int', as computed by sizeof. */ -+#define SIZEOF_UNSIGNED_INT 4 -+ -+/* The size of `unsigned long', as computed by sizeof. */ -+#define SIZEOF_UNSIGNED_LONG 4 -+ -+/* The size of `unsigned long long', as computed by sizeof. */ -+#define SIZEOF_UNSIGNED_LONG_LONG 8 -+ -+/* SQLite API version */ -+/* #undef SQLITE_API */ -+ -+/* Define to 1 if you have the ANSI C header files. */ -+#define STDC_HEADERS 1 -+ -+/* Building file storage */ -+#define STORAGE_FILE 1 -+ -+/* Building hashes storage */ -+#define STORAGE_HASHES 1 -+ -+/* Building memory storage */ -+#define STORAGE_MEMORY 1 -+ -+/* Building MySQL storage */ -+/* #undef STORAGE_MYSQL */ -+ -+/* Building PostgreSQL storage */ -+/* #undef STORAGE_POSTGRESQL */ -+ -+/* Building SQLite storage */ -+/* #undef STORAGE_SQLITE */ -+ -+/* Building 3store storage */ -+/* #undef STORAGE_TSTORE */ -+ -+/* Define to 1 if you can safely include both and . */ -+#define TIME_WITH_SYS_TIME 1 -+ -+/* Version number of package */ -+#define VERSION "1.0.7" -+ -+/* Use POSIX threads */ -+#define WITH_THREADS 1 -+ -+/* Define to 1 if your processor stores words with the most significant byte -+ first (like Motorola and SPARC, unlike Intel and VAX). */ -+/* #undef WORDS_BIGENDIAN */ -+ -+/* Define to empty if `const' does not conform to ANSI C. */ -+/* #undef const */ diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index e8b473769821..d393e8b6e40d 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.8.2.2 $ # # This file is part of OpenOffice.org. # @@ -48,18 +48,28 @@ all: .INCLUDE : ../redlandversion.mk -REDLANDVERSION=1.0.7 +REDLANDVERSION=1.0.8 TARFILE_NAME=redland-$(REDLANDVERSION) -PATCH_FILES=..$/$(TARFILE_NAME).patch ADDITIONAL_FILES=librdf/makefile.mk librdf/rdf_config.h +OOO_PATCH_FILES= \ + $(TARFILE_NAME).patch.legal \ + $(TARFILE_NAME).patch.autotools \ + $(TARFILE_NAME).patch.dmake \ + $(TARFILE_NAME).patch.win32 \ + + +PATCH_FILES=$(OOO_PATCH_FILES) \ + $(TARFILE_NAME).patch.free_null \ + $(TARFILE_NAME).patch.storage_hashes_context_serialize_get_statement \ + $(TARFILE_NAME).patch.storage_hashes_list_duplicates \ + + .IF "$(OS)"=="OS2" -# there is no wntmsci build environment in the tarball; we use custom dmakefile BUILD_ACTION=dmake BUILD_DIR=$(CONFIGURE_DIR)$/librdf - .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" CONFIGURE_DIR= @@ -104,7 +114,7 @@ LDFLAGS+:=-Wl,-dylib_file,@loader_path/libraptor.1.dylib:$(PWD)/$(LB)/libraptor. 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 @@ -126,7 +136,7 @@ BUILD_DIR=$(CONFIGURE_DIR) OUT2INC+=librdf$/*.h .IF "$(OS)"=="MACOSX" -OUT2LIB+=librdf$/.libs$/librdf.0.dylib +OUT2LIB+=librdf$/.libs$/librdf.$(REDLAND_MAJOR).dylib .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" OUT2LIB+=librdf$/.libs$/*.a @@ -134,12 +144,10 @@ OUT2BIN+=librdf$/.libs$/*.dll .ELSE # if we use dmake, this is done automagically .ENDIF - .ELIF "$(OS)"=="OS2" # if we use dmake, this is done automagically - .ELSE -OUT2LIB+=librdf$/.libs$/librdf.so.0 +OUT2LIB+=librdf$/.libs$/librdf.so.$(REDLAND_MAJOR) .ENDIF # --- Targets ------------------------------------------------------ diff --git a/redland/redland/redland-1.0.8.patch.autotools b/redland/redland/redland-1.0.8.patch.autotools new file mode 100644 index 000000000000..5b29d0b7708b --- /dev/null +++ b/redland/redland/redland-1.0.8.patch.autotools @@ -0,0 +1,58 @@ +--- misc/redland-1.0.8/configure Fri Jul 4 18:00:39 2008 ++++ misc/build/redland-1.0.8/configure Wed Feb 18 13:27:43 2009 +@@ -4671,7 +4671,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' + ;; + +@@ -4680,7 +4680,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/redland-1.0.8/ltmain.sh Tue Apr 29 23:33:55 2008 ++++ misc/build/redland-1.0.8/ltmain.sh Wed Feb 18 13:28:39 2009 +@@ -1565,6 +1565,11 @@ + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + absdir=`cd "$dir" && pwd` ++ case $host_os in ++ mingw*) ++ absdir=`cygpath -m $absdir` ++ ;; ++ esac + if test -z "$absdir"; then + $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 + absdir="$dir" +@@ -3262,9 +3267,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 +3349,8 @@ + ;; + + freebsd-elf) +- major=".$current" +- versuffix=".$current"; ++ major=.`expr $current - $age` ++ versuffix="$major.$age.$revision" + ;; + + irix | nonstopux) diff --git a/redland/redland/redland-1.0.8.patch.dmake b/redland/redland/redland-1.0.8.patch.dmake new file mode 100644 index 000000000000..d88f9548a341 --- /dev/null +++ b/redland/redland/redland-1.0.8.patch.dmake @@ -0,0 +1,118 @@ +--- misc/redland-1.0.8/librdf/makefile.mk Mon Jun 16 19:32:46 2008 ++++ misc/build/redland-1.0.8/librdf/makefile.mk Mon Jun 16 19:26:20 2008 +@@ -1,1 +1,114 @@ +-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: redland-1.0.8.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 ++# ++# for a copy of the LGPLv3 License. ++# ++#************************************************************************* ++ ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=redland ++TARGET=librdf ++LIBTARGET=NO ++ ++EXTERNAL_WARNINGS_NOT_ERRORS=TRUE ++ ++ ++# --- Settings ----------------------------------------------------- ++ ++.INCLUDE : settings.mk ++ ++CDEFS+=-DLIBRDF_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS ++ ++# --- Files -------------------------------------------------------- ++ ++SLOFILES = \ ++ $(SLO)$/rdf_concepts.obj \ ++ $(SLO)$/rdf_digest.obj \ ++ $(SLO)$/rdf_digest_md5.obj \ ++ $(SLO)$/rdf_digest_openssl.obj \ ++ $(SLO)$/rdf_digest_sha1.obj \ ++ $(SLO)$/rdf_files.obj \ ++ $(SLO)$/rdf_hash.obj \ ++ $(SLO)$/rdf_hash_cursor.obj \ ++ $(SLO)$/rdf_hash_memory.obj \ ++ $(SLO)$/rdf_heuristics.obj \ ++ $(SLO)$/rdf_init.obj \ ++ $(SLO)$/rdf_iterator.obj \ ++ $(SLO)$/rdf_list.obj \ ++ $(SLO)$/rdf_log.obj \ ++ $(SLO)$/rdf_model.obj \ ++ $(SLO)$/rdf_model_storage.obj \ ++ $(SLO)$/rdf_node.obj \ ++ $(SLO)$/rdf_parser.obj \ ++ $(SLO)$/rdf_parser_raptor.obj \ ++ $(SLO)$/rdf_query.obj \ ++ $(SLO)$/rdf_query_rasqal.obj \ ++ $(SLO)$/rdf_query_results.obj \ ++ $(SLO)$/rdf_query_triples.obj \ ++ $(SLO)$/rdf_serializer.obj \ ++ $(SLO)$/rdf_serializer_raptor.obj \ ++ $(SLO)$/rdf_statement.obj \ ++ $(SLO)$/rdf_storage.obj \ ++ $(SLO)$/rdf_storage_file.obj \ ++ $(SLO)$/rdf_storage_list.obj \ ++ $(SLO)$/rdf_storage_hashes.obj \ ++ $(SLO)$/rdf_stream.obj \ ++ $(SLO)$/rdf_uri.obj \ ++ $(SLO)$/rdf_utf8.obj \ ++ ++ ++# $(SLO)$/rdf_hash_bdb.obj \ ++# $(SLO)$/rdf_storage_mysql.obj \ ++# $(SLO)$/rdf_storage_sqlite.obj \ ++ ++ ++SHL1DEPN= makefile.mk ++SHL1OBJS= $(SLOFILES) ++ ++#SHL1TARGET= $(TARGET)$(DLLPOSTFIX) ++SHL1TARGET= $(TARGET) ++SHL1IMPLIB= $(TARGET) ++SHL1USE_EXPORTS=name ++ ++#SHL1VERSIONMAP=../service/exports.map ++SHL1DEF=$(MISC)$/$(SHL1TARGET).def ++DEF1NAME=$(SHL1TARGET) ++ ++SHL1STDLIBS= \ ++ $(OPENSSLLIB) \ ++ $(PRJ)$/$(INPATH)$/lib$/libraptor.lib \ ++ $(PRJ)$/$(INPATH)$/lib$/librasqal.lib \ ++ ++ ++#$(LIBXML2LIB) \ ++# $(XSLTLIB) \ ++ ++# --- Targets ------------------------------------------------------ ++ ++.INCLUDE : target.mk ++ diff --git a/redland/redland/redland-1.0.8.patch.free_null b/redland/redland/redland-1.0.8.patch.free_null new file mode 100644 index 000000000000..0524bb636b5e --- /dev/null +++ b/redland/redland/redland-1.0.8.patch.free_null @@ -0,0 +1,174 @@ +--- misc/redland-1.0.8/librdf/rdf_digest.c Tue Jul 1 05:10:26 2008 ++++ misc/build/redland-1.0.8/librdf/rdf_digest.c Thu Nov 6 12:44:39 2008 +@@ -248,6 +248,8 @@ + void + librdf_free_digest(librdf_digest *digest) + { ++ if(!digest) ++ return; + if(digest->context) + LIBRDF_FREE(digest_context, digest->context); + if(digest->digest) +--- misc/redland-1.0.8/librdf/rdf_hash.c Tue Jul 1 05:10:26 2008 ++++ misc/build/redland-1.0.8/librdf/rdf_hash.c Thu Nov 6 12:44:39 2008 +@@ -488,6 +488,8 @@ + void + librdf_free_hash(librdf_hash* hash) + { ++ if(!hash) ++ return; + if(hash->context) { + if(hash->is_open) + librdf_hash_close(hash); +--- misc/redland-1.0.8/librdf/rdf_init.c Tue Nov 6 16:26:18 2007 ++++ misc/build/redland-1.0.8/librdf/rdf_init.c Mon Jun 16 15:55:51 2008 +@@ -178,6 +178,9 @@ + void + librdf_free_world(librdf_world *world) + { ++ if(!world) ++ return; ++ + /* NOTE: raptor is always initialised as a parser and may + * be also used as a serializer, but it is NOT finished + * in the serializer_raptor registration. Therefore, always +--- misc/redland-1.0.8/librdf/rdf_list.c Tue Jul 1 05:10:26 2008 ++++ misc/build/redland-1.0.8/librdf/rdf_list.c Thu Nov 6 12:44:39 2008 +@@ -106,6 +106,8 @@ + void + librdf_free_list(librdf_list* list) + { ++ if(!list) ++ return; + LIBRDF_ASSERT_RETURN(list->iterator_count, + "Iterators were active on freeing list", ); + +--- misc/redland-1.0.8/librdf/rdf_model.c Tue Jul 1 05:10:26 2008 ++++ misc/build/redland-1.0.8/librdf/rdf_model.c Thu Nov 6 12:44:39 2008 +@@ -391,7 +391,8 @@ + librdf_iterator* iterator; + librdf_model* m; + +- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(model, librdf_model); ++ if(!model) ++ return; + + if(--model->usage) + return; +--- misc/redland-1.0.8/librdf/rdf_node.c Tue Jul 1 05:10:26 2008 ++++ misc/build/redland-1.0.8/librdf/rdf_node.c Thu Nov 6 12:44:39 2008 +@@ -724,7 +724,8 @@ + librdf_world *world; + #endif + +- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(node, librdf_node); ++ if(!node) ++ return; + + #ifdef WITH_THREADS + world = node->world; +--- misc/redland-1.0.8/librdf/rdf_parser.c Tue Jul 1 08:09:58 2008 ++++ misc/build/redland-1.0.8/librdf/rdf_parser.c Thu Nov 6 12:44:39 2008 +@@ -369,7 +369,8 @@ + void + librdf_free_parser(librdf_parser *parser) + { +- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(parser, librdf_parser); ++ if(!parser) ++ return; + + if(parser->context) { + if(parser->factory->terminate) +--- misc/redland-1.0.8/librdf/rdf_query.c Tue Jul 1 05:10:26 2008 ++++ misc/build/redland-1.0.8/librdf/rdf_query.c Thu Nov 6 12:44:39 2008 +@@ -386,7 +386,8 @@ + void + librdf_free_query(librdf_query* query) + { +- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(query, librdf_query); ++ if(!query) ++ return; + + if(--query->usage) + return; +--- misc/redland-1.0.8/librdf/rdf_query_results.c Tue Jul 1 05:10:26 2008 ++++ misc/build/redland-1.0.8/librdf/rdf_query_results.c Thu Nov 6 12:44:39 2008 +@@ -242,7 +242,8 @@ + void + librdf_free_query_results(librdf_query_results* query_results) + { +- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(query_results, librdf_query_results); ++ if(!query_results) ++ return; + + if(query_results->query->factory->free_results) + query_results->query->factory->free_results(query_results); +@@ -634,6 +635,8 @@ + void + librdf_free_query_results_formatter(librdf_query_results_formatter* formatter) + { ++ if(!formatter) ++ return; + if(formatter->query_results->query->factory->free_results_formatter) + formatter->query_results->query->factory->free_results_formatter(formatter); + } +--- misc/redland-1.0.8/librdf/rdf_serializer.c Tue Jul 1 05:10:26 2008 ++++ misc/build/redland-1.0.8/librdf/rdf_serializer.c Thu Nov 6 12:44:39 2008 +@@ -371,7 +371,8 @@ + void + librdf_free_serializer(librdf_serializer *serializer) + { +- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(serializer, librdf_serializer); ++ if(!serializer) ++ return; + + if(serializer->context) { + if(serializer->factory->terminate) +--- misc/redland-1.0.8/librdf/rdf_statement.c Tue Jul 1 05:10:26 2008 ++++ misc/build/redland-1.0.8/librdf/rdf_statement.c Thu Nov 6 12:44:39 2008 +@@ -253,7 +253,8 @@ + librdf_world *world; + #endif + +- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(statement, librdf_statement); ++ if(!statement) ++ return; + + #ifdef WITH_THREADS + world = statement->world; +--- misc/redland-1.0.8/librdf/rdf_storage.c Tue Jul 1 05:10:26 2008 ++++ misc/build/redland-1.0.8/librdf/rdf_storage.c Thu Nov 6 12:44:39 2008 +@@ -610,7 +610,8 @@ + void + librdf_free_storage(librdf_storage* storage) + { +- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(storage, librdf_storage); ++ if(!storage) ++ return; + + if(--storage->usage) + return; +--- misc/redland-1.0.8/librdf/rdf_stream.c Tue Jul 1 05:10:26 2008 ++++ misc/build/redland-1.0.8/librdf/rdf_stream.c Thu Nov 6 12:44:39 2008 +@@ -124,6 +124,9 @@ + void + librdf_free_stream(librdf_stream* stream) + { ++ if(!stream) ++ return; ++ + if(stream->finished_method) + stream->finished_method(stream->context); + +--- misc/redland-1.0.8/librdf/rdf_uri.c Tue Jul 1 05:10:26 2008 ++++ misc/build/redland-1.0.8/librdf/rdf_uri.c Thu Nov 6 12:44:39 2008 +@@ -407,7 +407,8 @@ + librdf_world *world; + #endif + +- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(uri, librdf_uri); ++ if(!uri) ++ return; + + #ifdef WITH_THREADS + world = uri->world; diff --git a/redland/redland/redland-1.0.8.patch.legal b/redland/redland/redland-1.0.8.patch.legal new file mode 100644 index 000000000000..9e9a25bef78e --- /dev/null +++ b/redland/redland/redland-1.0.8.patch.legal @@ -0,0 +1,54 @@ +--- misc/redland-1.0.8/LICENSE.txt Tue Jul 1 07:55:28 2008 ++++ misc/build/redland-1.0.8/LICENSE.txt Thu Nov 6 12:44:39 2008 +@@ -76,3 +76,15 @@ + 10. NOTICE + 11. http://www.dajobe.org/ + 12. http://www.bristol.ac.uk/ ++ ++ ++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. ++ +--- misc/redland-1.0.8/raptor/LICENSE.txt Sun Mar 30 06:52:22 2008 ++++ misc/build/redland-1.0.8/raptor/LICENSE.txt Thu Nov 6 12:44:39 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. ++ +--- misc/redland-1.0.8/rasqal/LICENSE.txt Fri Jun 27 04:24:52 2008 ++++ misc/build/redland-1.0.8/rasqal/LICENSE.txt Thu Nov 6 12:44:40 2008 +@@ -60,3 +60,15 @@ + + Copyright (C) 2003-2008 Dave Beckett + Copyright (C) 2003-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/redland/redland-1.0.8.patch.storage_hashes_context_serialize_get_statement b/redland/redland/redland-1.0.8.patch.storage_hashes_context_serialize_get_statement new file mode 100644 index 000000000000..8c72946d199f --- /dev/null +++ b/redland/redland/redland-1.0.8.patch.storage_hashes_context_serialize_get_statement @@ -0,0 +1,35 @@ +--- misc/redland-1.0.8/librdf/rdf_storage_hashes.c Tue Jul 1 05:10:26 2008 ++++ misc/build/redland-1.0.8/librdf/rdf_storage_hashes.c Thu Nov 6 12:44:39 2008 +@@ -1593,7 +1661,6 @@ + { + librdf_storage_hashes_context_serialise_stream_context* scontext=(librdf_storage_hashes_context_serialise_stream_context*)context; + librdf_hash_datum* v; +- librdf_node** cnp=NULL; + + switch(flags) { + case LIBRDF_ITERATOR_GET_METHOD_GET_OBJECT: +@@ -1606,20 +1673,14 @@ + return scontext->context_node; + } + +- /* current stuff is out of date - get new cached answers */ +- if(scontext->index_contexts) { +- if(scontext->context_node) +- librdf_free_node(scontext->context_node); +- scontext->context_node=NULL; +- cnp=&scontext->context_node; +- } +- ++ /* note: scontext->context_node is still valid */ ++ + librdf_statement_clear(&scontext->current); + + v=(librdf_hash_datum*)librdf_iterator_get_value(scontext->iterator); +- ++ + /* decode value content and optional context */ +- if(!librdf_statement_decode_parts(&scontext->current, cnp, ++ if(!librdf_statement_decode_parts(&scontext->current, NULL, + (unsigned char*)v->data, v->size)) { + return NULL; + } diff --git a/redland/redland/redland-1.0.8.patch.storage_hashes_list_duplicates b/redland/redland/redland-1.0.8.patch.storage_hashes_list_duplicates new file mode 100644 index 000000000000..d2ef7e772230 --- /dev/null +++ b/redland/redland/redland-1.0.8.patch.storage_hashes_list_duplicates @@ -0,0 +1,170 @@ +--- misc/redland-1.0.8/librdf/rdf_storage_hashes.c Tue Jul 1 05:10:26 2008 ++++ misc/build/redland-1.0.8/librdf/rdf_storage_hashes.c Thu Nov 6 12:44:39 2008 +@@ -1387,6 +1387,66 @@ + LIBRDF_STATEMENT_OBJECT); + } + ++ ++/* return -1 on failure, 1 if context contains stmt, 0 if not */ ++static int ++librdf_storage_hashes_context_contains_statement(librdf_storage* storage, ++ librdf_node* context_node, ++ librdf_statement* statement) ++{ ++ librdf_storage_hashes_context* context=(librdf_storage_hashes_context*)storage->context; ++ librdf_hash_datum key, value; /* on stack - not allocated */ ++ size_t size; ++ int status; ++ ++ if(context->contexts_index < 0) { ++ librdf_log(storage->world, 0, LIBRDF_LOG_WARN, LIBRDF_FROM_STORAGE, NULL, ++ "Storage was created without context support"); ++ return -1; ++ } ++ ++ /* ENCODE KEY */ ++ size=librdf_node_encode(context_node, NULL, 0); ++ if (!size) ++ return -1; ++ key.data=(char*)LIBRDF_MALLOC(cstring, size); ++ if (!key.data) ++ return -1; ++ key.size=librdf_node_encode(context_node, ++ (unsigned char*)key.data, size); ++ if (!key.size) { ++ LIBRDF_FREE(data, key.data); ++ return -1; ++ } ++ ++ /* ENCODE VALUE */ ++ size=librdf_statement_encode(statement, NULL, 0); ++ if (!size) { ++ LIBRDF_FREE(data, key.data); ++ return -1; ++ } ++ value.data=(char*)LIBRDF_MALLOC(cstring, size); ++ if (!value.data) { ++ LIBRDF_FREE(data, key.data); ++ return -1; ++ } ++ value.size=librdf_statement_encode(statement, (unsigned char*)value.data, size); ++ if (!value.size) { ++ LIBRDF_FREE(data, value.data); ++ LIBRDF_FREE(data, key.data); ++ return -1; ++ } ++ ++ status=librdf_hash_exists(context->hashes[context->contexts_index], &key, &value); ++ LIBRDF_FREE(data, value.data); ++ LIBRDF_FREE(data, key.data); ++ ++ /* DO NOT free statement, ownership was not passed in */ ++ return status; ++} ++ ++ ++ + /** + * librdf_storage_hashes_context_add_statement: + * @storage: #librdf_storage object +@@ -1412,7 +1472,15 @@ + "Storage was created without context support"); + return 1; + } +- ++ ++ /* Do not add duplicate statements */ ++ status=librdf_storage_hashes_context_contains_statement(storage, context_node, statement); ++ if(status) ++ if(status < 0) ++ return 1; ++ else ++ return 0; ++ + if(librdf_storage_hashes_add_remove_statement(storage, + statement, context_node, 1)) + return 1; +--- misc/redland-1.0.8/librdf/rdf_storage_list.c Tue Jul 1 05:10:26 2008 ++++ misc/build/redland-1.0.8/librdf/rdf_storage_list.c Thu Nov 6 12:44:39 2008 +@@ -457,6 +457,64 @@ + } + + ++/* return -1 on failure, 1 if context contains stmt, 0 if not */ ++static int ++librdf_storage_list_context_contains_statement(librdf_storage* storage, ++ librdf_node* context_node, ++ librdf_statement* statement) ++{ ++ librdf_storage_list_context* context=(librdf_storage_list_context*)storage->context; ++ librdf_hash_datum key, value; /* on stack - not allocated */ ++ size_t size; ++ int status; ++ ++ if(!context->index_contexts) { ++ librdf_log(storage->world, 0, LIBRDF_LOG_WARN, LIBRDF_FROM_STORAGE, NULL, ++ "Storage was created without context support"); ++ return -1; ++ } ++ ++ /* ENCODE KEY */ ++ size=librdf_node_encode(context_node, NULL, 0); ++ if (!size) ++ return -1; ++ key.data=(char*)LIBRDF_MALLOC(cstring, size); ++ if (!key.data) ++ return -1; ++ key.size=librdf_node_encode(context_node, ++ (unsigned char*)key.data, size); ++ if (!key.size) { ++ LIBRDF_FREE(data, key.data); ++ return -1; ++ } ++ ++ /* ENCODE VALUE */ ++ size=librdf_statement_encode(statement, NULL, 0); ++ if (!size) { ++ LIBRDF_FREE(data, key.data); ++ return -1; ++ } ++ value.data=(char*)LIBRDF_MALLOC(cstring, size); ++ if (!value.data) { ++ LIBRDF_FREE(data, key.data); ++ return -1; ++ } ++ value.size=librdf_statement_encode(statement, (unsigned char*)value.data, size); ++ if (!value.size) { ++ LIBRDF_FREE(data, value.data); ++ LIBRDF_FREE(data, key.data); ++ return -1; ++ } ++ ++ status=librdf_hash_exists(context->contexts, &key, &value); ++ LIBRDF_FREE(data, value.data); ++ LIBRDF_FREE(data, key.data); ++ ++ /* DO NOT free statement, ownership was not passed in */ ++ return status; ++} ++ ++ + /** + * librdf_storage_list_context_add_statement: + * @storage: #librdf_storage object +@@ -483,7 +541,15 @@ + "Storage was created without context support"); + return 1; + } +- ++ ++ /* Do not add duplicate statements */ ++ status=librdf_storage_list_context_contains_statement(storage, context_node, statement); ++ if(status) ++ if(status < 0) ++ return 1; ++ else ++ return 0; ++ + /* Store statement + node in the storage_list */ + sln=(librdf_storage_list_node*)LIBRDF_MALLOC(librdf_storage_list_node, sizeof(librdf_storage_list_node)); + if(!sln) diff --git a/redland/redland/redland-1.0.8.patch.win32 b/redland/redland/redland-1.0.8.patch.win32 new file mode 100644 index 000000000000..41d3503dcc98 --- /dev/null +++ b/redland/redland/redland-1.0.8.patch.win32 @@ -0,0 +1,154 @@ +--- misc/redland-1.0.8/librdf/win32_rdf_config.h Tue Jul 1 05:10:26 2008 ++++ misc/build/redland-1.0.8/librdf/win32_rdf_config.h Wed Feb 18 13:31:07 2009 +@@ -43,7 +43,8 @@ + #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 +@@ -72,40 +73,40 @@ + */ + + /* BDB has close method with 2 args */ +-#define HAVE_BDB_CLOSE_2_ARGS 1 ++// #define HAVE_BDB_CLOSE_2_ARGS 1 + + /* BDB defines DBC */ +-#define HAVE_BDB_CURSOR 1 ++// #define HAVE_BDB_CURSOR 1 + + /* BDB cursor method has 4 arguments */ +-#define HAVE_BDB_CURSOR_4_ARGS 1 ++// #define HAVE_BDB_CURSOR_4_ARGS 1 + + /* BDB defines DB_TXN */ +-#define HAVE_BDB_DB_TXN 1 ++// #define HAVE_BDB_DB_TXN 1 + + /* BDB has fd method with 2 args */ +-#define HAVE_BDB_FD_2_ARGS 1 ++// #define HAVE_BDB_FD_2_ARGS 1 + + /* Have BDB hash support */ +-#define HAVE_BDB_HASH 1 ++// #define HAVE_BDB_HASH 1 + + /* BDB has open method with 6 args */ + /* #undef HAVE_BDB_OPEN_6_ARGS */ + + /* BDB has open method with 7 args */ +-#define HAVE_BDB_OPEN_7_ARGS 1 ++// #define HAVE_BDB_OPEN_7_ARGS 1 + + /* BDB has set_flags method */ +-#define HAVE_BDB_SET_FLAGS 1 ++// #define HAVE_BDB_SET_FLAGS 1 + + /* BDB has dbopen method */ + /* #undef HAVE_DBOPEN */ + + /* BDB has db_create method */ +-#define HAVE_DB_CREATE 1 ++// #define HAVE_DB_CREATE 1 + + /* Define to 1 if you have the header file. */ +-#define HAVE_DB_H 1 ++// #define HAVE_DB_H 1 + + /* Define to 1 if you have the header file. */ + /* undef HAVE_DLFCN_H */ +@@ -141,13 +142,13 @@ + /* #undef HAVE_LIBWWW */ + + /* Have local MD5 digest */ +-#define HAVE_LOCAL_MD5_DIGEST 1 ++// #define HAVE_LOCAL_MD5_DIGEST 1 + + /* Have local RIPEMD160 digest */ + /* #undef HAVE_LOCAL_RIPEMD160_DIGEST */ + + /* Have local SHA1 digest */ +-#define HAVE_LOCAL_SHA1_DIGEST 1 ++// #define HAVE_LOCAL_SHA1_DIGEST 1 + + /* Define to 1 if you have the header file. */ + #define HAVE_MEMORY_H 1 +@@ -159,25 +160,33 @@ + #define HAVE_MKTEMP 1 + + /* MySQL libraries are present */ +-#define HAVE_MYSQL 1 ++// #define HAVE_MYSQL 1 + + /* Define to 1 if you have the header file. */ + /* #undef HAVE_OPENSSL_CRYPTO_H */ ++#define HAVE_OPENSSL_CRYPTO_H 1 + + /* Have openssl MD5 digest */ + /* #undef HAVE_OPENSSL_CRYPTO_MD5_DIGEST */ ++#define HAVE_OPENSSL_CRYPTO_MD5_DIGEST 1 + + /* Have openssl RIPEMD160 digest */ + /* #undef HAVE_OPENSSL_CRYPTO_RIPEMD160_DIGEST */ ++#define HAVE_OPENSSL_CRYPTO_RIPEMD160_DIGEST 1 + + /* Have openssl SHA1 digest */ + /* #undef HAVE_OPENSSL_CRYPTO_SHA1_DIGEST */ ++#define HAVE_OPENSSL_CRYPTO_SHA1_DIGEST 1 + + /* Have openssl digests */ + /* #undef HAVE_OPENSSL_DIGESTS */ ++#define HAVE_OPENSSL_DIGESTS 1 + + /* Define to 1 if you have the header file. */ + /* #undef HAVE_PTHREAD_H */ ++#ifdef __MINGW32__ ++#undef HAVE_PTHREAD_H ++#endif + + /* Define to 1 if you have the header file. */ + #define HAVE_STDINT_H 1 +@@ -246,7 +255,7 @@ + #define SIZEOF_UNSIGNED_LONG_LONG 8 + + /* SQLite API version */ +-#define SQLITE_API 3 ++// #define SQLITE_API 3 + + /* Define to 1 if you have the ANSI C header files. */ + #define STDC_HEADERS 1 +@@ -254,14 +263,17 @@ + /* Building file storage */ + #define STORAGE_FILE 1 + ++#define STORAGE_HASHES 1 ++#define STORAGE_MEMORY 1 ++ + /* Building MySQL storage */ +-#define STORAGE_MYSQL 1 ++// #define STORAGE_MYSQL 1 + + /* Building PostgreSQL storage */ + /*#undef STORAGE_POSTGRESQL*/ + + /* Building SQLite storage */ +-#define STORAGE_SQLITE 1 ++// #define STORAGE_SQLITE 1 + + /* Building 3store storage */ + /*#undef STORAGE_TSTORE*/ +--- misc/redland-1.0.8/utils/rdfproc.c Tue Jul 1 05:10:25 2008 ++++ misc/build/redland-1.0.8/utils/rdfproc.c Wed Feb 18 13:26:41 2009 +@@ -28,7 +28,7 @@ + #endif + + #ifdef WIN32 +-#include ++#include + #endif + + #include diff --git a/redland/redlandversion.mk b/redland/redlandversion.mk index 9b7f73665c9b..e81022d1f274 100644 --- a/redland/redlandversion.mk +++ b/redland/redlandversion.mk @@ -30,8 +30,7 @@ #************************************************************************* RAPTOR_MAJOR=1 -# rasqal has no stable abi -RASQAL_MAJOR=0 +RASQAL_MAJOR=1 # redland has no stable abi REDLAND_MAJOR=0 -- cgit v1.2.3 From 4783cac5ec4457ed6850fabd874d61aaa4cb1a03 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 28 Jul 2009 16:29:26 +0200 Subject: #i103496#: remove superfluous dependencies in external libraries --- cppunit/cppunit-1.8.0-r1.patch | 3 ++- hyphen/hyphen-2.4.patch | 3 ++- hyphen/prj/build.lst | 2 +- libtextcat/libtextcat-2.2.patch | 3 ++- libtextcat/prj/build.lst | 2 +- libxmlsec/prj/build.lst | 2 +- lpsolve/prj/build.lst | 2 +- msfontextract/msfontextract.patch | 3 ++- msfontextract/prj/build.lst | 2 +- redland/prj/build.lst | 2 +- redland/raptor-1.4.17.patch | 3 ++- redland/rasqal-0.9.15.patch | 3 ++- redland/redland-1.0.7.patch | 3 ++- 13 files changed, 20 insertions(+), 13 deletions(-) (limited to 'redland') diff --git a/cppunit/cppunit-1.8.0-r1.patch b/cppunit/cppunit-1.8.0-r1.patch index 426051d6288d..47963c421871 100644 --- a/cppunit/cppunit-1.8.0-r1.patch +++ b/cppunit/cppunit-1.8.0-r1.patch @@ -3263,7 +3263,7 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: taghelper.hxx.dummy. Nur in misc/build/cppunit-1.8.0/include/cppunit: tagvalues.hxx.dummy. --- misc/cppunit-1.8.0/include/makefile.mk 2008-12-10 20:46:08.530624271 +0100 +++ misc/build/cppunit-1.8.0/include/makefile.mk 2008-07-14 07:25:14.000000000 +0200 -@@ -1 +1,52 @@ +@@ -1 +1,53 @@ -dummy +#************************************************************************* +# @@ -3300,6 +3300,7 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: tagvalues.hxx.dummy. + +PRJNAME=cppunit +TARGET=inc ++UWINAPILIB= + +# --- Settings ----------------------------------------------------- + diff --git a/hyphen/hyphen-2.4.patch b/hyphen/hyphen-2.4.patch index 27f7085946a3..5aef3422d22a 100644 --- a/hyphen/hyphen-2.4.patch +++ b/hyphen/hyphen-2.4.patch @@ -110,7 +110,7 @@ diff -u misc/hyphen-2.4/Makefile.in misc/build/hyphen-2.4/Makefile.in diff -u misc/hyphen-2.4/makefile.mk misc/build/hyphen-2.4/makefile.mk --- misc/hyphen-2.4/makefile.mk 2008-06-04 10:43:21.000000000 +0200 +++ misc/build/hyphen-2.4/makefile.mk 2008-06-04 12:40:46.000000000 +0200 -@@ -1 +1,57 @@ +@@ -1 +1,58 @@ -dummy +#************************************************************************* +# @@ -151,6 +151,7 @@ diff -u misc/hyphen-2.4/makefile.mk misc/build/hyphen-2.4/makefile.mk + +USE_DEFFILE=TRUE +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++UWINAPILIB= + +.INCLUDE : settings.mk + diff --git a/hyphen/prj/build.lst b/hyphen/prj/build.lst index dbb21f3325ab..a9e777926c88 100644 --- a/hyphen/prj/build.lst +++ b/hyphen/prj/build.lst @@ -1,3 +1,3 @@ -hyp hyphen : solenv sal NULL +hyp hyphen : solenv NULL hyp hyphen usr1 - all hyp_mkout NULL hyp hyphen nmake - all hyp_hyphen NULL diff --git a/libtextcat/libtextcat-2.2.patch b/libtextcat/libtextcat-2.2.patch index c9ce4add875c..b9124f3df377 100644 --- a/libtextcat/libtextcat-2.2.patch +++ b/libtextcat/libtextcat-2.2.patch @@ -932,7 +932,7 @@ +} --- misc/libtextcat-2.2/src/makefile.mk Mon Mar 31 11:30:06 2008 +++ misc/build/libtextcat-2.2/src/makefile.mk Mon Mar 31 11:29:42 2008 -@@ -1 +1,90 @@ +@@ -1 +1,91 @@ -dummy +#************************************************************************* +# @@ -973,6 +973,7 @@ + +USE_DEFFILE=TRUE +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++UWINAPILIB= + +.INCLUDE : settings.mk + diff --git a/libtextcat/prj/build.lst b/libtextcat/prj/build.lst index e4bc4af795aa..87e42ef3f0a8 100644 --- a/libtextcat/prj/build.lst +++ b/libtextcat/prj/build.lst @@ -1,3 +1,3 @@ -ltc libtextcat : solenv sal NULL +ltc libtextcat : solenv NULL ltc libtextcat usr1 - all ltc_mkout NULL ltc libtextcat nmake - all ltc_libtextcat NULL diff --git a/libxmlsec/prj/build.lst b/libxmlsec/prj/build.lst index b557aa31ccb5..a4faaa8f00fa 100644 --- a/libxmlsec/prj/build.lst +++ b/libxmlsec/prj/build.lst @@ -1,3 +1,3 @@ -ls libxmlsec : stlport soltools LIBXML2:libxml2 MOZ:moz SO:moz_prebuilt sal NULL +ls libxmlsec : stlport soltools LIBXML2:libxml2 MOZ:moz SO:moz_prebuilt NULL ls libxmlsec usr1 - all ls_mkout NULL ls libxmlsec nmake - all ls_xmlsec1 NULL diff --git a/lpsolve/prj/build.lst b/lpsolve/prj/build.lst index 516f37ae9f1c..e6965a1e25e7 100644 --- a/lpsolve/prj/build.lst +++ b/lpsolve/prj/build.lst @@ -1,3 +1,3 @@ -lps lpsolve : sal NULL +lps lpsolve : NULL lps lpsolve usr1 - all lps_mkout NULL lps lpsolve nmake - all lps_lpsolve NULL diff --git a/msfontextract/msfontextract.patch b/msfontextract/msfontextract.patch index 7532a061985a..233215bdc5c7 100644 --- a/msfontextract/msfontextract.patch +++ b/msfontextract/msfontextract.patch @@ -1,6 +1,6 @@ --- misc/libmspack/mspack/makefile.mk Mon Mar 31 11:34:58 2008 +++ misc/build/libmspack/mspack/makefile.mk Mon Mar 31 11:34:31 2008 -@@ -1 +1,82 @@ +@@ -1 +1,83 @@ -dummy +#************************************************************************* +# @@ -42,6 +42,7 @@ +NO_DEFAULT_STL=TRUE +LIBSALCPPRT= +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE ++UWINAPILIB= + +# --- Settings ----------------------------------------------------- + diff --git a/msfontextract/prj/build.lst b/msfontextract/prj/build.lst index 7b52864f0c75..513990ce6fda 100644 --- a/msfontextract/prj/build.lst +++ b/msfontextract/prj/build.lst @@ -1,2 +1,2 @@ -mf msfontextract : soltools sal NULL +mf msfontextract : soltools NULL mf msfontextract nmake - all mf_mkout NULL diff --git a/redland/prj/build.lst b/redland/prj/build.lst index a5653f0cf5d4..5f26eb206768 100644 --- a/redland/prj/build.lst +++ b/redland/prj/build.lst @@ -1,4 +1,4 @@ -rld redland : sal soltools ZLIB:zlib LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL +rld redland : soltools ZLIB:zlib LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL rld redland usr1 - all rld_mkout NULL rld redland\raptor nmake - all rld_raptor NULL rld redland\rasqal nmake - all rld_rasqal rld_raptor NULL diff --git a/redland/raptor-1.4.17.patch b/redland/raptor-1.4.17.patch index c22ff2b53e93..5dcda739aea5 100644 --- a/redland/raptor-1.4.17.patch +++ b/redland/raptor-1.4.17.patch @@ -18,7 +18,7 @@ + --- misc/raptor-1.4.17/src/makefile.mk Mon Jun 16 17:24:23 2008 +++ misc/build/raptor-1.4.17/src/makefile.mk Mon Jun 16 19:25:14 2008 -@@ -1,1 +1,128 @@ +@@ -1,1 +1,129 @@ -dummy +#************************************************************************* +# @@ -56,6 +56,7 @@ +PRJNAME=redland +TARGET=raptor +LIBTARGET=NO ++UWINAPILIB= + +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE + diff --git a/redland/rasqal-0.9.15.patch b/redland/rasqal-0.9.15.patch index 67261f6a1d66..b57d985a435a 100644 --- a/redland/rasqal-0.9.15.patch +++ b/redland/rasqal-0.9.15.patch @@ -18,7 +18,7 @@ + --- misc/rasqal-0.9.15/src/makefile.mk Mon Jun 16 19:30:20 2008 +++ misc/build/rasqal-0.9.15/src/makefile.mk Mon Jun 16 19:25:48 2008 -@@ -1,1 +1,102 @@ +@@ -1,1 +1,103 @@ -dummy +#************************************************************************* +# @@ -56,6 +56,7 @@ +PRJNAME=redland +TARGET=rasqal +LIBTARGET=NO ++UWINAPILIB= + +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE + diff --git a/redland/redland-1.0.7.patch b/redland/redland-1.0.7.patch index 97f7119e5b31..764198e38108 100644 --- a/redland/redland-1.0.7.patch +++ b/redland/redland-1.0.7.patch @@ -18,7 +18,7 @@ + --- misc/redland-1.0.7/librdf/makefile.mk 2008-12-26 17:24:00.000000000 +0100 +++ misc/build/redland-1.0.7/librdf/makefile.mk 2008-12-26 17:20:46.000000000 +0100 -@@ -1 +1,124 @@ +@@ -1 +1,125 @@ -dummy +#************************************************************************* +# @@ -56,6 +56,7 @@ +PRJNAME=redland +TARGET=librdf +LIBTARGET=NO ++UWINAPILIB= + +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE + -- cgit v1.2.3 From f0ec1971d98b5c1805141b53286ec9a2a9b87dac Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Wed, 26 Aug 2009 06:36:38 +0000 Subject: CWS-TOOLING: integrate CWS mingwport22 2009-08-19 16:18:46 +0200 tono r275156 : i#103794: mingw gcc-4.4.0 port: make use of dwarf2 eh 2009-08-05 12:27:41 +0200 tono r274650 : CWS-TOOLING: rebase CWS mingwport22 to trunk@274622 (milestone: DEV300:m54) 2009-08-01 00:56:35 +0200 tono r274552 : i#103795: mingw gcc-4.4.0 port: use gcc dll 2009-07-27 00:13:27 +0200 tono r274344 : i#103795: mingw gcc-4.4.0 port: use gcc dll 2009-07-25 06:19:59 +0200 tono r274332 : i#103803: mingw gcc-4.4.0 port: invalid "extern static" 2009-07-25 06:13:56 +0200 tono r274331 : i#103802: mingw gcc-4.4.0 port: inhibit use of pthread 2009-07-25 06:05:22 +0200 tono r274330 : i#103801: mingw gcc-4.4.0 port: specify relocatable data section 2009-07-25 05:54:09 +0200 tono r274329 : i#103800: mingw gcc-4.4.0 port: remove invalid scope 2009-07-25 05:44:58 +0200 tono r274328 : i#103799: mingw gcc-4.4.0 port: add some #include 2009-07-25 05:33:09 +0200 tono r274327 : i#103798: mingw gcc-4.4.0 port: add backward in include path 2009-07-25 05:24:42 +0200 tono r274326 : i#103797: mingw gcc-4.4.0 port: nooptimize c++-uno bridge 2009-07-25 05:16:20 +0200 tono r274325 : i#103795: mingw gcc-4.4.0 port: use gcc dll 2009-07-25 04:01:59 +0200 tono r274324 : i#103794: mingw gcc-4.4.0 port: make use of dwarf2 eh 2009-07-25 02:44:01 +0200 tono r274322 : i#103793: mingw port: Exclude msvc[pr]80.dll from packaging 2009-07-25 02:28:21 +0200 tono r274321 : i#103791: mingw port fix typo --- external/gcc3_specific/makefile.mk | 20 ++++++++++++++++++- external/prj/d.lst | 3 +++ libxmlsec/makefile.mk | 10 +++++++++- lpsolve/lp_solve_5.5-windows.patch | 4 ++-- lpsolve/makefile.mk | 8 +++++++- openssl/opensslmingw.patch | 41 ++++++++++++++++++++++++++++++++++---- redland/raptor/makefile.mk | 11 +++++++++- redland/rasqal/makefile.mk | 11 +++++++++- redland/redland/makefile.mk | 11 +++++++++- 9 files changed, 107 insertions(+), 12 deletions(-) (limited to 'redland') diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk index 889b61c1960c..fa409df5a707 100644 --- a/external/gcc3_specific/makefile.mk +++ b/external/gcc3_specific/makefile.mk @@ -13,11 +13,29 @@ TARGET=gcc3_specific .IF "$(COM)" == "GCC" -all : $(BIN)$/mingwm10.dll +.IF "$(MINGW_SHARED_GCCLIB)" == "YES" +MINGWGCCDLL=$(BIN)$/$(MINGW_GCCDLL) +.ENDIF + +.IF "$(MINGW_SHARED_GXXLIB)" == "YES" +MINGWGXXDLL=$(BIN)$/$(MINGW_GXXDLL) +.ENDIF + +all : $(BIN)$/mingwm10.dll $(MINGWGCCDLL) $(MINGWGXXDLL) $(BIN)$/mingwm10.dll : $(COPY) -p $(COMPATH)$/bin$/mingwm10.dll $(BIN)$/ +.IF "$(MINGW_SHARED_GCCLIB)" == "YES" +$(MINGWGCCDLL) : + $(COPY) -p $(COMPATH)$/bin$/$(MINGW_GCCDLL) $(BIN)$/ +.ENDIF + +.IF "$(MINGW_SHARED_GXXLIB)" == "YES" +$(MINGWGXXDLL) : + $(COPY) -p $(COMPATH)$/bin$/$(MINGW_GXXDLL) $(BIN)$/ +.ENDIF + .ENDIF .ELSE diff --git a/external/prj/d.lst b/external/prj/d.lst index bc7d7c1211aa..995ae01c7403 100644 --- a/external/prj/d.lst +++ b/external/prj/d.lst @@ -58,6 +58,9 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys ..\msi\instmsiw.exe %_DEST%\bin%_EXT%\instmsiw.exe ..\%__SRC%\bin\mingwm10.dll %_DEST%\bin%_EXT%\mingwm10.dll +..\%__SRC%\bin\libgcc*.dll %_DEST%\bin%_EXT%\libgcc*.dll +..\%__SRC%\bin\libstdc++*.dll %_DEST%\bin%_EXT%\libstdc++*.dll + ..\%__SRC%\lib\libmsvcrt*.* %_DEST%\lib%_EXT%\lib*.* ..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 950a49050014..817dc6d84658 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -77,9 +77,17 @@ CRYPTOLIB=nss .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" +xmlsec_CC=$(CC) +.IF "$(MINGW_SHARED_GCCLIB)"=="YES" +xmlsec_CC+=-shared-libgcc +.ENDIF +xmlsec_LIBS=-lmingwthrd +.IF "$(MINGW_SHARED_GXXLIB)"=="YES" +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 CFLAGS="-D_MT" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="-lmingwthrd" 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) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump" .IF "$(SYSTEM_MOZILLA)" != "YES" CONFIGURE_FLAGS+=--enable-pkgconfig=no .ENDIF diff --git a/lpsolve/lp_solve_5.5-windows.patch b/lpsolve/lp_solve_5.5-windows.patch index 48acb6c5a8a4..aae56fcdfe75 100644 --- a/lpsolve/lp_solve_5.5-windows.patch +++ b/lpsolve/lp_solve_5.5-windows.patch @@ -1,5 +1,5 @@ *** misc/lp_solve_5.5/lpsolve55/cgcc.bat Sun Jun 12 04:27:28 2005 ---- misc/build/lp_solve_5.5/lpsolve55/cgcc.bat Sun Feb 10 07:55:19 2008 +--- misc/build/lp_solve_5.5/lpsolve55/cgcc.bat Sun Dec 14 07:55:19 2008 *************** *** 7,14 **** @@ -15,7 +15,7 @@ set c=gcc ! windres lpsolve.rc lpsolve_res.obj -! %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -mno-cygwin -enable-stdcall-fixup -D_USRDLL -DWIN32 -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% lpsolve_res.obj ..\lp_solve.def -o lpsolve55.dll +! %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -mno-cygwin -enable-stdcall-fixup -mthreads %lpsolve_LDFLAGS% -D_USRDLL -DWIN32 -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% lpsolve_res.obj ..\lp_solve.def %lpsolve_LIBS% -o lpsolve55.dll %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -D_USRDLL -DWIN32 -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% -o liblpsolve55.so diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk index a69d5494d2a2..8401f8092dcf 100644 --- a/lpsolve/makefile.mk +++ b/lpsolve/makefile.mk @@ -56,7 +56,13 @@ CONFIGURE_FLAGS= BUILD_DIR=lpsolve55 .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" -BUILD_ACTION=cmd /c cgcc.bat +.IF "$(MINGW_SHARED_GCCLIB)"=="YES" +lpsolve_LDFLAGS=-shared-libgcc +.ENDIF +.IF "$(MINGW_SHARED_GXXLIB)"=="YES" +lpsolve_LIBS=-lstdc++_s +.ENDIF +BUILD_ACTION=lpsolve_LDFLAGS=$(lpsolve_LDFLAGS) lpsolve_LIBS=$(lpsolve_LIBS) cmd /c cgcc.bat .ELSE BUILD_ACTION=cmd /c cvc6.bat OUT2LIB=$(BUILD_DIR)$/lpsolve55.lib diff --git a/openssl/opensslmingw.patch b/openssl/opensslmingw.patch index 8aa266fd4e7f..abfe14363d23 100755 --- a/openssl/opensslmingw.patch +++ b/openssl/opensslmingw.patch @@ -38,9 +38,20 @@ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ link_app.$${shlib_target} -(cd ..; \ +--- misc/openssl-0.9.8k/e_os2.h 2005-12-19 03:57:07.000000000 +0900 ++++ misc/build/openssl-0.9.8k/e_os2.h 2009-04-04 23:07:15.324250000 +0900 +@@ -264,7 +264,7 @@ + # define OPENSSL_IMPLEMENT_GLOBAL(type,name) \ + extern type _hide_##name; \ + type *_shadow_##name(void) { return &_hide_##name; } \ +- static type _hide_##name ++ type _hide_##name + # define OPENSSL_DECLARE_GLOBAL(type,name) type *_shadow_##name(void) + # define OPENSSL_GLOBAL_REF(name) (*(_shadow_##name())) + #else --- misc/openssl-0.9.8k/ms/mingw32.bat 2006-05-05 15:19:32.000000000 +0200 +++ misc/build/openssl-0.9.8k/ms/mingw32.bat 2009-03-30 11:54:10.000000000 +0200 -@@ -79,13 +79,19 @@ +@@ -79,15 +79,41 @@ rem copy ms\tlhelp32.h outinc echo Building the libraries @@ -56,13 +67,35 @@ if errorlevel 1 goto end -dllwrap --dllname libssl32.dll --output-lib out/libssl32.a --def ms/ssleay32.def out/libssl.a out/libeay32.a +gcc --shared --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32 -+if errorlevel 1 goto end + if errorlevel 1 goto end +dlltool --dllname ssleay32.dll --output-lib out/libssl.a --input-def ms/ssleay32.def +if errorlevel 1 goto end -+gcc --shared --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto - if errorlevel 1 goto end ++if "%MINGW_SHARED_GXXLIB%"=="YES" goto shared_gxxlib ++if "%MINGW_SHARED_GCCLIB%"=="YES" goto shared_gcclib ++gcc --shared --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32 ++if errorlevel 1 goto end ++gcc --shared --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto ++if errorlevel 1 goto end ++goto finished ++ ++:shared_gcclib ++gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32 ++if errorlevel 1 goto end ++gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto ++if errorlevel 1 goto end ++goto finished ++ ++:shared_gxxlib ++gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32 -lstdc++_s ++if errorlevel 1 goto end ++gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto -lstdc++_s ++if errorlevel 1 goto end ++goto finished ++:finished echo Done compiling OpenSSL + + :end --- misc/openssl-0.9.8k/test/Makefile 2009-03-25 19:59:22.000000000 +0900 +++ misc/build/openssl-0.9.8k/test/Makefile 2009-04-10 20:07:21.522500000 +0900 @@ -402,13 +402,13 @@ diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index a200ba06a2c7..9c0bbaf47efd 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -71,10 +71,19 @@ BUILD_DIR=$(CONFIGURE_DIR)$/src .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" OOO_PATCH_FILES+=$(TARFILE_NAME).patch.mingw +raptor_CC=$(CC) +.IF "$(MINGW_SHARED_GCCLIB)"=="YES" +raptor_CC+=-shared-libgcc +.ENDIF +raptor_LIBS=-lmingwthrd +.IF "$(MINGW_SHARED_GXXLIB)"=="YES" +raptor_LIBS+=-lstdc++_s +.ENDIF + CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure # 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)" +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" CC="$(raptor_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(raptor_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) XSLTLIB="$(XSLTLIB)" BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index 99d67b501f96..8753580ff20e 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -70,9 +70,18 @@ BUILD_ACTION=dmake BUILD_DIR=$(CONFIGURE_DIR)$/src .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" +rasqal_CC=$(CC) +.IF "$(MINGW_SHARED_GCCLIB)"=="YES" +rasqal_CC+=-shared-libgcc +.ENDIF +rasqal_LIBS=-lmingwthrd +.IF "$(MINGW_SHARED_GXXLIB)"=="YES" +rasqal_LIBS+=-lstdc++_s +.ENDIF + CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --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)" +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(rasqal_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(rasqal_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) XSLTLIB="$(XSLTLIB)" BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index d393e8b6e40d..a1bad00117cc 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -72,9 +72,18 @@ BUILD_ACTION=dmake BUILD_DIR=$(CONFIGURE_DIR)$/librdf .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" +redland_CC=$(CC) +.IF "$(MINGW_SHARED_GCCLIB)"=="YES" +redland_CC+=-shared-libgcc +.ENDIF +redland_LIBS=-lmingwthrd +.IF "$(MINGW_SHARED_GXXLIB)"=="YES" +redland_LIBS+=-lstdc++_s +.ENDIF + CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --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)" +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --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" CC="$(redland_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(redland_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) XSLTLIB="$(XSLTLIB)" BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) -- cgit v1.2.3 From fe4e9a884f9c61dd41c2eb1c94049bfe999fb778 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 9 Sep 2009 18:14:16 +0200 Subject: #103496#: remove sal dependency by not using uwinapi --- redland/raptor/raptor-1.4.18.patch.dmake | 3 ++- redland/rasqal/rasqal-0.9.16.patch.dmake | 3 ++- redland/redland/redland-1.0.8.patch.dmake | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'redland') diff --git a/redland/raptor/raptor-1.4.18.patch.dmake b/redland/raptor/raptor-1.4.18.patch.dmake index aa0f5ab29117..da43a7887fde 100644 --- a/redland/raptor/raptor-1.4.18.patch.dmake +++ b/redland/raptor/raptor-1.4.18.patch.dmake @@ -1,6 +1,6 @@ --- 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,122 @@ +@@ -1,1 +1,123 @@ -dummy +#************************************************************************* +# @@ -40,6 +40,7 @@ +LIBTARGET=NO + +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE ++UWINAPILIB= + + +# --- Settings ----------------------------------------------------- diff --git a/redland/rasqal/rasqal-0.9.16.patch.dmake b/redland/rasqal/rasqal-0.9.16.patch.dmake index adfade9670bb..f79e38f33c2d 100644 --- a/redland/rasqal/rasqal-0.9.16.patch.dmake +++ b/redland/rasqal/rasqal-0.9.16.patch.dmake @@ -1,6 +1,6 @@ --- misc/rasqal-0.9.16/src/makefile.mk Thu Nov 6 15:56:45 2008 +++ misc/build/rasqal-0.9.16/src/makefile.mk Thu Nov 6 15:55:09 2008 -@@ -1,1 +1,97 @@ +@@ -1,1 +1,98 @@ -dummy +#************************************************************************* +# @@ -38,6 +38,7 @@ +PRJNAME=redland +TARGET=rasqal +LIBTARGET=NO ++UWINAPILIB= + +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE + diff --git a/redland/redland/redland-1.0.8.patch.dmake b/redland/redland/redland-1.0.8.patch.dmake index d88f9548a341..39931b7b1b4b 100644 --- a/redland/redland/redland-1.0.8.patch.dmake +++ b/redland/redland/redland-1.0.8.patch.dmake @@ -1,6 +1,6 @@ --- misc/redland-1.0.8/librdf/makefile.mk Mon Jun 16 19:32:46 2008 +++ misc/build/redland-1.0.8/librdf/makefile.mk Mon Jun 16 19:26:20 2008 -@@ -1,1 +1,114 @@ +@@ -1,1 +1,115 @@ -dummy +#************************************************************************* +# @@ -38,6 +38,7 @@ +PRJNAME=redland +TARGET=librdf +LIBTARGET=NO ++UWINAPILIB= + +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE + -- cgit v1.2.3 From 8ffd74a9de667d83618ea15557bba480308e95e0 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Wed, 16 Sep 2009 14:37:52 +0000 Subject: 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 to just 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") --- libxmlsec/makefile.mk | 4 +-- libxmlsec/xmlsec1-1.2.6.patch | 70 ------------------------------------------- redland/prj/build.lst | 2 +- redland/raptor/makefile.mk | 3 +- redland/rasqal/makefile.mk | 3 +- redland/redland/makefile.mk | 3 +- 6 files changed, 6 insertions(+), 79 deletions(-) (limited to 'redland') 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 @@ diff --git a/redland/prj/build.lst b/redland/prj/build.lst index a5653f0cf5d4..1264756d796b 100644 --- a/redland/prj/build.lst +++ b/redland/prj/build.lst @@ -1,4 +1,4 @@ -rld redland : sal soltools ZLIB:zlib LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL +rld redland : sal soltools LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL rld redland usr1 - all rld_mkout NULL rld redland\raptor nmake - all rld_raptor NULL rld redland\rasqal nmake - all rld_rasqal rld_raptor NULL diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 9c0bbaf47efd..432bc7193986 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -83,7 +83,7 @@ raptor_LIBS+=-lstdc++_s CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure # 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" CC="$(raptor_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(raptor_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) XSLTLIB="$(XSLTLIB)" +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" CC="$(raptor_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(raptor_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)" BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) @@ -125,7 +125,6 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config .EXPORT: CPPFLAGS .EXPORT: LDFLAGS .EXPORT: LIBXML2LIB -.EXPORT: ZLIB3RDLIB .EXPORT: XSLTLIB CONFIGURE_DIR= diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index 8753580ff20e..21b919c5186a 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -81,7 +81,7 @@ rasqal_LIBS+=-lstdc++_s CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(rasqal_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(rasqal_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) XSLTLIB="$(XSLTLIB)" +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(rasqal_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(rasqal_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)" BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) @@ -122,7 +122,6 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config .EXPORT: CPPFLAGS .EXPORT: LDFLAGS .EXPORT: LIBXML2LIB -.EXPORT: ZLIB3RDLIB .EXPORT: XSLTLIB CONFIGURE_DIR= diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index a1bad00117cc..26dc546f7238 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -83,7 +83,7 @@ redland_LIBS+=-lstdc++_s CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --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" CC="$(redland_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(redland_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) XSLTLIB="$(XSLTLIB)" +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --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" CC="$(redland_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(redland_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)" BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) @@ -128,7 +128,6 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config .EXPORT: CPPFLAGS .EXPORT: LDFLAGS .EXPORT: LIBXML2LIB -.EXPORT: ZLIB3RDLIB .EXPORT: XSLTLIB CONFIGURE_DIR= -- cgit v1.2.3 From 408c5595e34788cbe1e4701c594acd13e77cc4a0 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Wed, 16 Sep 2009 14:49:32 +0000 Subject: CWS-TOOLING: integrate CWS cloph13 2009-09-01 #i104566# also use syslibroot/isysroot for external components 2009-08-28 #i104568# clean up duplicated definitions of OBJCXXFLAGS 2009-08-28 #i104567# add ccache-detection to configure (to skip to objcxx-flags) 2009-08-28 #i104566# use Mac OS X 10.4-SDK to ensure backwards compatibility use MACOSX_DEPLOYMENT_TARGET and sysroot/syslibroot switches ignore "-isysroot /Developer/..." arguments for OOo's cpp --- apple_remote/makefile.mk | 1 - apple_remote/makefile2.pmk | 35 ----------------------------------- hyphen/makefile.mk | 4 +++- libtextcat/makefile.mk | 2 +- libxmlsec/makefile.mk | 4 +++- lpsolve/makefile.mk | 1 + redland/raptor/makefile.mk | 2 +- redland/rasqal/makefile.mk | 2 +- redland/redland/makefile.mk | 2 +- 9 files changed, 11 insertions(+), 42 deletions(-) delete mode 100644 apple_remote/makefile2.pmk (limited to 'redland') diff --git a/apple_remote/makefile.mk b/apple_remote/makefile.mk index b0da5011656b..4abde8bf709b 100644 --- a/apple_remote/makefile.mk +++ b/apple_remote/makefile.mk @@ -39,7 +39,6 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/makefile2.pmk # --- Files -------------------------------------------------------- diff --git a/apple_remote/makefile2.pmk b/apple_remote/makefile2.pmk deleted file mode 100644 index cc06558f7594..000000000000 --- a/apple_remote/makefile2.pmk +++ /dev/null @@ -1,35 +0,0 @@ -#************************************************************************* -# -# 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: makefile2.pmk,v $ -# -# $Revision: 1.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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(GUIBASE)"=="aqua" -OBJCXXFLAGS=-x objective-c++ -fobjc-exceptions -CFLAGSCXX+=$(OBJCXXFLAGS) -.ENDIF # "$(GUIBASE)"=="aqua" diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk index 6ba6f1064c5a..ab1c4d7dfffa 100644 --- a/hyphen/makefile.mk +++ b/hyphen/makefile.mk @@ -63,7 +63,9 @@ LCL_CONFIGURE_CFLAGS+=-m64 LCL_CONFIGURE_CFLAGS+=$(EXTRA_CFLAGS) CONFIGURE_FLAGS+=CXXFLAGS="$(EXTRA_CFLAGS)" .ENDIF # "$(EXTRA_CFLAGS)"!="" -.ENDIF # "$(SYSBASE)"!="" +.ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!="" +CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" +.ENDIF .IF "$(LCL_CONFIGURE_CFLAGS)"!="" CONFIGURE_FLAGS+=CFLAGS='$(LCL_CONFIGURE_CFLAGS)' diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk index 33c76042be97..c7d66e58cb62 100644 --- a/libtextcat/makefile.mk +++ b/libtextcat/makefile.mk @@ -58,7 +58,7 @@ ADDITIONAL_FILES= \ #relative to CONFIGURE_DIR CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" -CONFIGURE_FLAGS= +CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL)) BUILD_ACTION=make diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 7632fc179414..c4815bc26ed9 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -120,7 +120,9 @@ xmlsec_CFLAGS+=$(C_RESTRICTIONFLAGS) xmlsec_CFLAGS+=$(EXTRA_CFLAGS) .ENDIF # "$(EXTRA_CFLAGS)"!="" xmlsec_LDFLAGS+=-L$(SYSBASE)$/usr$/lib -.ENDIF # "$(SYSBASE)"!="" +.ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!="" +xmlsec_CPPFLAGS+=$(EXTRA_CDEFS) +.ENDIF .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" xmlsec_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk index 8401f8092dcf..d8663f7c905f 100644 --- a/lpsolve/makefile.mk +++ b/lpsolve/makefile.mk @@ -73,6 +73,7 @@ BUILD_ACTION=sh ccc.os2 OUT2LIB=$(BUILD_DIR)$/liblpsolve55.lib .ELSE .IF "$(OS)"=="MACOSX" +.EXPORT: EXTRA_CDEFS EXTRA_LINKFLAGS BUILD_ACTION=sh ccc.osx OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dylib .ELSE diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 432bc7193986..2dd5dfe69905 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -118,7 +118,7 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl .ENDIF .ENDIF # "$(SYSBASE)"!="" -CPPFLAGS+:=$(EXTRA_CFLAGS) +CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS) LDFLAGS+:=$(EXTRA_LINKFLAGS) XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index 21b919c5186a..c7ae0ed07df4 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -115,7 +115,7 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl .ENDIF .ENDIF # "$(SYSBASE)"!="" -CPPFLAGS+:=$(EXTRA_CFLAGS) +CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS) LDFLAGS+:=$(EXTRA_LINKFLAGS) XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 26dc546f7238..bb9fe2033ad2 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -121,7 +121,7 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl LDFLAGS+:=-Wl,-dylib_file,@loader_path/libraptor.1.dylib:$(PWD)/$(LB)/libraptor.1.dylib .ENDIF -CPPFLAGS+:=$(EXTRA_CFLAGS) +CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS) LDFLAGS+:=$(EXTRA_LINKFLAGS) XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config -- cgit v1.2.3 From f931088abf31f850c20c799094b328ac69356d10 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 28 Sep 2009 16:51:16 +0200 Subject: regression from sb113: redland does not build from scratch --- redland/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'redland') diff --git a/redland/prj/build.lst b/redland/prj/build.lst index c23ad527fc71..d6faa870ba20 100644 --- a/redland/prj/build.lst +++ b/redland/prj/build.lst @@ -1,4 +1,4 @@ -rld redland : soltools LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL +rld redland : soltools LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl ZLIB:zlib NULL rld redland usr1 - all rld_mkout NULL rld redland\raptor nmake - all rld_raptor NULL rld redland\rasqal nmake - all rld_rasqal rld_raptor NULL -- cgit v1.2.3 From 32f7f5c072abb63ed77b75b96341b665967c514b Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 28 Sep 2009 17:14:51 +0200 Subject: zlib problem must be fixed in solenv --- redland/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'redland') diff --git a/redland/prj/build.lst b/redland/prj/build.lst index d6faa870ba20..c23ad527fc71 100644 --- a/redland/prj/build.lst +++ b/redland/prj/build.lst @@ -1,4 +1,4 @@ -rld redland : soltools LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl ZLIB:zlib NULL +rld redland : soltools LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL rld redland usr1 - all rld_mkout NULL rld redland\raptor nmake - all rld_raptor NULL rld redland\rasqal nmake - all rld_rasqal rld_raptor NULL -- cgit v1.2.3 From 645b2b6acf4dcc4a6863fe9d279391d2c3943efe Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Thu, 5 Nov 2009 18:40:46 +0100 Subject: ause109: #i106645# on incremental builds prefer current build over solver --- redland/redland/makefile.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'redland') diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index bb9fe2033ad2..927f9868b10d 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -107,8 +107,8 @@ CFLAGS=-m64 .ENDIF # NB: SOLARDIR before SYSBASE, because linux SYSBASE contains obsolete libcrypto -CPPFLAGS+:=-I$(SOLARINCDIR)$/external -LDFLAGS+:=-L$(SOLARLIBDIR) +CPPFLAGS+:=-I$(PWD)$/$(INCCOM) -I$(SOLARINCDIR)$/external +LDFLAGS+:=-L$(PWD)$/$(LB) -L$(SOLARLIBDIR) .IF "$(SYSBASE)"!="" CPPFLAGS+:=-I$(SYSBASE)$/usr$/include -- cgit v1.2.3 From 848647cb40606032a687ef385d28a1d6f8774dc0 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 18 Nov 2009 14:47:13 +0100 Subject: #i103496#: some more missing dependencies on stlport --- libtextcat/prj/build.lst | 2 +- redland/prj/build.lst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'redland') diff --git a/libtextcat/prj/build.lst b/libtextcat/prj/build.lst index 85163759b48e..da155db3d291 100644 --- a/libtextcat/prj/build.lst +++ b/libtextcat/prj/build.lst @@ -1,3 +1,3 @@ -ltc libtextcat : soltools solenv NULL +ltc libtextcat : stlport soltools solenv NULL ltc libtextcat usr1 - all ltc_mkout NULL ltc libtextcat nmake - all ltc_libtextcat NULL diff --git a/redland/prj/build.lst b/redland/prj/build.lst index c23ad527fc71..f6d0562d4bb4 100644 --- a/redland/prj/build.lst +++ b/redland/prj/build.lst @@ -1,4 +1,4 @@ -rld redland : soltools LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL +rld redland : stlport soltools LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL rld redland usr1 - all rld_mkout NULL rld redland\raptor nmake - all rld_raptor NULL rld redland\rasqal nmake - all rld_rasqal rld_raptor NULL -- cgit v1.2.3 From b29bb2dbee8137ef5ff240588cf2269edc9428fd Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Fri, 15 Jan 2010 14:55:12 +0100 Subject: ause110: #i106731# remove tarballs from scm and find them in download cache dir --- afms/makefile.mk | 1 + beanshell/makefile.mk | 1 + cppunit/makefile.mk | 1 + epm/makefile.mk | 1 + external/glibc/makefile.mk | 1 + hsqldb/makefile.mk | 1 + hyphen/makefile.mk | 1 + icc/makefile.mk | 1 + libtextcat/makefile.mk | 1 + libwpd/makefile.mk | 1 + libxmlsec/makefile.mk | 1 + lpsolve/makefile.mk | 1 + lucene/makefile.mk | 1 + openssl/makefile.mk | 1 + redland/raptor/makefile.mk | 1 + redland/rasqal/makefile.mk | 1 + redland/redland/makefile.mk | 1 + rhino/makefile.mk | 1 + rhino/rhino1_5R5-find_swing.patch | 6 ++---- vigra/makefile.mk | 1 + xsltml/makefile.mk | 1 + 21 files changed, 22 insertions(+), 4 deletions(-) (limited to 'redland') diff --git a/afms/makefile.mk b/afms/makefile.mk index 922b10161f8b..17334c8f8679 100644 --- a/afms/makefile.mk +++ b/afms/makefile.mk @@ -41,6 +41,7 @@ TARGET=afms # --- Files -------------------------------------------------------- TARFILE_NAME=Adobe-Core35_AFMs-314 +TARFILE_MD5=1756c4fa6c616ae15973c104cd8cb256 TARFILE_ROOTDIR=Adobe-Core35_AFMs-314 # TAR_EXCLUDES broken for solaris tar - #i77247# # TAR_EXCLUDES=*/*Helvetica-Narrow* diff --git a/beanshell/makefile.mk b/beanshell/makefile.mk index 215c59891d0b..26ebc368cb4c 100644 --- a/beanshell/makefile.mk +++ b/beanshell/makefile.mk @@ -42,6 +42,7 @@ TARGET=ooo_beanshell # --- Files -------------------------------------------------------- TARFILE_NAME=bsh-2.0b1-src +TARFILE_MD5=ea570af93c284aa9e5621cd563f54f4d TARFILE_ROOTDIR=BeanShell PATCH_FILES=bsh-2.0b1-src.patch diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index 3836e6905e9a..3f52b78e6f5d 100644 --- a/cppunit/makefile.mk +++ b/cppunit/makefile.mk @@ -41,6 +41,7 @@ TARGET=so_cppunit # --- Files -------------------------------------------------------- TARFILE_NAME=cppunit-1.8.0 +TARFILE_MD5=9f18d97ca99b4f095f5ff18139df59c3 ADDITIONAL_FILES=\ include$/cppunit$/config-auto.h \ diff --git a/epm/makefile.mk b/epm/makefile.mk index 5f4f93db31b1..50cb645201ec 100644 --- a/epm/makefile.mk +++ b/epm/makefile.mk @@ -41,6 +41,7 @@ TARGET=epm # --- Files -------------------------------------------------------- TARFILE_NAME=epm-3.7 +TARFILE_MD5=3ade8cfe7e59ca8e65052644fed9fca4 PATCH_FILES=epm-3.7.patch .IF "$(GUI)"=="UNX" && "$(BUILD_EPM)" != "NO" diff --git a/external/glibc/makefile.mk b/external/glibc/makefile.mk index 8940a0cd2f84..cb589cdeb84c 100644 --- a/external/glibc/makefile.mk +++ b/external/glibc/makefile.mk @@ -41,6 +41,7 @@ TARGET=getopt # --- Files -------------------------------------------------------- TARFILE_NAME=glibc-2.1.3-stub +TARFILE_MD5=4a660ce8466c9df01f19036435425c3a TARFILE_ROOTDIR=glibc-2.1.3 ADDITIONAL_FILES=posix$/makefile.mk posix$/config.h posix$/readdir_r.c diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk index b38dea0d201d..714dff194928 100755 --- a/hsqldb/makefile.mk +++ b/hsqldb/makefile.mk @@ -49,6 +49,7 @@ ANT_BUILDFILE=build$/build.xml # --- Files -------------------------------------------------------- TARFILE_NAME=hsqldb_$(HSQLDB_VERSION) +TARFILE_MD5=17410483b5b5f267aa18b7e00b65e6e0 TARFILE_ROOTDIR=hsqldb diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk index ab1c4d7dfffa..6a29b60b14b0 100644 --- a/hyphen/makefile.mk +++ b/hyphen/makefile.mk @@ -41,6 +41,7 @@ TARGET=hyphen # --- Files -------------------------------------------------------- TARFILE_NAME=hyphen-2.4 +TARFILE_MD5=d0b5af6e408b8d2958f3d83b5244f5e8 ADDITIONAL_FILES += makefile.mk diff --git a/icc/makefile.mk b/icc/makefile.mk index 2f353bc4a793..09460100ddec 100644 --- a/icc/makefile.mk +++ b/icc/makefile.mk @@ -41,6 +41,7 @@ TARGET=icc # --- Files -------------------------------------------------------- TARFILE_NAME=SampleICC-1.3.2 +TARFILE_MD5=fdb27bfe2dbe2e7b57ae194d9bf36bab PATCH_FILES=$(TARFILE_NAME).patch CONVERTFILES= \ diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk index c7d66e58cb62..1e907c7ee843 100644 --- a/libtextcat/makefile.mk +++ b/libtextcat/makefile.mk @@ -41,6 +41,7 @@ TARGET=libtextcat # --- Files -------------------------------------------------------- TARFILE_NAME=libtextcat-2.2 +TARFILE_MD5=128cfc86ed5953e57fe0f5ae98b62c2e TARFILE_ROOTDIR=libtextcat-2.2 PATCH_FILES=libtextcat-2.2.patch diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk index 0d66765ba4d8..99ee2d234300 100644 --- a/libwpd/makefile.mk +++ b/libwpd/makefile.mk @@ -46,6 +46,7 @@ TARGET=wpd .ENDIF TARFILE_NAME=libwpd-0.8.8 +TARFILE_MD5=cd5997284f4ba1e8dde5d1e5869fc342 PATCH_FILES=$(TARFILE_NAME).diff BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) BUILD_DIR=src$/lib diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index d0b1b218afc2..3d969a0e25ae 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -49,6 +49,7 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE XMLSEC1VERSION=1.2.12 TARFILE_NAME=$(PRJNAME)-$(XMLSEC1VERSION) +TARFILE_MD5=195d042623bcc2e1668ab8370de6dc2a #xmlsec1-configure.patch: Set up the build. Straightforward #configuration diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk index d8663f7c905f..254d130a0a48 100644 --- a/lpsolve/makefile.mk +++ b/lpsolve/makefile.mk @@ -41,6 +41,7 @@ TARGET=lpsolve # --- Files -------------------------------------------------------- TARFILE_NAME=lp_solve_5.5 +TARFILE_MD5=26b3e95ddf3d9c077c480ea45874b3b8 .IF "$(GUI)"=="WNT" PATCH_FILES=lp_solve_5.5-windows.patch diff --git a/lucene/makefile.mk b/lucene/makefile.mk index 2d87f23bd312..73cc05337c1e 100644 --- a/lucene/makefile.mk +++ b/lucene/makefile.mk @@ -53,6 +53,7 @@ LUCENE_CORE_JAR=lucene-core-$(LUCENE_MAJOR).$(LUCENE_MINOR).jar LUCENE_ANALYZERS_JAR=lucene-analyzers-$(LUCENE_MAJOR).$(LUCENE_MINOR).jar TARFILE_NAME=$(LUCENE_NAME) +TARFILE_MD5=48d8169acc35f97e05d8dcdfd45be7f2 PATCH_FILES=lucene.patch BUILD_DIR=. diff --git a/openssl/makefile.mk b/openssl/makefile.mk index d8446f94f708..43b9e7acc20a 100644 --- a/openssl/makefile.mk +++ b/openssl/makefile.mk @@ -53,6 +53,7 @@ TARGET=openssl OPENSSL_NAME=openssl-0.9.8l TARFILE_NAME=$(OPENSSL_NAME) +TARFILE_MD5=05a0ece1372392a2cf310ebb96333025 CONFIGURE_DIR=. CONFIGURE_ACTION=config diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 2dd5dfe69905..ea90fd652a88 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -51,6 +51,7 @@ all: RAPTORVERSION=$(RAPTOR_MAJOR).4.18 TARFILE_NAME=raptor-$(RAPTORVERSION) +TARFILE_MD5=284e768eeda0e2898b0d5bf7e26a016e ADDITIONAL_FILES=src/makefile.mk src/raptor_config.h diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index c7ae0ed07df4..41bb184b0020 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -51,6 +51,7 @@ all: RASQALVERSION=0.9.16 TARFILE_NAME=rasqal-$(RASQALVERSION) +TARFILE_MD5=fca8706f2c4619e2fa3f8f42f8fc1e9d ADDITIONAL_FILES=src/makefile.mk src/rasqal_config.h diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 927f9868b10d..93a2da116901 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -51,6 +51,7 @@ all: REDLANDVERSION=1.0.8 TARFILE_NAME=redland-$(REDLANDVERSION) +TARFILE_MD5=ca66e26082cab8bb817185a116db809b ADDITIONAL_FILES=librdf/makefile.mk librdf/rdf_config.h diff --git a/rhino/makefile.mk b/rhino/makefile.mk index 0809007ea7b4..5244af24f5d7 100755 --- a/rhino/makefile.mk +++ b/rhino/makefile.mk @@ -43,6 +43,7 @@ TARGET=ooo_rhino # --- Files -------------------------------------------------------- TARFILE_NAME=rhino1_5R5 +TARFILE_MD5=798b2ffdc8bcfe7bca2cf92b62caf685 TARFILE_ROOTDIR=rhino1_5R5 ADDITIONAL_FILES= \ diff --git a/rhino/rhino1_5R5-find_swing.patch b/rhino/rhino1_5R5-find_swing.patch index e94974a41574..220c4f4e668a 100644 --- a/rhino/rhino1_5R5-find_swing.patch +++ b/rhino/rhino1_5R5-find_swing.patch @@ -1,13 +1,11 @@ --- misc/rhino1_5R5/toolsrc/build.xml 2009-10-29 18:29:46.605524507 +0100 +++ misc/build/rhino1_5R5/toolsrc/build.xml 2009-10-29 18:29:26.536908810 +0100 -@@ -12,6 +12,10 @@ +@@ -12,6 +12,8 @@ + -+ -+ -+ ++ diff --git a/vigra/makefile.mk b/vigra/makefile.mk index 97f6b0e29bf6..c991eac2ce77 100644 --- a/vigra/makefile.mk +++ b/vigra/makefile.mk @@ -51,6 +51,7 @@ all: # --- Files -------------------------------------------------------- TARFILE_NAME=vigra1.4.0 +TARFILE_MD5=ea91f2fb4212a21d708aced277e6e85a PATCH_FILES=$(TARFILE_NAME).patch CONFIGURE_DIR= diff --git a/xsltml/makefile.mk b/xsltml/makefile.mk index 7192cd5c8839..24c97946198f 100755 --- a/xsltml/makefile.mk +++ b/xsltml/makefile.mk @@ -43,6 +43,7 @@ TARGET=xsltml # --- Files -------------------------------------------------------- TARFILE_NAME=xsltml_2.1.2 +TARFILE_MD5=a7983f859eafb2677d7ff386a023bc40 PATCH_FILES=$(TARFILE_NAME).patch TARFILE_IS_FLAT:=TRUE -- cgit v1.2.3 From 44a1e0d4da70ee4b1a67d751eb94127282c54c20 Mon Sep 17 00:00:00 2001 From: sb Date: Fri, 29 Jan 2010 17:01:54 +0100 Subject: sb118: #i108776# changed addsym.awk to also export STLport num_put symbols, and simplified it by requiring that first section is labeled UDK_3_0_0; adapted map files accordingly, replacing many individual ones with solenv/src templates --- redland/raptor/raptor2.map | 2 +- redland/rasqal/rasqal2.map | 2 +- redland/redland/redland2.map | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'redland') diff --git a/redland/raptor/raptor2.map b/redland/raptor/raptor2.map index 8c0cb819f9ff..109a74b632bb 100644 --- a/redland/raptor/raptor2.map +++ b/redland/raptor/raptor2.map @@ -1,4 +1,4 @@ -RAPTOR2 { +UDK_3_0_0 { global: GetVersionInfo; raptor_ntriples_string_as_utf8_string; diff --git a/redland/rasqal/rasqal2.map b/redland/rasqal/rasqal2.map index b36d25c9664b..622043ac984c 100644 --- a/redland/rasqal/rasqal2.map +++ b/redland/rasqal/rasqal2.map @@ -1,4 +1,4 @@ -RASQAL2 { +UDK_3_0_0 { global: GetVersionInfo; rasqal_xsd_decimal_set_string; diff --git a/redland/redland/redland2.map b/redland/redland/redland2.map index 660f80a0b8a4..5798f461684b 100644 --- a/redland/redland/redland2.map +++ b/redland/redland/redland2.map @@ -1,4 +1,4 @@ -REDLAND2 { +UDK_3_0_0 { global: GetVersionInfo; librdf_get_concept_resource_by_index; -- cgit v1.2.3 From ed6c525781faf45ec5d408f22e17352bfabb97f5 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 12 Feb 2010 10:25:14 +0000 Subject: cmcfixes72: #i109194# http://fedoraproject.org/wiki/UnderstandingDSOLinkChange fixes for raptor/rasqal --- redland/rasqal/makefile.mk | 3 +-- redland/rasqal/rasqal-0.9.16.patch.ooo_build | 22 ++++++++++++++++++++++ redland/redland/makefile.mk | 7 +++---- redland/redland/redland-1.0.8.patch.ooo_build | 22 ++++++++++++++++++++++ 4 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 redland/redland/redland-1.0.8.patch.ooo_build (limited to 'redland') diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index c7ae0ed07df4..d805761e5b5d 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -59,8 +59,7 @@ OOO_PATCH_FILES= \ $(TARFILE_NAME).patch.autotools \ $(TARFILE_NAME).patch.ooo_build \ $(TARFILE_NAME).patch.dmake \ - $(TARFILE_NAME).patch.win32 \ - + $(TARFILE_NAME).patch.win32 PATCH_FILES=$(OOO_PATCH_FILES) diff --git a/redland/rasqal/rasqal-0.9.16.patch.ooo_build b/redland/rasqal/rasqal-0.9.16.patch.ooo_build index eb4d24bb9c45..827147995e6f 100644 --- a/redland/rasqal/rasqal-0.9.16.patch.ooo_build +++ b/redland/rasqal/rasqal-0.9.16.patch.ooo_build @@ -32,3 +32,25 @@ fi if test "$echo_libtool_libs" = "yes"; then echo @libdir@/@RASQAL_LIBTOOLLIBS@ +--- misc/rasqal-0.9.16/Makefile.am 2010-02-12 08:43:21.000000000 +0000 ++++ misc/build/rasqal-0.9.16/Makefile.am 2010-02-12 08:43:56.000000000 +0000 +@@ -22,7 +22,7 @@ + + noinst_SCRIPTS = rasqal-src-config + +-SUBDIRS=src utils tests docs data win32 ++SUBDIRS=src tests docs data win32 + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = rasqal.pc +--- misc/rasqal-0.9.16/Makefile.in 2010-02-12 08:43:19.000000000 +0000 ++++ misc/build/rasqal-0.9.16/Makefile.in 2010-02-12 08:44:03.000000000 +0000 +@@ -242,7 +242,7 @@ + with_raptor = @with_raptor@ + with_redland = @with_redland@ + noinst_SCRIPTS = rasqal-src-config +-SUBDIRS = src utils tests docs data win32 ++SUBDIRS = src tests docs data win32 + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = rasqal.pc + EXTRA_DIST = ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \ diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 927f9868b10d..07a1e1dba452 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -58,14 +58,13 @@ OOO_PATCH_FILES= \ $(TARFILE_NAME).patch.legal \ $(TARFILE_NAME).patch.autotools \ $(TARFILE_NAME).patch.dmake \ - $(TARFILE_NAME).patch.win32 \ - + $(TARFILE_NAME).patch.ooo_build \ + $(TARFILE_NAME).patch.win32 PATCH_FILES=$(OOO_PATCH_FILES) \ $(TARFILE_NAME).patch.free_null \ $(TARFILE_NAME).patch.storage_hashes_context_serialize_get_statement \ - $(TARFILE_NAME).patch.storage_hashes_list_duplicates \ - + $(TARFILE_NAME).patch.storage_hashes_list_duplicates .IF "$(OS)"=="OS2" BUILD_ACTION=dmake diff --git a/redland/redland/redland-1.0.8.patch.ooo_build b/redland/redland/redland-1.0.8.patch.ooo_build new file mode 100644 index 000000000000..805a88d49ea2 --- /dev/null +++ b/redland/redland/redland-1.0.8.patch.ooo_build @@ -0,0 +1,22 @@ +--- misc/redland-1.0.8/Makefile.am 2010-02-12 08:47:40.000000000 +0000 ++++ misc/build/redland-1.0.8/Makefile.am 2010-02-12 08:47:51.000000000 +0000 +@@ -48,7 +48,7 @@ + # to ensure that the raptor and rasqal subdirectories are called + # as CONFIG_SUBDIR directories. + # +-SUBDIRS=@LOCAL_SUBDIRS@ librdf examples utils demos docs data ++SUBDIRS=@LOCAL_SUBDIRS@ librdf examples demos docs data + + EXTRA_DIST=ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \ + ChangeLog.5 ChangeLog.6 ChangeLog.7 \ +--- misc/redland-1.0.8/Makefile.in 2010-02-12 08:47:39.000000000 +0000 ++++ misc/build/redland-1.0.8/Makefile.in 2010-02-12 08:47:55.000000000 +0000 +@@ -283,7 +283,7 @@ + # to ensure that the raptor and rasqal subdirectories are called + # as CONFIG_SUBDIR directories. + # +-SUBDIRS = @LOCAL_SUBDIRS@ librdf examples utils demos docs data ++SUBDIRS = @LOCAL_SUBDIRS@ librdf examples demos docs data + EXTRA_DIST = ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \ + ChangeLog.5 ChangeLog.6 ChangeLog.7 \ + README NEWS LICENSE.txt TODO \ -- cgit v1.2.3 From aac3a82b827c04ce885e07e9fea8226aaf11b5c7 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Fri, 12 Feb 2010 15:01:35 +0100 Subject: changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) --- afms/makefile.mk | 6 +-- agg/source/makefile.mk | 6 +-- apple_remote/makefile.mk | 6 +-- beanshell/bsh-2.0b1-src.patch | 8 +--- beanshell/makefile.mk | 6 +-- cppunit/cppunit-1.8.0-r1.patch | 47 ++++++---------------- cppunit/makefile.mk | 8 +--- epm/makefile.mk | 6 +-- external/glibc-2.1.3.patch | 15 ++----- external/glibc/makefile.mk | 6 +-- external/mingwheaders/makefile.mk | 6 +-- fondu/makefile.mk | 6 +-- hsqldb/makefile.mk | 6 +-- hyphen/hyphen-2.4.patch | 8 +--- hyphen/makefile.mk | 6 +-- icc/makefile.mk | 6 +-- .../create_sRGB_profile/create_sRGB_profile.cpp | 5 --- libegg/source/makefile.mk | 6 +-- libtextcat/libtextcat-2.2.patch | 8 +--- libtextcat/makefile.mk | 6 +-- libwpd/makefile.mk | 6 +-- libxmlsec/makefile.mk | 6 +-- lpsolve/makefile.mk | 6 +-- lucene/makefile.mk | 6 +-- lucene/version.mk | 6 +-- np_sdk/mozsrc/makefile.mk | 6 +-- openssl/makefile.mk | 6 +-- openssl/version.mk | 6 +-- redland/raptor/makefile.mk | 6 +-- redland/raptor/raptor-1.4.18.patch.dmake | 8 +--- redland/rasqal/makefile.mk | 6 +-- redland/rasqal/rasqal-0.9.16.patch.dmake | 8 +--- redland/redland/makefile.mk | 6 +-- redland/redland/redland-1.0.8.patch.dmake | 8 +--- redland/redlandversion.mk | 6 +-- rhino/makefile.mk | 6 +-- rhino/rhino1_5R5.patch | 7 +--- twain/util/makefile.mk | 6 +-- vigra/makefile.mk | 6 +-- xsltml/makefile.mk | 6 +-- 40 files changed, 62 insertions(+), 242 deletions(-) (limited to 'redland') diff --git a/afms/makefile.mk b/afms/makefile.mk index 922b10161f8b..2d61ed2dfa12 100644 --- a/afms/makefile.mk +++ b/afms/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/agg/source/makefile.mk b/agg/source/makefile.mk index 6182f8c2a705..e29f2c3b8891 100755 --- a/agg/source/makefile.mk +++ b/agg/source/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/apple_remote/makefile.mk b/apple_remote/makefile.mk index 4abde8bf709b..d261d5192708 100644 --- a/apple_remote/makefile.mk +++ b/apple_remote/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.2 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/beanshell/bsh-2.0b1-src.patch b/beanshell/bsh-2.0b1-src.patch index aa880975a12d..99e8b8b9ddc2 100644 --- a/beanshell/bsh-2.0b1-src.patch +++ b/beanshell/bsh-2.0b1-src.patch @@ -31,20 +31,16 @@ Date: Tue, 9 Mar 2010 13:27:14 +0100 Subject: odfmetadata4: #i108911#: patch by cmc: remove first redland patch: redland: remove remove redland-1.0.8.patch.free_null. unordf: work around by wrapping librdf free functions. --- redland/redland/makefile.mk | 1 - redland/redland/redland-1.0.8.patch.free_null | 174 -------------------------- 2 files changed, 175 deletions(-) delete mode 100644 redland/redland/redland-1.0.8.patch.free_null (limited to 'redland') diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 2808686420ce..466e52d35a77 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -58,7 +58,6 @@ OOO_PATCH_FILES= \ PATCH_FILES=$(OOO_PATCH_FILES) \ - $(TARFILE_NAME).patch.free_null \ $(TARFILE_NAME).patch.storage_hashes_context_serialize_get_statement \ $(TARFILE_NAME).patch.storage_hashes_list_duplicates \ diff --git a/redland/redland/redland-1.0.8.patch.free_null b/redland/redland/redland-1.0.8.patch.free_null deleted file mode 100644 index 0524bb636b5e..000000000000 --- a/redland/redland/redland-1.0.8.patch.free_null +++ /dev/null @@ -1,174 +0,0 @@ ---- misc/redland-1.0.8/librdf/rdf_digest.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_digest.c Thu Nov 6 12:44:39 2008 -@@ -248,6 +248,8 @@ - void - librdf_free_digest(librdf_digest *digest) - { -+ if(!digest) -+ return; - if(digest->context) - LIBRDF_FREE(digest_context, digest->context); - if(digest->digest) ---- misc/redland-1.0.8/librdf/rdf_hash.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_hash.c Thu Nov 6 12:44:39 2008 -@@ -488,6 +488,8 @@ - void - librdf_free_hash(librdf_hash* hash) - { -+ if(!hash) -+ return; - if(hash->context) { - if(hash->is_open) - librdf_hash_close(hash); ---- misc/redland-1.0.8/librdf/rdf_init.c Tue Nov 6 16:26:18 2007 -+++ misc/build/redland-1.0.8/librdf/rdf_init.c Mon Jun 16 15:55:51 2008 -@@ -178,6 +178,9 @@ - void - librdf_free_world(librdf_world *world) - { -+ if(!world) -+ return; -+ - /* NOTE: raptor is always initialised as a parser and may - * be also used as a serializer, but it is NOT finished - * in the serializer_raptor registration. Therefore, always ---- misc/redland-1.0.8/librdf/rdf_list.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_list.c Thu Nov 6 12:44:39 2008 -@@ -106,6 +106,8 @@ - void - librdf_free_list(librdf_list* list) - { -+ if(!list) -+ return; - LIBRDF_ASSERT_RETURN(list->iterator_count, - "Iterators were active on freeing list", ); - ---- misc/redland-1.0.8/librdf/rdf_model.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_model.c Thu Nov 6 12:44:39 2008 -@@ -391,7 +391,8 @@ - librdf_iterator* iterator; - librdf_model* m; - -- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(model, librdf_model); -+ if(!model) -+ return; - - if(--model->usage) - return; ---- misc/redland-1.0.8/librdf/rdf_node.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_node.c Thu Nov 6 12:44:39 2008 -@@ -724,7 +724,8 @@ - librdf_world *world; - #endif - -- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(node, librdf_node); -+ if(!node) -+ return; - - #ifdef WITH_THREADS - world = node->world; ---- misc/redland-1.0.8/librdf/rdf_parser.c Tue Jul 1 08:09:58 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_parser.c Thu Nov 6 12:44:39 2008 -@@ -369,7 +369,8 @@ - void - librdf_free_parser(librdf_parser *parser) - { -- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(parser, librdf_parser); -+ if(!parser) -+ return; - - if(parser->context) { - if(parser->factory->terminate) ---- misc/redland-1.0.8/librdf/rdf_query.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_query.c Thu Nov 6 12:44:39 2008 -@@ -386,7 +386,8 @@ - void - librdf_free_query(librdf_query* query) - { -- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(query, librdf_query); -+ if(!query) -+ return; - - if(--query->usage) - return; ---- misc/redland-1.0.8/librdf/rdf_query_results.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_query_results.c Thu Nov 6 12:44:39 2008 -@@ -242,7 +242,8 @@ - void - librdf_free_query_results(librdf_query_results* query_results) - { -- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(query_results, librdf_query_results); -+ if(!query_results) -+ return; - - if(query_results->query->factory->free_results) - query_results->query->factory->free_results(query_results); -@@ -634,6 +635,8 @@ - void - librdf_free_query_results_formatter(librdf_query_results_formatter* formatter) - { -+ if(!formatter) -+ return; - if(formatter->query_results->query->factory->free_results_formatter) - formatter->query_results->query->factory->free_results_formatter(formatter); - } ---- misc/redland-1.0.8/librdf/rdf_serializer.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_serializer.c Thu Nov 6 12:44:39 2008 -@@ -371,7 +371,8 @@ - void - librdf_free_serializer(librdf_serializer *serializer) - { -- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(serializer, librdf_serializer); -+ if(!serializer) -+ return; - - if(serializer->context) { - if(serializer->factory->terminate) ---- misc/redland-1.0.8/librdf/rdf_statement.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_statement.c Thu Nov 6 12:44:39 2008 -@@ -253,7 +253,8 @@ - librdf_world *world; - #endif - -- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(statement, librdf_statement); -+ if(!statement) -+ return; - - #ifdef WITH_THREADS - world = statement->world; ---- misc/redland-1.0.8/librdf/rdf_storage.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_storage.c Thu Nov 6 12:44:39 2008 -@@ -610,7 +610,8 @@ - void - librdf_free_storage(librdf_storage* storage) - { -- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(storage, librdf_storage); -+ if(!storage) -+ return; - - if(--storage->usage) - return; ---- misc/redland-1.0.8/librdf/rdf_stream.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_stream.c Thu Nov 6 12:44:39 2008 -@@ -124,6 +124,9 @@ - void - librdf_free_stream(librdf_stream* stream) - { -+ if(!stream) -+ return; -+ - if(stream->finished_method) - stream->finished_method(stream->context); - ---- misc/redland-1.0.8/librdf/rdf_uri.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_uri.c Thu Nov 6 12:44:39 2008 -@@ -407,7 +407,8 @@ - librdf_world *world; - #endif - -- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(uri, librdf_uri); -+ if(!uri) -+ return; - - #ifdef WITH_THREADS - world = uri->world; -- cgit v1.2.3 From dcf402c93e575d566787bf886e7ba844a9ea1ce1 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 9 Mar 2010 13:27:15 +0100 Subject: odfmetadata4: #i108911#: patch by cmc: remove second redland patch: redland: remove redland-1.0.8.patch.storage_hashes_context_serialize_get_statement. unordf: work around by extending librdf_GraphResult with a context pointer. --- redland/redland/makefile.mk | 1 - ....storage_hashes_context_serialize_get_statement | 35 ---------------------- 2 files changed, 36 deletions(-) delete mode 100644 redland/redland/redland-1.0.8.patch.storage_hashes_context_serialize_get_statement (limited to 'redland') diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 466e52d35a77..a735aa1b318c 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -58,7 +58,6 @@ OOO_PATCH_FILES= \ PATCH_FILES=$(OOO_PATCH_FILES) \ - $(TARFILE_NAME).patch.storage_hashes_context_serialize_get_statement \ $(TARFILE_NAME).patch.storage_hashes_list_duplicates \ diff --git a/redland/redland/redland-1.0.8.patch.storage_hashes_context_serialize_get_statement b/redland/redland/redland-1.0.8.patch.storage_hashes_context_serialize_get_statement deleted file mode 100644 index 8c72946d199f..000000000000 --- a/redland/redland/redland-1.0.8.patch.storage_hashes_context_serialize_get_statement +++ /dev/null @@ -1,35 +0,0 @@ ---- misc/redland-1.0.8/librdf/rdf_storage_hashes.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_storage_hashes.c Thu Nov 6 12:44:39 2008 -@@ -1593,7 +1661,6 @@ - { - librdf_storage_hashes_context_serialise_stream_context* scontext=(librdf_storage_hashes_context_serialise_stream_context*)context; - librdf_hash_datum* v; -- librdf_node** cnp=NULL; - - switch(flags) { - case LIBRDF_ITERATOR_GET_METHOD_GET_OBJECT: -@@ -1606,20 +1673,14 @@ - return scontext->context_node; - } - -- /* current stuff is out of date - get new cached answers */ -- if(scontext->index_contexts) { -- if(scontext->context_node) -- librdf_free_node(scontext->context_node); -- scontext->context_node=NULL; -- cnp=&scontext->context_node; -- } -- -+ /* note: scontext->context_node is still valid */ -+ - librdf_statement_clear(&scontext->current); - - v=(librdf_hash_datum*)librdf_iterator_get_value(scontext->iterator); -- -+ - /* decode value content and optional context */ -- if(!librdf_statement_decode_parts(&scontext->current, cnp, -+ if(!librdf_statement_decode_parts(&scontext->current, NULL, - (unsigned char*)v->data, v->size)) { - return NULL; - } -- cgit v1.2.3 From 687dc53f1bfc9b8bd5af473938d2f2817fb54517 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 9 Mar 2010 13:27:16 +0100 Subject: odfmetadata4: #i108911#: patch by cmc: remove third redland patch: redland: remove redland-1.0.8.patch.storage_hashes_list_duplicates. unordf: work around by checking for duplicate in addStatementGraph(). --- redland/redland/makefile.mk | 1 - ...land-1.0.8.patch.storage_hashes_list_duplicates | 170 --------------------- 2 files changed, 171 deletions(-) delete mode 100644 redland/redland/redland-1.0.8.patch.storage_hashes_list_duplicates (limited to 'redland') diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index a735aa1b318c..6c95f3712f0e 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -58,7 +58,6 @@ OOO_PATCH_FILES= \ PATCH_FILES=$(OOO_PATCH_FILES) \ - $(TARFILE_NAME).patch.storage_hashes_list_duplicates \ .IF "$(OS)"=="OS2" diff --git a/redland/redland/redland-1.0.8.patch.storage_hashes_list_duplicates b/redland/redland/redland-1.0.8.patch.storage_hashes_list_duplicates deleted file mode 100644 index d2ef7e772230..000000000000 --- a/redland/redland/redland-1.0.8.patch.storage_hashes_list_duplicates +++ /dev/null @@ -1,170 +0,0 @@ ---- misc/redland-1.0.8/librdf/rdf_storage_hashes.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_storage_hashes.c Thu Nov 6 12:44:39 2008 -@@ -1387,6 +1387,66 @@ - LIBRDF_STATEMENT_OBJECT); - } - -+ -+/* return -1 on failure, 1 if context contains stmt, 0 if not */ -+static int -+librdf_storage_hashes_context_contains_statement(librdf_storage* storage, -+ librdf_node* context_node, -+ librdf_statement* statement) -+{ -+ librdf_storage_hashes_context* context=(librdf_storage_hashes_context*)storage->context; -+ librdf_hash_datum key, value; /* on stack - not allocated */ -+ size_t size; -+ int status; -+ -+ if(context->contexts_index < 0) { -+ librdf_log(storage->world, 0, LIBRDF_LOG_WARN, LIBRDF_FROM_STORAGE, NULL, -+ "Storage was created without context support"); -+ return -1; -+ } -+ -+ /* ENCODE KEY */ -+ size=librdf_node_encode(context_node, NULL, 0); -+ if (!size) -+ return -1; -+ key.data=(char*)LIBRDF_MALLOC(cstring, size); -+ if (!key.data) -+ return -1; -+ key.size=librdf_node_encode(context_node, -+ (unsigned char*)key.data, size); -+ if (!key.size) { -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ -+ /* ENCODE VALUE */ -+ size=librdf_statement_encode(statement, NULL, 0); -+ if (!size) { -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ value.data=(char*)LIBRDF_MALLOC(cstring, size); -+ if (!value.data) { -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ value.size=librdf_statement_encode(statement, (unsigned char*)value.data, size); -+ if (!value.size) { -+ LIBRDF_FREE(data, value.data); -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ -+ status=librdf_hash_exists(context->hashes[context->contexts_index], &key, &value); -+ LIBRDF_FREE(data, value.data); -+ LIBRDF_FREE(data, key.data); -+ -+ /* DO NOT free statement, ownership was not passed in */ -+ return status; -+} -+ -+ -+ - /** - * librdf_storage_hashes_context_add_statement: - * @storage: #librdf_storage object -@@ -1412,7 +1472,15 @@ - "Storage was created without context support"); - return 1; - } -- -+ -+ /* Do not add duplicate statements */ -+ status=librdf_storage_hashes_context_contains_statement(storage, context_node, statement); -+ if(status) -+ if(status < 0) -+ return 1; -+ else -+ return 0; -+ - if(librdf_storage_hashes_add_remove_statement(storage, - statement, context_node, 1)) - return 1; ---- misc/redland-1.0.8/librdf/rdf_storage_list.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_storage_list.c Thu Nov 6 12:44:39 2008 -@@ -457,6 +457,64 @@ - } - - -+/* return -1 on failure, 1 if context contains stmt, 0 if not */ -+static int -+librdf_storage_list_context_contains_statement(librdf_storage* storage, -+ librdf_node* context_node, -+ librdf_statement* statement) -+{ -+ librdf_storage_list_context* context=(librdf_storage_list_context*)storage->context; -+ librdf_hash_datum key, value; /* on stack - not allocated */ -+ size_t size; -+ int status; -+ -+ if(!context->index_contexts) { -+ librdf_log(storage->world, 0, LIBRDF_LOG_WARN, LIBRDF_FROM_STORAGE, NULL, -+ "Storage was created without context support"); -+ return -1; -+ } -+ -+ /* ENCODE KEY */ -+ size=librdf_node_encode(context_node, NULL, 0); -+ if (!size) -+ return -1; -+ key.data=(char*)LIBRDF_MALLOC(cstring, size); -+ if (!key.data) -+ return -1; -+ key.size=librdf_node_encode(context_node, -+ (unsigned char*)key.data, size); -+ if (!key.size) { -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ -+ /* ENCODE VALUE */ -+ size=librdf_statement_encode(statement, NULL, 0); -+ if (!size) { -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ value.data=(char*)LIBRDF_MALLOC(cstring, size); -+ if (!value.data) { -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ value.size=librdf_statement_encode(statement, (unsigned char*)value.data, size); -+ if (!value.size) { -+ LIBRDF_FREE(data, value.data); -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ -+ status=librdf_hash_exists(context->contexts, &key, &value); -+ LIBRDF_FREE(data, value.data); -+ LIBRDF_FREE(data, key.data); -+ -+ /* DO NOT free statement, ownership was not passed in */ -+ return status; -+} -+ -+ - /** - * librdf_storage_list_context_add_statement: - * @storage: #librdf_storage object -@@ -483,7 +541,15 @@ - "Storage was created without context support"); - return 1; - } -- -+ -+ /* Do not add duplicate statements */ -+ status=librdf_storage_list_context_contains_statement(storage, context_node, statement); -+ if(status) -+ if(status < 0) -+ return 1; -+ else -+ return 0; -+ - /* Store statement + node in the storage_list */ - sln=(librdf_storage_list_node*)LIBRDF_MALLOC(librdf_storage_list_node, sizeof(librdf_storage_list_node)); - if(!sln) -- cgit v1.2.3 From e9ea5449b353b867486c4a5250e846c3da35bf68 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 9 Mar 2010 13:27:16 +0100 Subject: odfmetadata4: #i108911#: configure.in: enable with-system-redland: based on patch by cmc. no patches are required for redland any more, so enable system redland. minimum version is redland 1.0.8. --- redland/README | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'redland') diff --git a/redland/README b/redland/README index d01ae085cc66..87299ebf1fd4 100644 --- a/redland/README +++ b/redland/README @@ -22,7 +22,8 @@ Libraries: libraptor, librasqal, librdf Patches: There are several patches, most of which contain only hacks to get it to build with OOo build system. -There are also 3 patches that fix bugs in redland and are of general interest: +There used to be also 3 patches here that fix bugs in redland and ought to be +of general interest: - redland-1.0.8.patch.free_null: redland destructor functions don't check if argument is NULL - redland-1.0.8.patch.storage_hashes_context_serialize_get_statement: @@ -31,4 +32,7 @@ There are also 3 patches that fix bugs in redland and are of general interest: - redland-1.0.8.patch.storage_hashes_list_duplicates: hashes, list storage: if contexts are enabled, then it is possible to add duplicate statements +Attempts to upstream these patches failed for reasons upstream kept to +themselves. Now these patches are replaced with workarounds in unoxml. +Note to future maintainers: work around redland bugs in client code. -- cgit v1.2.3 From 2f0d1f09eba36fcae6d3c97e234abc73dc1ef0b3 Mon Sep 17 00:00:00 2001 From: tono Date: Mon, 31 May 2010 21:53:32 +0900 Subject: i#111958: MinGW port enhancement: runtime-pseude-reloc-v2 --- cppunit/makefile.mk | 5 + libxmlsec/makefile.mk | 6 +- libxmlsec/xmlsec1-mingw32.patch | 456 ---------------------------------------- redland/raptor/makefile.mk | 6 +- redland/rasqal/makefile.mk | 6 +- redland/redland/makefile.mk | 6 +- 6 files changed, 17 insertions(+), 468 deletions(-) (limited to 'redland') diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index b57c341e2a23..cd96f3bf2707 100644 --- a/cppunit/makefile.mk +++ b/cppunit/makefile.mk @@ -71,6 +71,11 @@ $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE): ooo-cppunit_dll.mk ooo-DllPlugInTester.mk .ELSE +.IF "$(OS)" == "WNT" +EXTRA_CFLAGS += -mthreads +LDFLAGS += -Wl,--enable-runtime-pseudo-reloc-v2 +.ENDIF + .IF "$(USE_SYSTEM_STL)" != "YES" OOO_STLPORT_CXXFLAGS = -I$(SOLARINCDIR)/stl diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 2c41ce0dec1d..f7671555f5d5 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -86,17 +86,17 @@ CRYPTOLIB=nss .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" -xmlsec_CC=$(CC) +xmlsec_CC=$(CC) -mthreads .IF "$(MINGW_SHARED_GCCLIB)"=="YES" xmlsec_CC+=-shared-libgcc .ENDIF -xmlsec_LIBS=-lmingwthrd +xmlsec_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" xmlsec_LIBS+=-lstdc++_s .ENDIF CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --enable-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 --enable-mscrypto --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump" .IF "$(SYSTEM_MOZILLA)" != "YES" CONFIGURE_FLAGS+=--enable-pkgconfig=no diff --git a/libxmlsec/xmlsec1-mingw32.patch b/libxmlsec/xmlsec1-mingw32.patch index d2ff676facb1..78a7f8f8ab9f 100644 --- a/libxmlsec/xmlsec1-mingw32.patch +++ b/libxmlsec/xmlsec1-mingw32.patch @@ -272,332 +272,6 @@ *.$libext) if test "$pass" = conv; then deplibs="$deplib $deplibs" ---- misc/xmlsec1-1.2.12/src/mscrypto/certkeys.c 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/mscrypto/certkeys.c 2009-09-29 15:49:39.643186151 +0200 -@@ -938,7 +938,11 @@ - static void xmlSecMSCryptoKeyDataRsaDebugDump(xmlSecKeyDataPtr data, FILE* output); - static void xmlSecMSCryptoKeyDataRsaDebugXmlDump(xmlSecKeyDataPtr data, FILE* output); - -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecKeyDataKlass xmlSecMSCryptoKeyDataRsaKlass = { -+#else - static xmlSecKeyDataKlass xmlSecMSCryptoKeyDataRsaKlass = { -+#endif - sizeof(xmlSecKeyDataKlass), - xmlSecMSCryptoKeyDataSize, - -@@ -1649,7 +1653,11 @@ - static void xmlSecMSCryptoKeyDataDsaDebugXmlDump(xmlSecKeyDataPtr data, - FILE* output); - -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecKeyDataKlass xmlSecMSCryptoKeyDataDsaKlass = { -+#else - static xmlSecKeyDataKlass xmlSecMSCryptoKeyDataDsaKlass = { -+#endif - sizeof(xmlSecKeyDataKlass), - xmlSecMSCryptoKeyDataSize, - ---- misc/xmlsec1-1.2.12/src/mscrypto/ciphers.c 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/mscrypto/ciphers.c 2009-09-29 15:49:39.652528324 +0200 -@@ -802,7 +802,11 @@ - * AES CBC cipher transforms - * - ********************************************************************/ -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecTransformKlass xmlSecMSCryptoAes128CbcKlass = { -+#else - static xmlSecTransformKlass xmlSecMSCryptoAes128CbcKlass = { -+#endif - /* klass/object sizes */ - sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ - xmlSecMSCryptoBlockCipherSize, /* xmlSecSize objSize */ -@@ -841,7 +845,11 @@ - return(&xmlSecMSCryptoAes128CbcKlass); - } - -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecTransformKlass xmlSecMSCryptoAes192CbcKlass = { -+#else - static xmlSecTransformKlass xmlSecMSCryptoAes192CbcKlass = { -+#endif - /* klass/object sizes */ - sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ - xmlSecMSCryptoBlockCipherSize, /* xmlSecSize objSize */ -@@ -880,7 +888,11 @@ - return(&xmlSecMSCryptoAes192CbcKlass); - } - -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecTransformKlass xmlSecMSCryptoAes256CbcKlass = { -+#else - static xmlSecTransformKlass xmlSecMSCryptoAes256CbcKlass = { -+#endif - /* klass/object sizes */ - sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ - xmlSecMSCryptoBlockCipherSize, /* xmlSecSize objSize */ -@@ -923,7 +935,11 @@ - - - #ifndef XMLSEC_NO_DES -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecTransformKlass xmlSecMSCryptoDes3CbcKlass = { -+#else - static xmlSecTransformKlass xmlSecMSCryptoDes3CbcKlass = { -+#endif - /* klass/object sizes */ - sizeof(xmlSecTransformKlass), /* size_t klassSize */ - xmlSecMSCryptoBlockCipherSize, /* size_t objSize */ ---- misc/xmlsec1-1.2.12/src/mscrypto/digests.c 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/mscrypto/digests.c 2009-09-29 15:49:39.660554904 +0200 -@@ -329,7 +329,11 @@ - * SHA1 - * - *****************************************************************************/ -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecTransformKlass xmlSecMSCryptoSha1Klass = { -+#else - static xmlSecTransformKlass xmlSecMSCryptoSha1Klass = { -+#endif - /* klass/object sizes */ - sizeof(xmlSecTransformKlass), /* size_t klassSize */ - xmlSecMSCryptoDigestSize, /* size_t objSize */ ---- misc/xmlsec1-1.2.12/src/mscrypto/keysstore.c 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/mscrypto/keysstore.c 2009-09-29 15:49:39.667289994 +0200 -@@ -66,7 +66,11 @@ - const xmlChar* name, - xmlSecKeyInfoCtxPtr keyInfoCtx); - -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecKeyStoreKlass xmlSecMSCryptoKeysStoreKlass = { -+#else - static xmlSecKeyStoreKlass xmlSecMSCryptoKeysStoreKlass = { -+#endif - sizeof(xmlSecKeyStoreKlass), - xmlSecMSCryptoKeysStoreSize, - ---- misc/xmlsec1-1.2.12/src/mscrypto/kt_rsa.c 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/mscrypto/kt_rsa.c 2009-09-29 15:49:39.674284044 +0200 -@@ -66,7 +66,11 @@ - static int xmlSecMSCryptoRsaPkcs1Process (xmlSecTransformPtr transform, - xmlSecTransformCtxPtr transformCtx); - -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecTransformKlass xmlSecMSCryptoRsaPkcs1Klass = { -+#else - static xmlSecTransformKlass xmlSecMSCryptoRsaPkcs1Klass = { -+#endif - /* klass/object sizes */ - sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ - xmlSecMSCryptoRsaPkcs1Size, /* xmlSecSize objSize */ ---- misc/xmlsec1-1.2.12/src/mscrypto/signatures.c 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/mscrypto/signatures.c 2009-09-29 15:49:39.682580497 +0200 -@@ -524,7 +524,11 @@ - * RSA-SHA1 signature transform - * - ***************************************************************************/ -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecTransformKlass xmlSecMSCryptoRsaSha1Klass = { -+#else - static xmlSecTransformKlass xmlSecMSCryptoRsaSha1Klass = { -+#endif - /* klass/object sizes */ - sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ - xmlSecMSCryptoSignatureSize, /* xmlSecSize objSize */ -@@ -572,7 +576,11 @@ - * - ***************************************************************************/ - -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecTransformKlass xmlSecMSCryptoDsaSha1Klass = { -+#else - static xmlSecTransformKlass xmlSecMSCryptoDsaSha1Klass = { -+#endif - /* klass/object sizes */ - sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ - xmlSecMSCryptoSignatureSize, /* xmlSecSize objSize */ ---- misc/xmlsec1-1.2.12/src/mscrypto/symkeys.c 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/mscrypto/symkeys.c 2009-09-29 15:49:39.691081347 +0200 -@@ -72,7 +72,11 @@ - * processing - * - *************************************************************************/ -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecKeyDataKlass xmlSecMSCryptoKeyDataAesKlass = { -+#else - static xmlSecKeyDataKlass xmlSecMSCryptoKeyDataAesKlass = { -+#endif - sizeof(xmlSecKeyDataKlass), - xmlSecKeyDataBinarySize, - -@@ -153,7 +157,11 @@ - * processing - * - *************************************************************************/ -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecKeyDataKlass xmlSecMSCryptoKeyDataDesKlass = { -+#else - static xmlSecKeyDataKlass xmlSecMSCryptoKeyDataDesKlass = { -+#endif - sizeof(xmlSecKeyDataKlass), - xmlSecKeyDataBinarySize, - ---- misc/xmlsec1-1.2.12/src/mscrypto/x509.c 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/mscrypto/x509.c 2009-09-29 15:49:39.699931741 +0200 -@@ -243,7 +243,11 @@ - - - -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecKeyDataKlass xmlSecMSCryptoKeyDataX509Klass = { -+#else - static xmlSecKeyDataKlass xmlSecMSCryptoKeyDataX509Klass = { -+#endif - sizeof(xmlSecKeyDataKlass), - xmlSecMSCryptoX509DataSize, - -@@ -2148,7 +2152,11 @@ - xmlSecSize bufSize, - xmlSecKeyInfoCtxPtr keyInfoCtx); - -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecKeyDataKlass xmlSecMSCryptoKeyDataRawX509CertKlass = { -+#else - static xmlSecKeyDataKlass xmlSecMSCryptoKeyDataRawX509CertKlass = { -+#endif - sizeof(xmlSecKeyDataKlass), - sizeof(xmlSecKeyData), - ---- misc/xmlsec1-1.2.12/src/mscrypto/x509vfy.c 2009-09-29 15:55:33.502779834 +0200 -+++ misc/build/xmlsec1-1.2.12/src/mscrypto/x509vfy.c 2009-09-29 15:49:39.708831697 +0200 -@@ -67,7 +67,11 @@ - static int xmlSecMSCryptoX509StoreInitialize (xmlSecKeyDataStorePtr store); - static void xmlSecMSCryptoX509StoreFinalize (xmlSecKeyDataStorePtr store); - -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecKeyDataStoreKlass xmlSecMSCryptoX509StoreKlass = { -+#else - static xmlSecKeyDataStoreKlass xmlSecMSCryptoX509StoreKlass = { -+#endif - sizeof(xmlSecKeyDataStoreKlass), - xmlSecMSCryptoX509StoreSize, - ---- misc/xmlsec1-1.2.12/src/nss/ciphers.c 2009-09-29 15:55:33.488430535 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/ciphers.c 2009-09-29 15:49:39.717511164 +0200 -@@ -777,7 +777,11 @@ - * AES CBC cipher transforms - * - ********************************************************************/ -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecTransformKlass xmlSecNssAes128CbcKlass = { -+#else - static xmlSecTransformKlass xmlSecNssAes128CbcKlass = { -+#endif - /* klass/object sizes */ - sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ - xmlSecNssBlockCipherSize, /* xmlSecSize objSize */ -@@ -816,7 +820,11 @@ - return(&xmlSecNssAes128CbcKlass); - } - -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecTransformKlass xmlSecNssAes192CbcKlass = { -+#else - static xmlSecTransformKlass xmlSecNssAes192CbcKlass = { -+#endif - /* klass/object sizes */ - sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ - xmlSecNssBlockCipherSize, /* xmlSecSize objSize */ -@@ -855,7 +863,11 @@ - return(&xmlSecNssAes192CbcKlass); - } - -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecTransformKlass xmlSecNssAes256CbcKlass = { -+#else - static xmlSecTransformKlass xmlSecNssAes256CbcKlass = { -+#endif - /* klass/object sizes */ - sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ - xmlSecNssBlockCipherSize, /* xmlSecSize objSize */ -@@ -897,7 +909,11 @@ - #endif /* XMLSEC_NO_AES */ - - #ifndef XMLSEC_NO_DES -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecTransformKlass xmlSecNssDes3CbcKlass = { -+#else - static xmlSecTransformKlass xmlSecNssDes3CbcKlass = { -+#endif - /* klass/object sizes */ - sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ - xmlSecNssBlockCipherSize, /* xmlSecSize objSize */ ---- misc/xmlsec1-1.2.12/src/nss/digests.c 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/digests.c 2009-09-29 15:49:39.725650968 +0200 -@@ -285,7 +285,11 @@ - * SHA1 Digest transforms - * - *****************************************************************************/ -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecTransformKlass xmlSecNssSha1Klass = { -+#else - static xmlSecTransformKlass xmlSecNssSha1Klass = { -+#endif - /* klass/object sizes */ - sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ - xmlSecNssDigestSize, /* xmlSecSize objSize */ ---- misc/xmlsec1-1.2.12/src/nss/hmac.c 2009-09-29 15:55:33.409285968 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/hmac.c 2009-09-29 15:49:39.733673690 +0200 -@@ -502,7 +502,11 @@ - /** - * HMAC SHA1 - */ -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecTransformKlass xmlSecNssHmacSha1Klass = { -+#else - static xmlSecTransformKlass xmlSecNssHmacSha1Klass = { -+#endif - /* klass/object sizes */ - sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ - xmlSecNssHmacSize, /* xmlSecSize objSize */ -@@ -544,7 +548,11 @@ - /** - * HMAC Ripemd160 - */ -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecTransformKlass xmlSecNssHmacRipemd160Klass = { -+#else - static xmlSecTransformKlass xmlSecNssHmacRipemd160Klass = { -+#endif - /* klass/object sizes */ - sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ - xmlSecNssHmacSize, /* xmlSecSize objSize */ -@@ -586,7 +594,11 @@ - /** - * HMAC Md5 - */ -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecTransformKlass xmlSecNssHmacMd5Klass = { -+#else - static xmlSecTransformKlass xmlSecNssHmacMd5Klass = { -+#endif - /* klass/object sizes */ - sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ - xmlSecNssHmacSize, /* xmlSecSize objSize */ ---- misc/xmlsec1-1.2.12/src/nss/keysstore.c 2009-09-29 15:55:33.422265895 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/keysstore.c 2009-09-29 15:49:39.741628057 +0200 -@@ -489,7 +489,11 @@ - return NULL ; - } - -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecKeyStoreKlass xmlSecNssKeysStoreKlass = { -+#else - static xmlSecKeyStoreKlass xmlSecNssKeysStoreKlass = { -+#endif - sizeof( xmlSecKeyStoreKlass ) , - xmlSecNssKeysStoreSize , - BAD_CAST "implicit_nss_keys_store" , --- misc/xmlsec1-1.2.12/src/nss/keywrapers.c 2009-09-29 15:55:33.430875248 +0200 +++ misc/build/xmlsec1-1.2.12/src/nss/keywrapers.c 2009-09-29 15:49:39.749963247 +0200 @@ -1126,6 +1126,7 @@ @@ -632,133 +306,3 @@ #endif /* XMLSEC_NO_DES */ ---- misc/xmlsec1-1.2.12/src/nss/pkikeys.c 2009-09-29 15:55:33.440002568 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/pkikeys.c 2009-09-29 15:49:39.757984523 +0200 -@@ -491,7 +491,11 @@ - static void xmlSecNssKeyDataDsaDebugXmlDump (xmlSecKeyDataPtr data, - FILE* output); - -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecKeyDataKlass xmlSecNssKeyDataDsaKlass = { -+#else - static xmlSecKeyDataKlass xmlSecNssKeyDataDsaKlass = { -+#endif - sizeof(xmlSecKeyDataKlass), - xmlSecNssPKIKeyDataSize, - -@@ -1124,7 +1128,11 @@ - static void xmlSecNssKeyDataRsaDebugXmlDump (xmlSecKeyDataPtr data, - FILE* output); - -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecKeyDataKlass xmlSecNssKeyDataRsaKlass = { -+#else - static xmlSecKeyDataKlass xmlSecNssKeyDataRsaKlass = { -+#endif - sizeof(xmlSecKeyDataKlass), - xmlSecNssPKIKeyDataSize, - ---- misc/xmlsec1-1.2.12/src/nss/signatures.c 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/signatures.c 2009-09-29 15:49:39.765851110 +0200 -@@ -459,7 +459,11 @@ - * - ***************************************************************************/ - -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecTransformKlass xmlSecNssDsaSha1Klass = { -+#else - static xmlSecTransformKlass xmlSecNssDsaSha1Klass = { -+#endif - /* klass/object sizes */ - sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ - xmlSecNssSignatureSize, /* xmlSecSize objSize */ -@@ -506,7 +510,11 @@ - * RSA-SHA1 signature transform - * - ***************************************************************************/ -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecTransformKlass xmlSecNssRsaSha1Klass = { -+#else - static xmlSecTransformKlass xmlSecNssRsaSha1Klass = { -+#endif - /* klass/object sizes */ - sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ - xmlSecNssSignatureSize, /* xmlSecSize objSize */ ---- misc/xmlsec1-1.2.12/src/nss/symkeys.c 2009-09-29 15:55:33.448817761 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/symkeys.c 2009-09-29 15:49:39.773211741 +0200 -@@ -856,7 +856,11 @@ - * processing - * - *************************************************************************/ -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecKeyDataKlass xmlSecNssKeyDataAesKlass = { -+#else - static xmlSecKeyDataKlass xmlSecNssKeyDataAesKlass = { -+#endif - sizeof(xmlSecKeyDataKlass), - xmlSecNssSymKeyDataSize, - -@@ -937,7 +941,11 @@ - * processing - * - *************************************************************************/ -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecKeyDataKlass xmlSecNssKeyDataDesKlass = { -+#else - static xmlSecKeyDataKlass xmlSecNssKeyDataDesKlass = { -+#endif - sizeof(xmlSecKeyDataKlass), - xmlSecNssSymKeyDataSize, - -@@ -1019,7 +1027,11 @@ - * processing - * - *************************************************************************/ -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecKeyDataKlass xmlSecNssKeyDataHmacKlass = { -+#else - static xmlSecKeyDataKlass xmlSecNssKeyDataHmacKlass = { -+#endif - sizeof(xmlSecKeyDataKlass), - xmlSecNssSymKeyDataSize, - ---- misc/xmlsec1-1.2.12/src/nss/x509.c 2009-09-29 15:55:33.465839785 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/x509.c 2009-09-29 15:49:39.784408301 +0200 -@@ -235,7 +235,11 @@ - - - -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecKeyDataKlass xmlSecNssKeyDataX509Klass = { -+#else - static xmlSecKeyDataKlass xmlSecNssKeyDataX509Klass = { -+#endif - sizeof(xmlSecKeyDataKlass), - xmlSecNssX509DataSize, - -@@ -1779,7 +1783,11 @@ - xmlSecSize bufSize, - xmlSecKeyInfoCtxPtr keyInfoCtx); - -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecKeyDataKlass xmlSecNssKeyDataRawX509CertKlass = { -+#else - static xmlSecKeyDataKlass xmlSecNssKeyDataRawX509CertKlass = { -+#endif - sizeof(xmlSecKeyDataKlass), - sizeof(xmlSecKeyData), - ---- misc/xmlsec1-1.2.12/src/nss/x509vfy.c 2009-09-29 15:55:33.510337681 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/x509vfy.c 2009-09-29 15:49:39.791239957 +0200 -@@ -64,7 +64,11 @@ - static void xmlSecNssX509StoreFinalize (xmlSecKeyDataStorePtr store); - static int xmlSecNssIntegerToItem( const xmlChar* integer , SECItem *it ) ; - -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecKeyDataStoreKlass xmlSecNssX509StoreKlass = { -+#else - static xmlSecKeyDataStoreKlass xmlSecNssX509StoreKlass = { -+#endif - sizeof(xmlSecKeyDataStoreKlass), - xmlSecNssX509StoreSize, - diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 1375ae878497..62d4f704d0e4 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -68,11 +68,11 @@ BUILD_DIR=$(CONFIGURE_DIR)$/src .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" OOO_PATCH_FILES+=$(TARFILE_NAME).patch.mingw -raptor_CC=$(CC) +raptor_CC=$(CC) -mthreads .IF "$(MINGW_SHARED_GCCLIB)"=="YES" raptor_CC+=-shared-libgcc .ENDIF -raptor_LIBS=-lmingwthrd +raptor_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" raptor_LIBS+=-lstdc++_s .ENDIF @@ -80,7 +80,7 @@ raptor_LIBS+=-lstdc++_s CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure # 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" CC="$(raptor_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(raptor_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)" +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" CC="$(raptor_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(raptor_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)" BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index d48b7af39cb4..c375c62f0459 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -66,18 +66,18 @@ BUILD_ACTION=dmake BUILD_DIR=$(CONFIGURE_DIR)$/src .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" -rasqal_CC=$(CC) +rasqal_CC=$(CC) -mthreads .IF "$(MINGW_SHARED_GCCLIB)"=="YES" rasqal_CC+=-shared-libgcc .ENDIF -rasqal_LIBS=-lmingwthrd +rasqal_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" rasqal_LIBS+=-lstdc++_s .ENDIF CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(rasqal_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(rasqal_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)" +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(rasqal_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(rasqal_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)" BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index d6acd4d8ea4d..a3a51c0e7b7f 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -66,18 +66,18 @@ BUILD_ACTION=dmake BUILD_DIR=$(CONFIGURE_DIR)$/librdf .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" -redland_CC=$(CC) +redland_CC=$(CC) -mthreads .IF "$(MINGW_SHARED_GCCLIB)"=="YES" redland_CC+=-shared-libgcc .ENDIF -redland_LIBS=-lmingwthrd +redland_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" redland_LIBS+=-lstdc++_s .ENDIF CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --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" CC="$(redland_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(redland_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)" +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --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" CC="$(redland_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(redland_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)" BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) -- cgit v1.2.3 From b55fa7959fa6fde0c7cdb469850068b5fbb8ecb7 Mon Sep 17 00:00:00 2001 From: tono Date: Sat, 5 Jun 2010 07:44:18 +0900 Subject: i#111958: MinGW port enhancement: runtime-pseude-reloc-v2 : more fixes --- redland/rasqal/makefile.mk | 2 +- redland/redland/makefile.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'redland') diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index c375c62f0459..efe099c88049 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -77,7 +77,7 @@ rasqal_LIBS+=-lstdc++_s CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(rasqal_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(rasqal_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)" +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(rasqal_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(rasqal_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)" BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index a3a51c0e7b7f..3db7c0559d2e 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -77,7 +77,7 @@ redland_LIBS+=-lstdc++_s CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --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" CC="$(redland_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(redland_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)" +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --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" CC="$(redland_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(redland_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)" BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) -- cgit v1.2.3 From 05c8709f2cda853e5bd99784147f1344d2a275cc Mon Sep 17 00:00:00 2001 From: sb Date: Tue, 22 Jun 2010 09:31:32 +0200 Subject: sb126: #i110197# remove -Wl,-z,noexecstack hack --- libxmlsec/makefile.mk | 4 ---- openssl/openssllnx.patch | 11 +++++++++++ redland/raptor/makefile.mk | 2 +- redland/rasqal/makefile.mk | 2 +- redland/redland/makefile.mk | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-) (limited to 'redland') diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 1f0e5976f5e5..2c25909320b9 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -143,10 +143,6 @@ xmlsec_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' xmlsec_LDFLAGS+=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' .ENDIF # "$(OS)$(COM)"=="SOLARISC52" -.IF "$(OS)$(COM)"=="LINUXGCC" -xmlsec_LDFLAGS+=-Wl,-z,noexecstack -.ENDIF - LDFLAGS:=$(xmlsec_LDFLAGS) .EXPORT: LDFLAGS diff --git a/openssl/openssllnx.patch b/openssl/openssllnx.patch index 7f26b997bd1c..5d8f8231e45a 100644 --- a/openssl/openssllnx.patch +++ b/openssl/openssllnx.patch @@ -10,6 +10,17 @@ "nextstep", "cc:-O -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", "nextstep3.3", "cc:-O3 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", +--- misc/openssl-0.9.8l/Makefile.org 2009-03-03 23:40:29.000000000 +0100 ++++ misc/build/openssl-0.9.8l/Makefile.org 2010-06-21 11:11:03.787119295 +0200 +@@ -198,7 +198,7 @@ + + BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \ + CC='${CC}' CFLAG='${CFLAG}' \ +- AS='${CC}' ASFLAG='${CFLAG} -c' \ ++ AS='${CC}' ASFLAG='${CFLAG} -c -Wa,--noexecstack' \ + AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}' \ + SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/lib' \ + INSTALL_PREFIX='${INSTALL_PREFIX}' \ --- misc/openssl-0.9.8l/test/Makefile 2009-03-25 11:59:22.000000000 +0100 +++ misc/build/openssl-0.9.8l/test/Makefile 2009-03-30 12:51:00.210108929 +0200 @@ -408,7 +408,7 @@ diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 1375ae878497..fb110e4fff37 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -93,7 +93,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/src .ELSE # "WNT" .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" -LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec .ENDIF # "$(OS)$(COM)"=="LINUXGCC" .IF "$(OS)$(COM)"=="SOLARISC52" LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index d48b7af39cb4..4cf766804819 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -89,7 +89,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/src .ELSE # "WNT" .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" -LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec .ENDIF # "$(OS)$(COM)"=="LINUXGCC" .IF "$(OS)$(COM)"=="SOLARISC52" LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index d6acd4d8ea4d..02770cb7fbd1 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -89,7 +89,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/librdf .ELSE # "WNT" .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" -LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec .ENDIF # "$(OS)$(COM)"=="LINUXGCC" .IF "$(OS)$(COM)"=="SOLARISC52" LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -- cgit v1.2.3 From f711eee6345574feb835cc19b783a3b8b6303b18 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 28 Sep 2010 11:04:18 +0200 Subject: sw33bf10: redland/prj/d.lst: missing mkdir inc/external --- redland/prj/d.lst | 1 + 1 file changed, 1 insertion(+) (limited to 'redland') diff --git a/redland/prj/d.lst b/redland/prj/d.lst index 6363f9bbe330..f96f3a516fff 100644 --- a/redland/prj/d.lst +++ b/redland/prj/d.lst @@ -1,3 +1,4 @@ +mkdir: %_DEST%\inc%_EXT%\external ..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\*.h ..\%__SRC%\lib\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so.1 symlink: %_DEST%\lib%_EXT%\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so -- cgit v1.2.3 From af4e38f4d9174bc3f927ad119cab62e95264a5de Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 13 Oct 2010 14:50:45 +0100 Subject: update libtooling and config.guess for aix 7 --- redland/raptor/makefile.mk | 11 ++++++++-- redland/raptor/raptor-aix.patch | 21 +++++++++++++++++++ redland/rasqal/makefile.mk | 7 ++++++- redland/rasqal/rasqal-aix.patch | 44 +++++++++++++++++++++++++++++++++++++++ redland/redland/makefile.mk | 7 ++++++- redland/redland/redland-aix.patch | 21 +++++++++++++++++++ 6 files changed, 107 insertions(+), 4 deletions(-) create mode 100644 redland/raptor/raptor-aix.patch create mode 100644 redland/rasqal/rasqal-aix.patch create mode 100644 redland/redland/redland-aix.patch (limited to 'redland') diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 62d4f704d0e4..c6d8efc16a35 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -57,7 +57,7 @@ OOO_PATCH_FILES= \ $(TARFILE_NAME).patch.ooo_build \ $(TARFILE_NAME).patch.dmake \ $(TARFILE_NAME).patch.win32 \ - + raptor-aix.patch PATCH_FILES=$(OOO_PATCH_FILES) @@ -108,6 +108,10 @@ CFLAGS=-m64 CPPFLAGS+:=-I$(SOLARINCDIR)$/external LDFLAGS+:=-L$(SOLARLIBDIR) +.IF "$(OS)"=="AIX" +LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) +.ENDIF + .IF "$(SYSBASE)"!="" CPPFLAGS+:=-I$(SYSBASE)$/usr$/include .IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX" @@ -141,6 +145,9 @@ OUT2INC+=src$/raptor.h .IF "$(OS)"=="MACOSX" OUT2LIB+=src$/.libs$/libraptor.$(RAPTOR_MAJOR).dylib src$/.libs$/libraptor.dylib OUT2BIN+=src/raptor-config +.ELIF "$(OS)"=="AIX" +OUT2LIB+=src$/.libs$/libraptor.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so +OUT2BIN+=src/raptor-config .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" OUT2LIB+=src$/.libs$/*.a @@ -152,7 +159,7 @@ OUT2BIN+=src/raptor-config .ELIF "$(GUI)"=="OS2" # if we use dmake, this is done automagically .ELSE -OUT2LIB+=src$/.libs$/libraptor.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so +OUT2LIB+=src$/.libs$/libraptor.so.$(RAPTOR_MAJOR) OUT2BIN+=src/raptor-config .ENDIF diff --git a/redland/raptor/raptor-aix.patch b/redland/raptor/raptor-aix.patch new file mode 100644 index 000000000000..d6427c501d68 --- /dev/null +++ b/redland/raptor/raptor-aix.patch @@ -0,0 +1,21 @@ +--- misc/raptor-1.4.18/config.guess 2010-09-16 03:07:14.000000000 -0500 ++++ misc/build/raptor-1.4.18/config.guess 2010-09-16 03:08:00.000000000 -0500 +@@ -532,7 +532,7 @@ + echo rs6000-ibm-aix3.2 + fi + exit ;; +- *:AIX:*:[456]) ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -544,6 +544,9 @@ + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi ++ if [ "$IBM_REV" == "V7BETA" ]; then ++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} ++ fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit ;; + *:AIX:*:*) diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index efe099c88049..9066b01e1267 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -56,7 +56,8 @@ OOO_PATCH_FILES= \ $(TARFILE_NAME).patch.autotools \ $(TARFILE_NAME).patch.ooo_build \ $(TARFILE_NAME).patch.dmake \ - $(TARFILE_NAME).patch.win32 + $(TARFILE_NAME).patch.win32 \ + rasqal-aix.patch PATCH_FILES=$(OOO_PATCH_FILES) @@ -104,6 +105,10 @@ CFLAGS=-m64 CPPFLAGS+:=-I$(SOLARINCDIR)$/external LDFLAGS+:=-L$(SOLARLIBDIR) +.IF "$(OS)"=="AIX" +LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) +.ENDIF + .IF "$(SYSBASE)"!="" CPPFLAGS+:=-I$(SYSBASE)$/usr$/include .IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX" diff --git a/redland/rasqal/rasqal-aix.patch b/redland/rasqal/rasqal-aix.patch new file mode 100644 index 000000000000..86470d421f81 --- /dev/null +++ b/redland/rasqal/rasqal-aix.patch @@ -0,0 +1,44 @@ +--- misc/rasqal-0.9.16/config.guess 2010-09-16 03:13:19.000000000 -0500 ++++ misc/build/rasqal-0.9.16/config.guess 2010-09-16 03:15:05.000000000 -0500 +@@ -532,7 +532,7 @@ + echo rs6000-ibm-aix3.2 + fi + exit ;; +- *:AIX:*:[456]) ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -544,6 +544,9 @@ + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi ++ if [ "$IBM_REV" == "V7BETA" ]; then ++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} ++ fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit ;; + *:AIX:*:*) +--- misc/rasqal-0.9.16/src/rasqal_literal.c 2010-09-09 14:53:30.000000000 -0500 ++++ misc/build/rasqal-0.9.16/src/rasqal_literal.c 2010-09-09 14:54:47.000000000 -0500 +@@ -36,8 +36,20 @@ + #include + #endif + #include ++#ifdef _AIX ++# ifndef isnan ++# define isnan(x) \ ++ (sizeof (x) == sizeof (long double) ? isnan_ld (x) \ ++ : sizeof (x) == sizeof (double) ? isnan_d (x) \ ++ : isnan_f (x)) ++ static inline int isnan_f (float x) { return x != x; } ++ static inline int isnan_d (double x) { return x != x; } ++ static inline int isnan_ld (long double x) { return x != x; } ++# endif ++#else + /* for isnan() */ + #include ++#endif + + #ifdef RASQAL_REGEX_PCRE + #include diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 3db7c0559d2e..d7b8002760e2 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -56,7 +56,8 @@ OOO_PATCH_FILES= \ $(TARFILE_NAME).patch.autotools \ $(TARFILE_NAME).patch.dmake \ $(TARFILE_NAME).patch.ooo_build \ - $(TARFILE_NAME).patch.win32 + $(TARFILE_NAME).patch.win32 \ + redland-aix.patch PATCH_FILES=$(OOO_PATCH_FILES) \ @@ -104,6 +105,10 @@ CFLAGS=-m64 CPPFLAGS+:=-I$(PWD)$/$(INCCOM) -I$(SOLARINCDIR)$/external LDFLAGS+:=-L$(PWD)$/$(LB) -L$(SOLARLIBDIR) +.IF "$(OS)"=="AIX" +LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) +.ENDIF + .IF "$(SYSBASE)"!="" CPPFLAGS+:=-I$(SYSBASE)$/usr$/include .IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX" diff --git a/redland/redland/redland-aix.patch b/redland/redland/redland-aix.patch new file mode 100644 index 000000000000..20d52e4787f0 --- /dev/null +++ b/redland/redland/redland-aix.patch @@ -0,0 +1,21 @@ +--- misc/redland-1.0.8/config.guess 2010-09-16 03:21:03.000000000 -0500 ++++ misc/build/redland-1.0.8/config.guess 2010-09-16 03:22:33.000000000 -0500 +@@ -532,7 +532,7 @@ + echo rs6000-ibm-aix3.2 + fi + exit ;; +- *:AIX:*:[456]) ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -544,6 +544,9 @@ + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi ++ if [ "$IBM_REV" == "V7BETA" ]; then ++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} ++ fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit ;; + *:AIX:*:*) -- cgit v1.2.3 From c3175f55baeb539eb4e560ec40ed1ea79230f14a Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 14 Oct 2010 10:32:14 +0100 Subject: that didn't make sense --- redland/raptor/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'redland') diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index c6d8efc16a35..60e8141a3d1a 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -159,7 +159,7 @@ OUT2BIN+=src/raptor-config .ELIF "$(GUI)"=="OS2" # if we use dmake, this is done automagically .ELSE -OUT2LIB+=src$/.libs$/libraptor.so.$(RAPTOR_MAJOR) +OUT2LIB+=src$/.libs$/libraptor.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so OUT2BIN+=src/raptor-config .ENDIF -- cgit v1.2.3 From 5256f32b980016ff11e2eef15c39bd942a08d200 Mon Sep 17 00:00:00 2001 From: tono Date: Thu, 6 Jan 2011 21:56:21 +0900 Subject: mingwport33: i#116329: MinGW port enhancement: configurable libstdc++ name --- libxmlsec/makefile.mk | 2 +- lpsolve/makefile.mk | 2 +- openssl/opensslmingw.patch | 4 ++-- redland/raptor/makefile.mk | 2 +- redland/rasqal/makefile.mk | 2 +- redland/redland/makefile.mk | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'redland') diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index f721db3148a4..322f82599e17 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -95,7 +95,7 @@ xmlsec_CC+=-shared-libgcc .ENDIF xmlsec_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -xmlsec_LIBS+=-lstdc++_s +xmlsec_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk index 3e66303b038a..06cc41772dbf 100644 --- a/lpsolve/makefile.mk +++ b/lpsolve/makefile.mk @@ -57,7 +57,7 @@ BUILD_DIR=lpsolve55 lpsolve_LDFLAGS=-shared-libgcc .ENDIF .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -lpsolve_LIBS=-lstdc++_s +lpsolve_LIBS=$(MINGW_SHARED_LIBSTDCPP) .ENDIF BUILD_ACTION=lpsolve_LDFLAGS=$(lpsolve_LDFLAGS) lpsolve_LIBS=$(lpsolve_LIBS) cmd /c cgcc.bat .ELSE diff --git a/openssl/opensslmingw.patch b/openssl/opensslmingw.patch index 10b48531190d..0ea8287b53eb 100755 --- a/openssl/opensslmingw.patch +++ b/openssl/opensslmingw.patch @@ -69,9 +69,9 @@ +goto finished + +:shared_gxxlib -+gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32 -lstdc++_s ++gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32 %MINGW_SHARED_LIBSTDSPP% +if errorlevel 1 goto end -+gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto -lstdc++_s ++gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto %MINGW_SHARED_LIBSTDSPP% +if errorlevel 1 goto end +goto finished diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index b67f6ef314ce..82e92b41b2b7 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -74,7 +74,7 @@ raptor_CC+=-shared-libgcc .ENDIF raptor_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -raptor_LIBS+=-lstdc++_s +raptor_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF CONFIGURE_DIR= diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index 66fca99d1600..6f2afc423f71 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -72,7 +72,7 @@ rasqal_CC+=-shared-libgcc .ENDIF rasqal_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -rasqal_LIBS+=-lstdc++_s +rasqal_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF CONFIGURE_DIR= diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 20b1210dd2f9..ac1558475c5e 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -72,7 +72,7 @@ redland_CC+=-shared-libgcc .ENDIF redland_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -redland_LIBS+=-lstdc++_s +redland_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF CONFIGURE_DIR= -- cgit v1.2.3 From fb95d02a1d192e6975433d6c6b432db0122ad3d5 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Wed, 2 Feb 2011 11:50:17 +0100 Subject: Clean up makefiles --- external/glibc/makefile.mk | 1 - libtextcat/makefile.mk | 2 -- libxmlsec/makefile.mk | 3 --- redland/raptor/makefile.mk | 2 -- redland/rasqal/makefile.mk | 2 -- redland/redland/makefile.mk | 2 -- 6 files changed, 12 deletions(-) (limited to 'redland') diff --git a/external/glibc/makefile.mk b/external/glibc/makefile.mk index 04e2ff5b99bd..f7a3b1e4da66 100644 --- a/external/glibc/makefile.mk +++ b/external/glibc/makefile.mk @@ -47,7 +47,6 @@ ADDITIONAL_FILES += posix$/readdir_r.c PATCH_FILES=$(PRJ)$/glibc-2.1.3.patch -#CONFIGURE_DIR=glibc-2.1.3/posix CONFIGURE_ACTION= BUILD_DIR=posix diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk index 526c23c1f6f9..69e3dc022edf 100644 --- a/libtextcat/makefile.mk +++ b/libtextcat/makefile.mk @@ -58,8 +58,6 @@ ADDITIONAL_FILES= \ src$/libtextcat.map .IF "$(GUI)"=="UNX" -#CONFIGURE_DIR=$(BUILD_DIR) - #relative to CONFIGURE_DIR CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL)) diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index ffa92f583cee..c37e34deb06f 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -81,9 +81,6 @@ ADDITIONAL_FILES= \ .IF "$(GUI)"=="WNT" CRYPTOLIB=mscrypto -#CRYPTOLIB=nss -#BASEINC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla;$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla$/nspr;$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla$/nss;$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/external -#BASELIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT) .ELSE CRYPTOLIB=nss .ENDIF diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 60e8141a3d1a..12a3930dc8d0 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -135,8 +135,6 @@ CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) -#INSTALL_ACTION=$(GNUMAKE) install -#INSTALL_FLAGS+=DESTDIR=$(PWD)$/$(P_INSTALL_TARGET_DIR) .ENDIF diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index 9066b01e1267..bf425089773f 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -131,8 +131,6 @@ CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) -#INSTALL_ACTION=$(GNUMAKE) install -#INSTALL_FLAGS+=DESTDIR=$(PWD)$/$(P_INSTALL_TARGET_DIR) .ENDIF diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index d7b8002760e2..01652c1364a3 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -135,8 +135,6 @@ CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) -#INSTALL_ACTION=$(GNUMAKE) install -#INSTALL_FLAGS+=DESTDIR=$(PWD)$/$(P_INSTALL_TARGET_DIR) .ENDIF -- cgit v1.2.3 From 1c497d6f5a9f54568976c4a171975398197dbde7 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Wed, 9 Feb 2011 04:26:57 +0100 Subject: Make stlport only optional dependency of postprocess --- cppunit/prj/build.lst | 2 +- icc/prj/build.lst | 2 +- libtextcat/prj/build.lst | 2 +- libwpd/prj/build.lst | 2 +- libxmlsec/prj/build.lst | 2 +- np_sdk/prj/build.lst | 2 +- redland/prj/build.lst | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'redland') diff --git a/cppunit/prj/build.lst b/cppunit/prj/build.lst index 9bfcb57f9e89..21e2b437803b 100644 --- a/cppunit/prj/build.lst +++ b/cppunit/prj/build.lst @@ -1,2 +1,2 @@ -c5t cppunit : stlport NULL +c5t cppunit : NULL c5t cppunit nmake - all cppunit NULL diff --git a/icc/prj/build.lst b/icc/prj/build.lst index 9eace5df121a..e9bf65b311f7 100644 --- a/icc/prj/build.lst +++ b/icc/prj/build.lst @@ -1,3 +1,3 @@ -ip icc : solenv stlport external sal NULL +ip icc : solenv external sal NULL ip icc usr1 - all ip_mkout NULL ip icc nmake - all ip_icc NULL diff --git a/libtextcat/prj/build.lst b/libtextcat/prj/build.lst index da155db3d291..85163759b48e 100644 --- a/libtextcat/prj/build.lst +++ b/libtextcat/prj/build.lst @@ -1,3 +1,3 @@ -ltc libtextcat : stlport soltools solenv NULL +ltc libtextcat : soltools solenv NULL ltc libtextcat usr1 - all ltc_mkout NULL ltc libtextcat nmake - all ltc_libtextcat NULL diff --git a/libwpd/prj/build.lst b/libwpd/prj/build.lst index 7e5ae5ce9ce2..1da425b02ab3 100644 --- a/libwpd/prj/build.lst +++ b/libwpd/prj/build.lst @@ -1,3 +1,3 @@ -lw libwpd : soltools stlport NULL +lw libwpd : soltools NULL lw libwpd usr1 - all lw_mkout NULL lw libwpd nmake - all lw_libwpd NULL diff --git a/libxmlsec/prj/build.lst b/libxmlsec/prj/build.lst index 75939b33892b..a52eb09268f8 100644 --- a/libxmlsec/prj/build.lst +++ b/libxmlsec/prj/build.lst @@ -1,3 +1,3 @@ -ls libxmlsec : stlport soltools LIBXML2:libxml2 MOZ:moz NULL +ls libxmlsec : soltools LIBXML2:libxml2 MOZ:moz NULL ls libxmlsec usr1 - all ls_mkout NULL ls libxmlsec nmake - all ls_xmlsec1 NULL diff --git a/np_sdk/prj/build.lst b/np_sdk/prj/build.lst index 7aa9a6d88a1e..9617879118b5 100644 --- a/np_sdk/prj/build.lst +++ b/np_sdk/prj/build.lst @@ -1,3 +1,3 @@ -np np_sdk : soltools stlport NULL +np np_sdk : soltools NULL np np_sdk usr1 - all np_sdk NULL np np_sdk\mozsrc nmake - all np_mozsrc NULL diff --git a/redland/prj/build.lst b/redland/prj/build.lst index f6d0562d4bb4..c23ad527fc71 100644 --- a/redland/prj/build.lst +++ b/redland/prj/build.lst @@ -1,4 +1,4 @@ -rld redland : stlport soltools LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL +rld redland : soltools LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL rld redland usr1 - all rld_mkout NULL rld redland\raptor nmake - all rld_raptor NULL rld redland\rasqal nmake - all rld_rasqal rld_raptor NULL -- cgit v1.2.3