[Libreoffice-commits] .: config_host.mk.in configure.ac Module_tail_build.mk redland/ExternalPackage_raptor.mk redland/ExternalPackage_rasqal.mk redland/ExternalPackage_redland.mk redland/ExternalProject_raptor.mk redland/ExternalProject_rasqal.mk redland/ExternalProject_redland.mk redland/Library_raptor.mk redland/Library_rasqal.mk redland/Library_rdf.mk redland/Makefile redland/Module_redland.mk redland/prj redland/raptor redland/rasqal redland/redland redland/redlandversion.mk redland/UnpackedTarball_raptor.mk redland/UnpackedTarball_rasqal.mk redland/UnpackedTarball_redland.mk RepositoryExternal.mk RepositoryFixes.mk Repository.mk RepositoryModule_ooo.mk scp2/InstallModule_ooo.mk tail_build/prj unoxml/Library_unordf.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sun Dec 30 06:51:09 PST 2012
Module_tail_build.mk | 1
Repository.mk | 2
RepositoryExternal.mk | 30 +
RepositoryFixes.mk | 1
RepositoryModule_ooo.mk | 1
config_host.mk.in | 3
configure.ac | 6
redland/ExternalPackage_raptor.mk | 29 +
redland/ExternalPackage_rasqal.mk | 29 +
redland/ExternalPackage_redland.mk | 27 +
redland/ExternalProject_raptor.mk | 57 +++
redland/ExternalProject_rasqal.mk | 55 +++
redland/ExternalProject_redland.mk | 58 +++
redland/Library_raptor.mk | 83 +++++
redland/Library_rasqal.mk | 59 +++
redland/Library_rdf.mk | 76 +++++
redland/Makefile | 7
redland/Module_redland.mk | 36 ++
redland/UnpackedTarball_raptor.mk | 31 ++
redland/UnpackedTarball_rasqal.mk | 25 +
redland/UnpackedTarball_redland.mk | 25 +
redland/prj/build.lst | 5
redland/prj/d.lst | 22 -
redland/raptor/makefile.mk | 238 ---------------
redland/raptor/raptor-1.4.18.aix.patch | 21 +
redland/raptor/raptor-1.4.18.autotools.patch | 66 ++++
redland/raptor/raptor-1.4.18.bundled-soname.patch | 11
redland/raptor/raptor-1.4.18.cross.patch | 35 ++
redland/raptor/raptor-1.4.18.entities.patch | 22 -
redland/raptor/raptor-1.4.18.fixes.patch | 42 ++
redland/raptor/raptor-1.4.18.legal.patch | 18 +
redland/raptor/raptor-1.4.18.libxml.patch | 2
redland/raptor/raptor-1.4.18.libxslt.patch | 2
redland/raptor/raptor-1.4.18.mingw.patch | 41 ++
redland/raptor/raptor-1.4.18.no-soname.patch | 11
redland/raptor/raptor-1.4.18.ooo_build.patch | 43 ++
redland/raptor/raptor-1.4.18.patch.autotools | 66 ----
redland/raptor/raptor-1.4.18.patch.bundled-soname | 11
redland/raptor/raptor-1.4.18.patch.cross | 35 --
redland/raptor/raptor-1.4.18.patch.dmake | 124 --------
redland/raptor/raptor-1.4.18.patch.fixes | 42 --
redland/raptor/raptor-1.4.18.patch.legal | 18 -
redland/raptor/raptor-1.4.18.patch.mingw | 41 --
redland/raptor/raptor-1.4.18.patch.no-soname | 11
redland/raptor/raptor-1.4.18.patch.ooo_build | 43 --
redland/raptor/raptor-1.4.18.patch.rindex | 62 ----
redland/raptor/raptor-1.4.18.patch.win32 | 78 -----
redland/raptor/raptor-1.4.18.rindex.patch | 62 ++++
redland/raptor/raptor-1.4.18.win32.patch | 78 +++++
redland/raptor/raptor-aix.patch | 21 -
redland/raptor/raptor.def | 293 +++++++++++++++++++
redland/raptor/raptor2.map | 294 -------------------
redland/rasqal/makefile.mk | 191 ------------
redland/rasqal/rasqal-0.9.16.aix.patch | 44 ++
redland/rasqal/rasqal-0.9.16.autotools.patch | 58 +++
redland/rasqal/rasqal-0.9.16.bundled-soname.patch | 11
redland/rasqal/rasqal-0.9.16.legal.patch | 18 +
redland/rasqal/rasqal-0.9.16.mingw.patch | 11
redland/rasqal/rasqal-0.9.16.no-soname.patch | 11
redland/rasqal/rasqal-0.9.16.ooo_build.patch | 56 +++
redland/rasqal/rasqal-0.9.16.patch.autotools | 58 ---
redland/rasqal/rasqal-0.9.16.patch.bundled-soname | 11
redland/rasqal/rasqal-0.9.16.patch.dmake | 98 ------
redland/rasqal/rasqal-0.9.16.patch.legal | 18 -
redland/rasqal/rasqal-0.9.16.patch.mingw | 11
redland/rasqal/rasqal-0.9.16.patch.no-soname | 11
redland/rasqal/rasqal-0.9.16.patch.ooo_build | 56 ---
redland/rasqal/rasqal-0.9.16.patch.win32 | 43 --
redland/rasqal/rasqal-0.9.16.win32.patch | 43 ++
redland/rasqal/rasqal-aix.patch | 44 --
redland/rasqal/rasqal.def | 186 ++++++++++++
redland/rasqal/rasqal2.map | 194 ------------
redland/redland/makefile.mk | 191 ------------
redland/redland/rdf.def | 314 ++++++++++++++++++++
redland/redland/redland-1.0.8.aix.patch | 21 +
redland/redland/redland-1.0.8.autotools.patch | 78 +++++
redland/redland/redland-1.0.8.bundled-soname.patch | 11
redland/redland/redland-1.0.8.legal.patch | 54 +++
redland/redland/redland-1.0.8.mingw.patch | 11
redland/redland/redland-1.0.8.no-soname.patch | 11
redland/redland/redland-1.0.8.ooo_build.patch | 22 +
redland/redland/redland-1.0.8.patch.autotools | 78 -----
redland/redland/redland-1.0.8.patch.bundled-soname | 11
redland/redland/redland-1.0.8.patch.dmake | 115 -------
redland/redland/redland-1.0.8.patch.legal | 54 ---
redland/redland/redland-1.0.8.patch.mingw | 11
redland/redland/redland-1.0.8.patch.no-soname | 11
redland/redland/redland-1.0.8.patch.ooo_build | 22 -
redland/redland/redland-1.0.8.patch.win32 | 154 ----------
redland/redland/redland-1.0.8.win32.patch | 154 ++++++++++
redland/redland/redland-aix.patch | 21 -
redland/redland/redland2.map | 316 ---------------------
redland/redlandversion.mk | 32 --
scp2/InstallModule_ooo.mk | 1
tail_build/prj/build.lst | 2
unoxml/Library_unordf.mk | 11
96 files changed, 2499 insertions(+), 2879 deletions(-)
New commits:
commit 18bd1e7364428cdb359762158c685223a82de99d
Author: Peter Foley <pefoley2 at verizon.net>
Date: Thu Dec 27 18:04:21 2012 -0500
convert redland to gbuild and add to tail_build
Change-Id: I953fb203b1a24920f236c2f6e1fd9d82edda1f0f
Reviewed-on: https://gerrit.libreoffice.org/1493
Reviewed-by: Peter Foley <pefoley2 at verizon.net>
Tested-by: Peter Foley <pefoley2 at verizon.net>
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 5aab2bd..4dcc779 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -137,6 +137,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
$(call gb_Helper_optional,PYUNO,pyuno) \
$(call gb_Helper_optional,QADEVOOO,qadevOOo) \
readlicense_oo \
+ $(call gb_Helper_optional,REDLAND,redland) \
registry \
remotebridges \
reportbuilder \
diff --git a/Repository.mk b/Repository.mk
index 751d226..b712bd2 100755
--- a/Repository.mk
+++ b/Repository.mk
@@ -512,6 +512,8 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
ooofilt_x64 \
propertyhdl \
propertyhdl_x64 \
+ raptor \
+ rasqal \
shlxthdl \
shlxthdl_x64 \
so_activex \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 4ae6745..abfc4a3 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -723,8 +723,38 @@ $(call gb_LinkTarget_add_libs,$(1),$(REDLAND_LIBS))
endef
+gb_LinkTarget__use_redland_headers:=
+
+gb_LinkTarget__use_raptor_headers:=
+
+gb_LinkTarget__use_rasqal_headers:=
+
else # !SYSTEM_REDLAND
+define gb_LinkTarget__use_redland_headers
+$(call gb_LinkTarget_set_include,$(1),\
+ -I$(call gb_UnpackedTarball_get_dir,redland)/librdf \
+ $$(INCLUDE) \
+)
+
+endef
+
+define gb_LinkTarget__use_raptor_headers
+$(call gb_LinkTarget_set_include,$(1),\
+ -I$(call gb_UnpackedTarball_get_dir,raptor)/src \
+ $$(INCLUDE) \
+)
+
+endef
+
+define gb_LinkTarget__use_rasqal_headers
+$(call gb_LinkTarget_set_include,$(1),\
+ -I$(call gb_UnpackedTarball_get_dir,rasqal)/src \
+ $$(INCLUDE) \
+)
+
+endef
+
ifneq ($(OS),ANDROID)
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index ecc6369..9ff6656 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -66,6 +66,7 @@ gb_Library_DLLFILENAMES := $(patsubst log_uno:log_uno%,log_uno:log_uno_uno%,$(gb
gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst unsafe_uno:unsafe_uno%,unsafe_uno:unsafe_uno_uno%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst rdf:rdf%,rdf:librdf%,$(gb_Library_DLLFILENAMES))
# libpyuno_wrapper.dll => pyuno.pyd
gb_Library_DLLFILENAMES := $(patsubst pyuno:pyuno.dll,pyuno:pyuno.pyd,$(gb_Library_DLLFILENAMES))
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index c09aa34..a96096e 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -147,6 +147,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
$(call gb_Helper_optional,PYUNO,pyuno) \
$(call gb_Helper_optional,QADEVOOO,qadevOOo) \
readlicense_oo \
+ $(call gb_Helper_optional,REDLAND,redland) \
registry \
remotebridges \
reportbuilder \
diff --git a/config_host.mk.in b/config_host.mk.in
index 1cd888e..08f6a85 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -467,6 +467,9 @@ export PYTHON_VERSION=@PYTHON_VERSION@
export RANLIB=@RANLIB@
export REDLAND_CFLAGS=$(gb_SPACE)@REDLAND_CFLAGS@
export REDLAND_LIBS=$(gb_SPACE)@REDLAND_LIBS@
+export RAPTOR_MAJOR=@RAPTOR_MAJOR@
+export RASQAL_MAJOR=@RASQAL_MAJOR@
+export REDLAND_MAJOR=@REDLAND_MAJOR@
export RHINO_JAR=@RHINO_JAR@
export RPM=@RPM@
export RTL_OS=@RTL_OS@
diff --git a/configure.ac b/configure.ac
index 3171e90..c74e1a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8724,11 +8724,17 @@ if test "$with_system_redland" = "yes"; then
else
AC_MSG_RESULT([internal])
BUILD_TYPE="$BUILD_TYPE REDLAND"
+ RAPTOR_MAJOR="1"
+ RASQAL_MAJOR="1"
+ REDLAND_MAJOR="0"
SYSTEM_REDLAND=NO
fi
AC_SUBST(SYSTEM_REDLAND)
AC_SUBST(REDLAND_CFLAGS)
AC_SUBST(REDLAND_LIBS)
+AC_SUBST(RAPTOR_MAJOR)
+AC_SUBST(RASQAL_MAJOR)
+AC_SUBST(REDLAND_MAJOR)
AC_SUBST([MINGW_RAPTOR_DLL])
AC_SUBST([MINGW_RASQAL_DLL])
AC_SUBST([MINGW_REDLAND_DLL])
diff --git a/redland/ExternalPackage_raptor.mk b/redland/ExternalPackage_raptor.mk
new file mode 100644
index 0000000..414b9c8
--- /dev/null
+++ b/redland/ExternalPackage_raptor.mk
@@ -0,0 +1,29 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,raptor,raptor))
+
+$(eval $(call gb_ExternalPackage_use_external_project,raptor,raptor))
+
+$(eval $(call gb_ExternalPackage_add_file,raptor,bin/raptor-config,src/raptor-config))
+
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor-lo.1.dylib,src/.libs/libraptor-lo.1.dylib))
+$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor.dylib,src/.libs/libraptor-lo.1.dylib))
+else ifneq ($(filter IOS ANDRIOD,$(OS)),)
+$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor.a,src/.libs/libraptor.a))
+else ifneq ($(filter WNT,$(OS)),)
+$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor.a,src/.libs/libraptor.a))
+$(eval $(call gb_ExternalPackage_add_file,raptor,bin/libraptor.dll,src/.libs/libraptor.dll))
+else
+$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor-lo.so.1,src/.libs/libraptor-lo.so.1.1.0))
+$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor.so,src/.libs/libraptor-lo.so.1.1.0))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/redland/ExternalPackage_rasqal.mk b/redland/ExternalPackage_rasqal.mk
new file mode 100644
index 0000000..88c48c6
--- /dev/null
+++ b/redland/ExternalPackage_rasqal.mk
@@ -0,0 +1,29 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,rasqal,rasqal))
+
+$(eval $(call gb_ExternalPackage_use_external_project,rasqal,rasqal))
+
+$(eval $(call gb_ExternalPackage_add_file,rasqal,bin/rasqal-config,src/rasqal-config))
+
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal-lo.1.dylib,src/.libs/librasqal-lo.1.dylib))
+$(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.dylib,src/.libs/librasqal-lo.1.dylib))
+else ifneq ($(filter IOS ANDRIOD,$(OS)),)
+$(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.a,src/.libs/librasqal.a))
+else ifneq ($(filter WNT,$(OS)),)
+$(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.a,src/.libs/librasqal.a))
+$(eval $(call gb_ExternalPackage_add_file,rasqal,bin/librasqal.dll,src/.libs/librasqal.dll))
+else
+$(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal-lo.so.1,src/.libs/librasqal-lo.so.1.0.0))
+$(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.so,src/.libs/librasqal-lo.so.1.0.0))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/redland/ExternalPackage_redland.mk b/redland/ExternalPackage_redland.mk
new file mode 100644
index 0000000..10eaecd
--- /dev/null
+++ b/redland/ExternalPackage_redland.mk
@@ -0,0 +1,27 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,redland,redland))
+
+$(eval $(call gb_ExternalPackage_use_external_project,redland,redland))
+
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf-lo.0.dylib,librdf/.libs/librdf-lo.0.dylib))
+$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.dylib,librdf/.libs/librdf-lo.0.dylib))
+else ifneq ($(filter IOS ANDRIOD,$(OS)),)
+$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.a,librdf/.libs/librdf.a))
+else ifneq ($(filter WNT,$(OS)),)
+$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.a,librdf/.libs/librdf.a))
+$(eval $(call gb_ExternalPackage_add_file,redland,bin/librdf.dll,librdf/.libs/librdf.dll))
+else
+$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf-lo.so.0,librdf/.libs/librdf-lo.so.0.0.0))
+$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.so,librdf/.libs/librdf-lo.so.0.0.0))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/redland/ExternalProject_raptor.mk b/redland/ExternalProject_raptor.mk
new file mode 100644
index 0000000..69650c7
--- /dev/null
+++ b/redland/ExternalProject_raptor.mk
@@ -0,0 +1,57 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalProject_ExternalProject,raptor))
+
+$(eval $(call gb_ExternalProject_use_unpacked,raptor,raptor))
+
+$(eval $(call gb_ExternalProject_register_targets,raptor,\
+ build \
+))
+
+ifeq ($(OS),WNT)
+$(call gb_ExternalProject_get_state_target,raptor,build):
+ cd $(EXTERNAL_WORKDIR) \
+ && CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
+ LDFLAGS="-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 -Wl,--export-all-symbols $(subst ;, -L,$(ILIB))" \
+ LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML2)),$(LIBXML_LIBS),-lxml2)" \
+ XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \
+ OBJDUMP="$(HOST_PLATFORM)-objdump" \
+ ./configure --disable-static --enable-shared --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=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --target=$(HOST_PLATFORM) \
+ lt_cv_cc_dll_switch="-shared" \
+ && $(GNUMAKE) \
+ && touch $@
+else
+$(call gb_ExternalProject_get_state_target,raptor,build):
+ cd $(EXTERNAL_WORKDIR) \
+ && $(if $(filter IOS,$(OS)),LIBS="-liconv") \
+ CFLAGS="$(if $(debug),-g,-O) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) \
+ $(if $(filter GCCLINUXPOWERPC64,$(COM)$(OS)$(CPUNAME)),-mminimal-toc)" \
+ LDFLAGS="-L$(OUTDIR)/lib \
+ $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl$(COMMA)-noinhibit-exec) \
+ $(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \
+ CPPFLAGS="-I$(OUTDIR)/inc/external $(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \
+ ./configure --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-threestone --with-regex-library=posix --with-decimal=none \
+ --with-www=xml \
+ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO)\
+ $(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
+ $(if $(filter NO,$(SYSTEM_LIBXSLT)),--with-xslt-config=$(OUTDIR)/bin/xslt-config) \
+ $(if $(filter NO,$(SYSTEM_LIBXML2)),--with-xml2-config=$(OUTDIR)/bin/xml2-config) \
+ && $(GNUMAKE) \
+ && touch $@
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/redland/ExternalProject_rasqal.mk b/redland/ExternalProject_rasqal.mk
new file mode 100644
index 0000000..99ee3b8
--- /dev/null
+++ b/redland/ExternalProject_rasqal.mk
@@ -0,0 +1,55 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalProject_ExternalProject,rasqal))
+
+$(eval $(call gb_ExternalProject_use_unpacked,rasqal,rasqal))
+
+$(eval $(call gb_ExternalProject_use_package,rasqal,raptor))
+
+$(eval $(call gb_ExternalProject_register_targets,rasqal,\
+ build \
+))
+
+ifeq ($(OS),WNT)
+$(call gb_ExternalProject_get_state_target,rasqal,build):
+ cd $(EXTERNAL_WORKDIR) \
+ && CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
+ LDFLAGS="-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 -Wl,--export-all-symbols $(subst ;, -L,$(ILIB))" \
+ LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML2)),$(LIBXML_LIBS),-lxml2)" \
+ XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \
+ OBJDUMP="$(HOST_PLATFORM)-objdump" \
+ ./configure --disable-static --enable-shared --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=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
+ lt_cv_cc_dll_switch="-shared" \
+ && $(GNUMAKE) \
+ && touch $@
+else
+$(call gb_ExternalProject_get_state_target,rasqal,build):
+ cd $(EXTERNAL_WORKDIR) \
+ && CFLAGS="$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \
+ LDFLAGS="-L$(OUTDIR)/lib \
+ $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl$(COMMA)-noinhibit-exec) \
+ $(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl)) \
+ $(if $(filter MACOSXNO,$(OS)$(SYSTEM_LIBXML)),-Wl$(COMMA)-dylib_file$(COMMA)@loader_path/../ure-link/lib/libxml2.2.dylib:$(OUTDIR)/lib/libxml2.2.dylib)" \
+ CPPFLAGS="-I$(OUTDIR)/inc/external $(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \
+ ./configure --disable-gtk-doc --with-threads --with-openssl-digests \
+ --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql \
+ --without-postgresql --without-threestone --with-regex-library=posix \
+ --with-decimal=none --with-www=xml \
+ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO)\
+ $(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
+ && $(GNUMAKE) \
+ && touch $@
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk
new file mode 100644
index 0000000..62cf9d5
--- /dev/null
+++ b/redland/ExternalProject_redland.mk
@@ -0,0 +1,58 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalProject_ExternalProject,redland))
+
+$(eval $(call gb_ExternalProject_use_unpacked,redland,redland))
+
+$(eval $(call gb_ExternalProject_register_targets,redland,\
+ build \
+))
+
+ifeq ($(OS),WNT)
+$(call gb_ExternalProject_get_state_target,redland,build):
+ cd $(EXTERNAL_WORKDIR) \
+ && CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
+ LDFLAGS="-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 -Wl,--export-all-symbols $(subst ;, -L,$(ILIB))" \
+ LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML2)),$(LIBXML_LIBS),-lxml2)" \
+ XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \
+ OBJDUMP="$(HOST_PLATFORM)-objdump" \
+ ./configure --disable-static --disable-gtk-doc --with-openssl-digests \
+ --with-xml-parser=libxml --with-raptor=system --with-rasqal=system \
+ --without-bdb --without-sqlite --without-mysql --without-postgresql \
+ --without-threestore --with-regex-library=posix --with-decimal=none \
+ --with-www=xml --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
+ lt_cv_cc_dll_switch="-shared" \
+ && cd librdf \
+ && $(GNUMAKE) \
+ && touch $@
+else
+$(call gb_ExternalProject_get_state_target,redland,build):
+ cd $(EXTERNAL_WORKDIR) \
+ && CFLAGS="$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \
+ LDFLAGS="-L$(OUTDIR)/lib \
+ $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl$(COMMA)-noinhibit-exec) \
+ $(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl)) \
+ $(if $(filter MACOSX,$(OS)), -Wl$(COMMA)-dylib_file$(COMMA)@loader_path/libraptor-lo.1.dylib:$(OUTDIR)/lib/libraptor-lo.1.dylib \
+ $(if $(filter NO,$(SYSTEM_LIBXML)),-Wl$(COMMA)-dylib_file$(COMMA)@loader_path/../ure-link/lib/libxml2.2.dylib:$(OUTDIR)/lib/libxml2.2.dylib))" \
+ CPPFLAGS="-I$(OUTDIR)/inc/external $(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \
+ ./configure --disable-gtk-doc --with-openssl-digests \
+ --with-xml-parser=libxml --with-raptor=system --with-rasqal=system \
+ --without-bdb --without-sqlite --without-mysql --without-postgresql \
+ --without-threestone --with-regex-library=posix --with-decimal=none \
+ --with-www=xml \
+ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
+ $(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
+ $(if $(filter-out ANDROID,$(OS)),--with-threads) \
+ && cd librdf \
+ && $(GNUMAKE) \
+ && touch $@
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/redland/Library_raptor.mk b/redland/Library_raptor.mk
new file mode 100644
index 0000000..cdb4cd4
--- /dev/null
+++ b/redland/Library_raptor.mk
@@ -0,0 +1,83 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Library_Library,raptor))
+
+$(eval $(call gb_Library_use_unpacked,raptor,raptor))
+
+$(eval $(call gb_Library_use_externals,raptor,\
+ libxml2 \
+ libxslt \
+))
+
+$(eval $(call gb_Library_set_warnings_not_errors,raptor))
+
+#$(eval $(call gb_Library_add_ldflags,raptor,\
+ /DEF:$(SRCDIR)/redland/raptor/raptor.def \
+))
+
+$(eval $(call gb_Library_add_defs,raptor,\
+ -DRAPTOR_INTERNAL \
+ -DWIN32 \
+ -DNDEBUG \
+ -D_WINDOWS \
+ -D_USRDLL \
+ -DWIN32_EXPORTS \
+))
+
+$(eval $(call gb_Library_add_generated_cobjects,raptor,\
+ UnpackedTarball/raptor/src/n3_lexer \
+ UnpackedTarball/raptor/src/n3_parser \
+ UnpackedTarball/raptor/src/ntriples_parse \
+ UnpackedTarball/raptor/src/parsedate \
+ UnpackedTarball/raptor/src/raptor_feature \
+ UnpackedTarball/raptor/src/raptor_general \
+ UnpackedTarball/raptor/src/raptor_guess \
+ UnpackedTarball/raptor/src/raptor_identifier \
+ UnpackedTarball/raptor/src/raptor_iostream \
+ UnpackedTarball/raptor/src/raptor_libxml \
+ UnpackedTarball/raptor/src/raptor_locator \
+ UnpackedTarball/raptor/src/raptor_namespace \
+ UnpackedTarball/raptor/src/raptor_nfc \
+ UnpackedTarball/raptor/src/raptor_nfc_data \
+ UnpackedTarball/raptor/src/raptor_parse \
+ UnpackedTarball/raptor/src/raptor_qname \
+ UnpackedTarball/raptor/src/raptor_rdfxml \
+ UnpackedTarball/raptor/src/raptor_rfc2396 \
+ UnpackedTarball/raptor/src/raptor_rss \
+ UnpackedTarball/raptor/src/raptor_rss_common \
+ UnpackedTarball/raptor/src/raptor_sax2 \
+ UnpackedTarball/raptor/src/raptor_sequence \
+ UnpackedTarball/raptor/src/raptor_serialize \
+ UnpackedTarball/raptor/src/raptor_serialize_ntriples \
+ UnpackedTarball/raptor/src/raptor_serialize_rdfxml \
+ UnpackedTarball/raptor/src/raptor_serialize_rdfxmla \
+ UnpackedTarball/raptor/src/raptor_serialize_simple \
+ UnpackedTarball/raptor/src/raptor_set \
+ UnpackedTarball/raptor/src/raptor_stringbuffer \
+ UnpackedTarball/raptor/src/raptor_uri \
+ UnpackedTarball/raptor/src/raptor_utf8 \
+ UnpackedTarball/raptor/src/raptor_win32 \
+ UnpackedTarball/raptor/src/raptor_www \
+ UnpackedTarball/raptor/src/raptor_www_libxml \
+ UnpackedTarball/raptor/src/raptor_xml \
+ UnpackedTarball/raptor/src/raptor_xml_writer \
+ UnpackedTarball/raptor/src/raptor_xsd \
+ UnpackedTarball/raptor/src/strcasecmp \
+ UnpackedTarball/raptor/src/turtle_common \
+ UnpackedTarball/raptor/src/turtle_lexer \
+ UnpackedTarball/raptor/src/turtle_parser \
+ UnpackedTarball/raptor/src/raptor_abbrev \
+ UnpackedTarball/raptor/src/raptor_avltree \
+ UnpackedTarball/raptor/src/raptor_statement \
+ UnpackedTarball/raptor/src/raptor_turtle_writer \
+))
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/redland/Library_rasqal.mk b/redland/Library_rasqal.mk
new file mode 100644
index 0000000..7b20dcc
--- /dev/null
+++ b/redland/Library_rasqal.mk
@@ -0,0 +1,59 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Library_Library,rasqal))
+
+$(eval $(call gb_Library_use_unpacked,rasqal,rasqal))
+
+$(eval $(call gb_Library_set_warnings_not_errors,rasqal))
+
+$(eval $(call gb_Library_use_external,rasqal,raptor_headers))
+
+$(eval $(call gb_Library_use_libraries,rasqal,raptor))
+
+#$(eval $(call gb_Library_add_ldflags,rasqal,\
+ /DEF:$(SRCDIR)/redland/rasqal/rasqal.def \
+))
+
+$(eval $(call gb_Library_add_defs,rasqal,\
+ -DRASQAL_INTERNAL \
+ -DWIN32 \
+ -DNDEBUG \
+ -D_WINDOWS \
+ -D_USRDLL \
+ -DWIN32_EXPORTS \
+ -D_MT \
+))
+
+$(eval $(call gb_Library_add_generated_cobjects,rasqal,\
+ UnpackedTarball/rasqal/src/rasqal_datetime \
+ UnpackedTarball/rasqal/src/rasqal_decimal \
+ UnpackedTarball/rasqal/src/rasqal_engine \
+ UnpackedTarball/rasqal/src/rasqal_expr \
+ UnpackedTarball/rasqal/src/rasqal_feature \
+ UnpackedTarball/rasqal/src/rasqal_general \
+ UnpackedTarball/rasqal/src/rasqal_graph_pattern \
+ UnpackedTarball/rasqal/src/rasqal_literal \
+ UnpackedTarball/rasqal/src/rasqal_map \
+ UnpackedTarball/rasqal/src/rasqal_query_results \
+ UnpackedTarball/rasqal/src/rasqal_query \
+ UnpackedTarball/rasqal/src/rasqal_raptor \
+ UnpackedTarball/rasqal/src/rasqal_result_formats \
+ UnpackedTarball/rasqal/src/rasqal_rowsource \
+ UnpackedTarball/rasqal/src/rasqal_sparql_xml \
+ UnpackedTarball/rasqal/src/rasqal_xsd_datatypes \
+ UnpackedTarball/rasqal/src/rdql_lexer \
+ UnpackedTarball/rasqal/src/rdql_parser \
+ UnpackedTarball/rasqal/src/sparql_lexer \
+ UnpackedTarball/rasqal/src/sparql_parser \
+ UnpackedTarball/rasqal/src/strcasecmp \
+))
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/redland/Library_rdf.mk b/redland/Library_rdf.mk
new file mode 100644
index 0000000..cb20604
--- /dev/null
+++ b/redland/Library_rdf.mk
@@ -0,0 +1,76 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Library_Library,rdf))
+
+$(eval $(call gb_Library_use_unpacked,rdf,redland))
+
+$(eval $(call gb_Library_set_warnings_not_errors,rdf))
+
+$(eval $(call gb_Library_use_libraries,rdf,\
+ raptor \
+ rasqal \
+))
+
+$(eval $(call gb_Library_use_externals,rdf,\
+ openssl \
+ raptor_headers \
+ rasqal_headers \
+))
+
+#$(eval $(call gb_Library_add_ldflags,rdf,\
+ /DEF:$(SRCDIR)/redland/redland/rdf.def \
+))
+
+$(eval $(call gb_Library_add_defs,rdf,\
+ -DLIBRDF_INTERNAL \
+ -DWIN32 \
+ -DNDEBUG \
+ -D_WINDOWS \
+ -D_USRDLL \
+ -DWIN32_EXPORTS \
+))
+
+$(eval $(call gb_Library_add_generated_cobjects,rdf,\
+ UnpackedTarball/redland/librdf/rdf_concepts \
+ UnpackedTarball/redland/librdf/rdf_digest \
+ UnpackedTarball/redland/librdf/rdf_digest_md5 \
+ UnpackedTarball/redland/librdf/rdf_digest_openssl \
+ UnpackedTarball/redland/librdf/rdf_digest_sha1 \
+ UnpackedTarball/redland/librdf/rdf_files \
+ UnpackedTarball/redland/librdf/rdf_hash \
+ UnpackedTarball/redland/librdf/rdf_hash_cursor \
+ UnpackedTarball/redland/librdf/rdf_hash_memory \
+ UnpackedTarball/redland/librdf/rdf_heuristics \
+ UnpackedTarball/redland/librdf/rdf_init \
+ UnpackedTarball/redland/librdf/rdf_iterator \
+ UnpackedTarball/redland/librdf/rdf_list \
+ UnpackedTarball/redland/librdf/rdf_log \
+ UnpackedTarball/redland/librdf/rdf_model \
+ UnpackedTarball/redland/librdf/rdf_model_storage \
+ UnpackedTarball/redland/librdf/rdf_node \
+ UnpackedTarball/redland/librdf/rdf_parser \
+ UnpackedTarball/redland/librdf/rdf_parser_raptor \
+ UnpackedTarball/redland/librdf/rdf_query \
+ UnpackedTarball/redland/librdf/rdf_query_rasqal \
+ UnpackedTarball/redland/librdf/rdf_query_results \
+ UnpackedTarball/redland/librdf/rdf_query_triples \
+ UnpackedTarball/redland/librdf/rdf_serializer \
+ UnpackedTarball/redland/librdf/rdf_serializer_raptor \
+ UnpackedTarball/redland/librdf/rdf_statement \
+ UnpackedTarball/redland/librdf/rdf_storage \
+ UnpackedTarball/redland/librdf/rdf_storage_file \
+ UnpackedTarball/redland/librdf/rdf_storage_list \
+ UnpackedTarball/redland/librdf/rdf_storage_hashes \
+ UnpackedTarball/redland/librdf/rdf_stream \
+ UnpackedTarball/redland/librdf/rdf_uri \
+ UnpackedTarball/redland/librdf/rdf_utf8 \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/redland/Makefile b/redland/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/redland/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/redland/Module_redland.mk b/redland/Module_redland.mk
new file mode 100644
index 0000000..5b1f2a1
--- /dev/null
+++ b/redland/Module_redland.mk
@@ -0,0 +1,36 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Module_Module,redland))
+
+ifeq ($(SYSTEM_REDLAND),NO)
+$(eval $(call gb_Module_add_targets,redland,\
+ UnpackedTarball_raptor \
+ UnpackedTarball_rasqal \
+ UnpackedTarball_redland \
+))
+ifeq ($(COM),MSC)
+$(eval $(call gb_Module_add_targets,redland,\
+ Library_raptor \
+ Library_rasqal \
+ Library_rdf \
+))
+else
+$(eval $(call gb_Module_add_targets,redland,\
+ ExternalPackage_raptor \
+ ExternalPackage_rasqal \
+ ExternalPackage_redland \
+ ExternalProject_raptor \
+ ExternalProject_rasqal \
+ ExternalProject_redland \
+))
+endif
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/redland/UnpackedTarball_raptor.mk b/redland/UnpackedTarball_raptor.mk
new file mode 100644
index 0000000..ad445fb
--- /dev/null
+++ b/redland/UnpackedTarball_raptor.mk
@@ -0,0 +1,31 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,raptor))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,raptor,$(RAPTOR_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_add_patches,raptor,\
+ redland/raptor/raptor-1.4.18.legal.patch \
+ redland/raptor/raptor-1.4.18.autotools.patch \
+ redland/raptor/raptor-1.4.18.ooo_build.patch \
+ redland/raptor/raptor-1.4.18.win32.patch \
+ redland/raptor/raptor-1.4.18.fixes.patch \
+ redland/raptor/raptor-1.4.18.rindex.patch \
+ redland/raptor/raptor-1.4.18.aix.patch \
+ redland/raptor/raptor-1.4.18.entities.patch \
+ $(if $(filter-out WNT,$(OS)),redland/raptor/raptor-1.4.18.bundled-soname.patch) \
+ $(if $(filter YES,$(CROSS_COMPILING)),redland/raptor/raptor-1.4.18.cross.patch) \
+ $(if $(filter YES,$(SYSTEM_LIBXML)),redland/raptor/raptor-1.4.18.libxml.patch) \
+ $(if $(filter YES,$(SYSTEM_LIBXSLT)),redland/raptor/raptor-1.4.18.libxslt.patch) \
+ $(if $(filter ANDROID,$(OS)),redland/raptor/raptor-1.4.18.no-soname.patch) \
+ $(if $(filter WNTGCC,$(OS)$(COM)),redland/raptor/raptor-1.4.18.mingw.patch) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/redland/UnpackedTarball_rasqal.mk b/redland/UnpackedTarball_rasqal.mk
new file mode 100644
index 0000000..1b8e3e4
--- /dev/null
+++ b/redland/UnpackedTarball_rasqal.mk
@@ -0,0 +1,25 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,rasqal))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,rasqal,$(RASQAL_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_add_patches,rasqal,\
+ redland/rasqal/rasqal-0.9.16.legal.patch \
+ redland/rasqal/rasqal-0.9.16.autotools.patch \
+ redland/rasqal/rasqal-0.9.16.ooo_build.patch \
+ redland/rasqal/rasqal-0.9.16.win32.patch \
+ redland/rasqal/rasqal-0.9.16.aix.patch \
+ $(if $(filter-out WNT,$(OS)),redland/rasqal/rasqal-0.9.16.bundled-soname.patch) \
+ $(if $(filter ANDROID,$(OS)),redland/rasqal/rasqal-0.9.16.no-soname.patch) \
+ $(if $(filter WNTGCC,$(OS)$(COM)),redland/rasqal/rasqal-0.9.16.mingw.patch) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/redland/UnpackedTarball_redland.mk b/redland/UnpackedTarball_redland.mk
new file mode 100644
index 0000000..a7cfa66
--- /dev/null
+++ b/redland/UnpackedTarball_redland.mk
@@ -0,0 +1,25 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,redland))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,redland,$(REDLAND_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_add_patches,redland,\
+ redland/redland/redland-1.0.8.legal.patch \
+ redland/redland/redland-1.0.8.autotools.patch \
+ redland/redland/redland-1.0.8.ooo_build.patch \
+ redland/redland/redland-1.0.8.win32.patch \
+ redland/redland/redland-1.0.8.aix.patch \
+ $(if $(filter-out WNT,$(OS)),redland/redland/redland-1.0.8.bundled-soname.patch) \
+ $(if $(filter ANDROID,$(OS)),redland/redland/redland-1.0.8.no-soname.patch) \
+ $(if $(filter WNTGCC,$(OS)$(COM)),redland/redland/redland-1.0.8.mingw.patch) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/redland/prj/build.lst b/redland/prj/build.lst
index c23ad52..9d4e244 100644
--- a/redland/prj/build.lst
+++ b/redland/prj/build.lst
@@ -1,5 +1,2 @@
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
-rld redland\redland nmake - all rld_redland rld_raptor rld_rasqal NULL
+rld redland\prj nmake - all rld_redland NULL
diff --git a/redland/prj/d.lst b/redland/prj/d.lst
index 39b7afa..e69de29 100644
--- a/redland/prj/d.lst
+++ b/redland/prj/d.lst
@@ -1,22 +0,0 @@
-mkdir: %_DEST%\inc\external
-..\%__SRC%\inc\*.h %_DEST%\inc\external\*.h
-..\%__SRC%\lib\libraptor-lo.so.1 %_DEST%\lib\libraptor-lo.so.1
-symlink: %_DEST%\lib\libraptor-lo.so.1 %_DEST%\lib\libraptor.so
-..\%__SRC%\lib\libraptor.so %_DEST%\lib\libraptor.so
-..\%__SRC%\lib\libraptor-lo.1.dylib %_DEST%\lib\libraptor-lo.1.dylib
-symlink: %_DEST%\lib\libraptor-lo.1.dylib %_DEST%\lib\libraptor.dylib
-..\%__SRC%\lib\librasqal-lo.so.1 %_DEST%\lib\librasqal-lo.so.1
-symlink: %_DEST%\lib\librasqal-lo.so.1 %_DEST%\lib\librasqal.so
-..\%__SRC%\lib\librasqal.so %_DEST%\lib\librasqal.so
-..\%__SRC%\lib\librasqal-lo.1.dylib %_DEST%\lib\librasqal-lo.1.dylib
-symlink: %_DEST%\lib\librasqal-lo.1.dylib %_DEST%\lib\librasqal.dylib
-..\%__SRC%\lib\librdf-lo.so.0 %_DEST%\lib\librdf-lo.so.0
-symlink: %_DEST%\lib\librdf-lo.so.0 %_DEST%\lib\librdf.so
-..\%__SRC%\lib\librdf.so %_DEST%\lib\librdf.so
-..\%__SRC%\lib\librdf-lo.0.dylib %_DEST%\lib\librdf-lo.0.dylib
-symlink: %_DEST%\lib\librdf-lo.0.dylib %_DEST%\lib\librdf.dylib
-..\%__SRC%\lib\*.lib %_DEST%\lib
-..\%__SRC%\lib\*.a %_DEST%\lib
-..\%__SRC%\lib\lib*.dll.a %_DEST%\lib\lib*.a
-..\%__SRC%\bin\*.dll %_DEST%\bin
-..\redlandversion.mk %_DEST%\inc\redlandversion.mk
diff --git a/redland/prj/dmake b/redland/prj/dmake
deleted file mode 100644
index e69de29..0000000
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
deleted file mode 100644
index 3617fea..0000000
--- a/redland/raptor/makefile.mk
+++ /dev/null
@@ -1,238 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=redland
-TARGET=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 --------------------------------------------------------
-
-.INCLUDE : ../redlandversion.mk
-
-RAPTORVERSION=$(RAPTOR_MAJOR).4.18
-
-TARFILE_NAME=raptor-$(RAPTORVERSION)
-TARFILE_MD5=284e768eeda0e2898b0d5bf7e26a016e
-
-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 \
- $(TARFILE_NAME).patch.fixes \
- $(TARFILE_NAME).patch.rindex \
- raptor-aix.patch \
- $(TARFILE_NAME).entities.patch
-
-.IF "$(OS)" != "WNT"
-OOO_PATCH_FILES+= \
- $(TARFILE_NAME).patch.bundled-soname
-.ENDIF
-
-.IF "$(CROSS_COMPILING)"=="YES"
-OOO_PATCH_FILES += \
- $(TARFILE_NAME).patch.cross
-.ENDIF
-
-PATCH_FILES=$(OOO_PATCH_FILES)
-
-.IF "$(SYSTEM_LIBXML)" == "YES"
-PATCH_FILES+=raptor-1.4.18.libxml.patch
-.ENDIF
-.IF "$(SYSTEM_LIBXSLT)" == "YES"
-PATCH_FILES+=raptor-1.4.18.libxslt.patch
-.ENDIF
-
-.IF "$(OS)"=="ANDROID"
-PATCH_FILES+=$(TARFILE_NAME).patch.no-soname
-.ENDIF
-
-.IF "$(OS)"=="WNT"
-.IF "$(COM)"=="GCC"
-OOO_PATCH_FILES+=$(TARFILE_NAME).patch.mingw
-raptor_CC=$(CC) -mthreads
-.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
-raptor_CC+=-shared-libgcc
-.ENDIF
-raptor_LIBS=
-
-raptor_LDFLAGS=-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols
-.IF "$(ILIB)"!=""
-raptor_LDFLAGS+= -L$(ILIB:s/;/ -L/)
-.ENDIF
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure
-# do not enable grddl parser (#i93768#)
-CONFIGURE_FLAGS=--disable-static --enable-shared --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=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --target=$(HOST_PLATFORM) lt_cv_cc_dll_switch="-shared" CC="$(raptor_CC)" CPPFLAGS="$(INCLUDE)" LDFLAGS="$(raptor_LDFLAGS)" LIBS="$(raptor_LIBS)" OBJDUMP="$(WRAPCMD) $(HOST_PLATFORM)-objdump" LIBXML2LIB="$(LIBXML2LIB)" 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
-BUILD_DIR=$(CONFIGURE_DIR)$/src
-
-.ENDIF
-
-.ELSE # "WNT"
-
-.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-LDFLAGS:=-Wl,-z,origin -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'
-.ENDIF # "$(OS)$(COM)"=="SOLARISC52"
-
-.IF "$(debug)" != ""
-CFLAGS:=-g
-.ELSE
-CFLAGS:=-O
-.ENDIF
-
-.IF "$(DISABLE_DYNLOADING)"=="TRUE"
-CFLAGS+=-fvisibility=hidden
-.ENDIF
-
-.IF "$(COM)"=="C52" && "$(CPU)"=="U"
-CFLAGS+=-m64
-.ENDIF
-#ppc64 ld crashing at link time, throwing a minimal-toc at it to
-#perturb is sufficiently to not crash
-.IF "$(COM)$(OS)$(CPUNAME)" == "GCCLINUXPOWERPC64"
-CFLAGS+=-mminimal-toc
-.ENDIF
-.EXPORT: CFLAGS
-
-# NB: SOLARDIR before SYSBASE, because linux SYSBASE contains obsolete libcrypto
-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"
-LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl
-.ENDIF
-.ENDIF # "$(SYSBASE)"!=""
-
-CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS)
-LDFLAGS+:=$(EXTRA_LINKFLAGS)
-XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
-
-.EXPORT: CPPFLAGS
-.EXPORT: LDFLAGS
-.EXPORT: LIBXML2LIB
-.EXPORT: XSLTLIB
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure
-
-.IF "$(OS)"=="IOS"
-CONFIGURE_ACTION+=LIBS=-liconv
-.ENDIF
-
-.IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
-CONFIGURE_FLAGS=--disable-shared
-.ELSE
-CONFIGURE_FLAGS=--disable-static
-.ENDIF
-
-# do not enable grddl parser (#i93768#)
-CONFIGURE_FLAGS+= --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
-
-.IF "$(SYSTEM_LIBXML)" != "YES"
-CONFIGURE_FLAGS+=--with-xml2-config=$(SOLARVER)/$(INPATH)/bin/xml2-config
-.ENDIF
-
-.IF "$(SYSTEM_LIBXSLT)" != "YES"
-CONFIGURE_FLAGS+=--with-xslt-config=$(SOLARVER)/$(INPATH)/bin/xslt-config
-.ENDIF
-
-.IF "$(OS)" == "MACOSX"
-CONFIGURE_FLAGS += \
- --prefix=/@.__________________________________________________$(EXTRPATH)
-.END
-
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ENDIF
-BUILD_ACTION=$(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)
-.ENDIF
-
-
-OUT2INC+=src$/raptor.h
-
-.IF "$(OS)"=="MACOSX"
-OUT2LIB+=src$/.libs$/libraptor-lo.$(RAPTOR_MAJOR).dylib src$/.libs$/libraptor.dylib
-OUT2BIN+=src/raptor-config
-.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
-OUT2LIB+=src$/.libs$/libraptor.a
-OUT2BIN+=src/raptor-config
-.ELIF "$(OS)"=="AIX"
-OUT2LIB+=src$/.libs$/libraptor-lo.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so
-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-lo.so.$(RAPTOR_MAJOR) 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/raptor/raptor-1.4.18.aix.patch b/redland/raptor/raptor-1.4.18.aix.patch
new file mode 100644
index 0000000..df42640
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.aix.patch
@@ -0,0 +1,21 @@
+--- misc/raptor-1.4.18/config.guess 2010-09-16 03:07:14.000000000 -0500
++++ misc/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/raptor/raptor-1.4.18.autotools.patch b/redland/raptor/raptor-1.4.18.autotools.patch
new file mode 100644
index 0000000..8a29070
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.autotools.patch
@@ -0,0 +1,66 @@
+--- misc/raptor-1.4.18/config.sub 2008-04-03 05:15:09.000000000 +0200
++++ misc/raptor-1.4.18/config.sub 2011-09-27 10:01:06.000000000 +0200
+@@ -120,7 +120,7 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
+ os=-$maybe_os
+@@ -1250,7 +1250,7 @@
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++ | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+--- 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.bundled-soname.patch b/redland/raptor/raptor-1.4.18.bundled-soname.patch
new file mode 100644
index 0000000..407e060
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.bundled-soname.patch
@@ -0,0 +1,11 @@
+--- misc/raptor-1.4.18/src/Makefile.in
++++ misc/raptor-1.4.18/src/Makefile.in
+@@ -404,7 +404,7 @@
+ $(am__append_20) $(am__append_21) $(am__append_22) \
+ $(am__append_23) $(am__append_24) $(am__append_25) \
+ $(am__append_26)
+-libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@
++libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -release lo
+ libraptor_la_LIBADD = @LTLIBOBJS@
+ EXTRA_DIST = \
+ raptor-config.in \
diff --git a/redland/raptor/raptor-1.4.18.cross.patch b/redland/raptor/raptor-1.4.18.cross.patch
new file mode 100644
index 0000000..82df182
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.cross.patch
@@ -0,0 +1,35 @@
+--- misc/raptor-1.4.18/configure
++++ misc/raptor-1.4.18/configure
+@@ -22643,11 +22643,13 @@
+ { echo "$as_me:$LINENO: checking vsnprintf has C99 compatible return value" >&5
+ echo $ECHO_N "checking vsnprintf has C99 compatible return value... $ECHO_C" >&6; }
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_C99_VSNPRINTF 1
++_ACEOF
++
++ { echo "$as_me:$LINENO: result: guessing yes" >&5
++echo "${ECHO_T}guessing yes" >&6; }
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -23367,11 +23369,8 @@
+ { echo "$as_me:$LINENO: checking for expat support of UTF-8 BOM" >&5
+ echo $ECHO_N "checking for expat support of UTF-8 BOM... $ECHO_C" >&6; }
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
++ { echo "$as_me:$LINENO: result: guessing yes" >&5
++echo "${ECHO_T}guessing yes" >&6; }
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
diff --git a/redland/raptor/raptor-1.4.18.entities.patch b/redland/raptor/raptor-1.4.18.entities.patch
index d311879..84ffdb5 100644
--- a/redland/raptor/raptor-1.4.18.entities.patch
+++ b/redland/raptor/raptor-1.4.18.entities.patch
@@ -1,5 +1,5 @@
--- misc/raptor-1.4.18/src/raptor.h.old 2008-06-20 07:47:38.000000000 +0200
-+++ misc/build/raptor-1.4.18/src/raptor.h 2012-02-15 16:54:21.000000000 +0100
++++ misc/raptor-1.4.18/src/raptor.h 2012-02-15 16:54:21.000000000 +0100
@@ -376,6 +376,7 @@ typedef struct {
* @RAPTOR_FEATURE_JSON_EXTRA_DATA: JSON serializer extra top-level data
* @RAPTOR_FEATURE_RSS_TRIPLES: Atom/RSS serializer writes extra RDF triples it finds (none, rdf-xml, atom-triples)
@@ -19,7 +19,7 @@
--- misc/raptor-1.4.18/src/raptor_feature.c.old 2008-06-05 08:54:16.000000000 +0200
-+++ misc/build/raptor-1.4.18/src/raptor_feature.c 2012-02-15 16:55:09.000000000 +0100
++++ misc/raptor-1.4.18/src/raptor_feature.c 2012-02-15 16:55:09.000000000 +0100
@@ -89,7 +89,8 @@ static const struct
{ RAPTOR_FEATURE_JSON_CALLBACK , 6, "jsonCallback", "JSON serializer callback" },
{ RAPTOR_FEATURE_JSON_EXTRA_DATA , 6, "jsonExtraData", "JSON serializer extra data" },
@@ -31,7 +31,7 @@
--- misc/raptor-1.4.18/src/raptor_internal.h.old 2008-06-03 07:04:09.000000000 +0200
-+++ misc/build/raptor-1.4.18/src/raptor_internal.h 2012-02-15 16:52:08.000000000 +0100
++++ misc/raptor-1.4.18/src/raptor_internal.h 2012-02-15 16:52:08.000000000 +0100
@@ -983,6 +983,14 @@ struct raptor_sax2_s {
/* base URI for resolving relative URIs or xml:base URIs */
@@ -48,7 +48,7 @@
int raptor_sax2_init(void);
--- misc/raptor-1.4.18/src/raptor_libxml.c.old 2008-06-14 05:35:27.000000000 +0200
-+++ misc/build/raptor-1.4.18/src/raptor_libxml.c 2012-02-15 16:52:08.000000000 +0100
++++ misc/raptor-1.4.18/src/raptor_libxml.c 2012-02-15 16:52:08.000000000 +0100
@@ -142,18 +142,126 @@ raptor_libxml_hasExternalSubset (void* u
static xmlParserInputPtr
@@ -184,7 +184,7 @@
static xmlEntityPtr
raptor_libxml_getParameterEntity(void* user_data, const xmlChar *name) {
--- misc/raptor-1.4.18/src/raptor_parse.c.old 2008-06-15 09:18:50.000000000 +0200
-+++ misc/build/raptor-1.4.18/src/raptor_parse.c 2012-02-15 16:52:08.000000000 +0100
++++ misc/raptor-1.4.18/src/raptor_parse.c 2012-02-15 16:52:08.000000000 +0100
@@ -1294,6 +1294,7 @@ raptor_set_feature(raptor_parser *parser
case RAPTOR_FEATURE_MICROFORMATS:
case RAPTOR_FEATURE_HTML_LINK:
@@ -202,7 +202,7 @@
break;
--- misc/raptor-1.4.18/src/raptor_rdfxml.c.old 2008-06-15 10:12:06.000000000 +0200
-+++ misc/build/raptor-1.4.18/src/raptor_rdfxml.c 2012-02-15 16:52:08.000000000 +0100
++++ misc/raptor-1.4.18/src/raptor_rdfxml.c 2012-02-15 16:52:08.000000000 +0100
@@ -1124,6 +1124,9 @@ raptor_rdfxml_parse_start(raptor_parser*
raptor_sax2_set_feature(rdf_xml_parser->sax2,
RAPTOR_FEATURE_NO_NET,
@@ -214,7 +214,7 @@
raptor_sax2_parse_start(rdf_xml_parser->sax2, uri);
--- misc/raptor-1.4.18/src/raptor_rss.c.old 2008-05-21 22:25:57.000000000 +0200
-+++ misc/build/raptor-1.4.18/src/raptor_rss.c 2012-02-15 16:52:08.000000000 +0100
++++ misc/raptor-1.4.18/src/raptor_rss.c 2012-02-15 16:52:08.000000000 +0100
@@ -251,6 +251,9 @@ raptor_rss_parse_start(raptor_parser *rd
raptor_sax2_set_feature(rss_parser->sax2,
RAPTOR_FEATURE_NO_NET,
@@ -226,7 +226,7 @@
raptor_sax2_parse_start(rss_parser->sax2, uri);
--- misc/raptor-1.4.18/src/raptor_sax2.c.old 2008-06-15 10:12:20.000000000 +0200
-+++ misc/build/raptor-1.4.18/src/raptor_sax2.c 2012-02-15 16:52:08.000000000 +0100
++++ misc/raptor-1.4.18/src/raptor_sax2.c 2012-02-15 16:52:08.000000000 +0100
@@ -96,6 +96,8 @@ raptor_new_sax2(void* user_data, raptor_
sax2->user_data=user_data;
@@ -323,7 +323,7 @@
return sax2->external_entity_ref_handler(sax2->user_data,
context, base, systemId, publicId);
--- misc/raptor-1.4.18/src/raptor_serialize.c.old 2008-06-20 02:55:31.000000000 +0200
-+++ misc/build/raptor-1.4.18/src/raptor_serialize.c 2012-02-15 16:52:08.000000000 +0100
++++ misc/raptor-1.4.18/src/raptor_serialize.c 2012-02-15 16:52:08.000000000 +0100
@@ -859,6 +859,7 @@ raptor_serializer_set_feature(raptor_ser
/* Shared */
@@ -357,7 +357,7 @@
/* XML writer features */
case RAPTOR_FEATURE_WRITER_AUTO_INDENT:
--- misc/raptor-1.4.18/src/raptor_turtle_writer.c.old 2008-06-20 07:47:48.000000000 +0200
-+++ misc/build/raptor-1.4.18/src/raptor_turtle_writer.c 2012-02-15 16:52:08.000000000 +0100
++++ misc/raptor-1.4.18/src/raptor_turtle_writer.c 2012-02-15 16:52:08.000000000 +0100
@@ -723,6 +723,7 @@ raptor_turtle_writer_set_feature(raptor_
/* Shared */
@@ -375,7 +375,7 @@
/* XML writer features */
case RAPTOR_FEATURE_RELATIVE_URIS:
--- misc/raptor-1.4.18/src/raptor_xml_writer.c.old 2008-06-03 07:05:56.000000000 +0200
-+++ misc/build/raptor-1.4.18/src/raptor_xml_writer.c 2012-02-15 16:52:08.000000000 +0100
++++ misc/raptor-1.4.18/src/raptor_xml_writer.c 2012-02-15 16:52:08.000000000 +0100
@@ -906,6 +906,7 @@ raptor_xml_writer_set_feature(raptor_xml
/* Shared */
diff --git a/redland/raptor/raptor-1.4.18.fixes.patch b/redland/raptor/raptor-1.4.18.fixes.patch
new file mode 100644
index 0000000..67a8f5a
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.fixes.patch
@@ -0,0 +1,42 @@
+--- misc/raptor-1.4.18/src/raptor_abbrev.c 2008-06-15 09:34:06.000000000 +0200
++++ misc/raptor-1.4.18/src/raptor_abbrev.c 2011-05-18 18:58:35.440435467 +0200
+@@ -124,6 +124,7 @@
+ case RAPTOR_IDENTIFIER_TYPE_UNKNOWN:
+ default:
+ RAPTOR_FREE(raptor_abbrev_node, node);
++ node = NULL;
+ }
+
+ }
+--- misc/raptor-1.4.18/src/raptor_parse.c 2008-06-15 09:18:50.000000000 +0200
++++ misc/build/raptor-1.4.18/src/raptor_parse.c 2011-05-18 18:58:32.143702301 +0200
+@@ -1870,7 +1870,7 @@
+ ((char*)buffer)[FIRSTN]=c;
+ }
+
+- if(i > MAX_PARSERS) {
++ if(i >= MAX_PARSERS) {
+ raptor_finish();
+ RAPTOR_FATAL2("Number of parsers greater than static buffer size %d\n",
+ MAX_PARSERS);
+--- misc/raptor-1.4.18/src/raptor_rdfxml.c 2008-06-15 10:12:06.000000000 +0200
++++ misc/build/raptor-1.4.18/src/raptor_rdfxml.c 2011-05-18 18:58:30.031671100 +0200
+@@ -404,7 +404,7 @@
+ static const char *
+ raptor_rdfxml_element_content_type_as_string(raptor_rdfxml_element_content_type type)
+ {
+- if(type > RAPTOR_RDFXML_ELEMENT_CONTENT_TYPE_LAST)
++ if(type >= RAPTOR_RDFXML_ELEMENT_CONTENT_TYPE_LAST)
+ return "INVALID";
+ return rdf_content_type_info[type].name;
+ }
+--- misc/raptor-1.4.18/src/raptor_serialize_dot.c 2008-06-15 09:34:29.000000000 +0200
++++ misc/build/raptor-1.4.18/src/raptor_serialize_dot.c 2011-05-18 18:58:33.986920218 +0200
+@@ -266,6 +266,7 @@
+ case RAPTOR_IDENTIFIER_TYPE_UNKNOWN:
+ default:
+ RAPTOR_FREE(raptor_dot_serializer_node, node);
++ node = NULL;
+ }
+
+ }
diff --git a/redland/raptor/raptor-1.4.18.legal.patch b/redland/raptor/raptor-1.4.18.legal.patch
new file mode 100644
index 0000000..b3ad82c
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.legal.patch
@@ -0,0 +1,18 @@
+--- misc/raptor-1.4.18/LICENSE.txt Sun Mar 30 06:52:22 2008
++++ misc/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.libxml.patch b/redland/raptor/raptor-1.4.18.libxml.patch
index 59e5ceb..04994fa 100644
--- a/redland/raptor/raptor-1.4.18.libxml.patch
+++ b/redland/raptor/raptor-1.4.18.libxml.patch
@@ -1,5 +1,5 @@
--- misc/raptor-1.4.18/configure 2011-06-05 11:55:18.000000000 -0400
-+++ misc/build/raptor-1.4.18/configure 2011-06-05 11:55:46.000000000 -0400
++++ misc/raptor-1.4.18/configure 2011-06-05 11:55:46.000000000 -0400
@@ -23470,73 +23470,6 @@
LIBS="$oLIBS"
diff --git a/redland/raptor/raptor-1.4.18.libxslt.patch b/redland/raptor/raptor-1.4.18.libxslt.patch
index 6dfffd9..49d2a26 100644
--- a/redland/raptor/raptor-1.4.18.libxslt.patch
+++ b/redland/raptor/raptor-1.4.18.libxslt.patch
@@ -1,5 +1,5 @@
--- misc/raptor-1.4.18/configure 2011-06-05 11:57:41.000000000 -0400
-+++ misc/build/raptor-1.4.18/configure 2011-06-05 11:58:11.000000000 -0400
++++ misc/raptor-1.4.18/configure 2011-06-05 11:58:11.000000000 -0400
@@ -23470,73 +23470,6 @@
LIBS="$oLIBS"
diff --git a/redland/raptor/raptor-1.4.18.mingw.patch b/redland/raptor/raptor-1.4.18.mingw.patch
new file mode 100644
index 0000000..4027c30
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.mingw.patch
@@ -0,0 +1,41 @@
+--- misc/raptor-1.4.18/configure 2008-06-15 17:25:55.000000000 +0900
++++ misc/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
+--- misc/raptor-1.4.18/src/Makefile.in
++++ misc/build/raptor-1.4.18/src/Makefile.in
+@@ -404,7 +404,7 @@
+ $(am__append_20) $(am__append_21) $(am__append_22) \
+ $(am__append_23) $(am__append_24) $(am__append_25) \
+ $(am__append_26)
+-libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@
++libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -no-undefined
+ libraptor_la_LIBADD = @LTLIBOBJS@
+ EXTRA_DIST = \
+ raptor-config.in \
diff --git a/redland/raptor/raptor-1.4.18.no-soname.patch b/redland/raptor/raptor-1.4.18.no-soname.patch
new file mode 100644
index 0000000..fddb5d4
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.no-soname.patch
@@ -0,0 +1,11 @@
+--- misc/raptor-1.4.18/configure
++++ misc/raptor-1.4.18/configure
+@@ -7848,7 +7848,7 @@
+ *)
+ tmp_sharedflag='-shared' ;;
+ esac
+- archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags -o $lib'
+
+ if test $supports_anon_versioning = yes; then
+ archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
diff --git a/redland/raptor/raptor-1.4.18.ooo_build.patch b/redland/raptor/raptor-1.4.18.ooo_build.patch
new file mode 100644
index 0000000..2f25232
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.ooo_build.patch
@@ -0,0 +1,43 @@
+--- misc/raptor-1.4.18/src/raptor-config.in Sat Jan 6 05:02:00 2007
++++ misc/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 at includedir@"
+-else
+- includes=
+-fi
++#prefix=@prefix@
++#exec_prefix=@exec_prefix@
++#
++#if test "@includedir@" != /usr/include ; then
++# includes="-I at includedir@"
++#else
++# includes=
++#fi
+
+
+ usage()
+@@ -130,7 +139,8 @@
+ done
+ fi
+ if test "$echo_libs" = "yes"; then
+- echo -L at libdir@ -lraptor
++# echo -L at 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.autotools b/redland/raptor/raptor-1.4.18.patch.autotools
deleted file mode 100644
index b91444e..0000000
--- a/redland/raptor/raptor-1.4.18.patch.autotools
+++ /dev/null
@@ -1,66 +0,0 @@
---- misc/raptor-1.4.18/config.sub 2008-04-03 05:15:09.000000000 +0200
-+++ misc/build/raptor-1.4.18/config.sub 2011-09-27 10:01:06.000000000 +0200
-@@ -120,7 +120,7 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
-- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
-@@ -1250,7 +1250,7 @@
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+ | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
---- 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.bundled-soname b/redland/raptor/raptor-1.4.18.patch.bundled-soname
deleted file mode 100644
index cd8e87e..0000000
--- a/redland/raptor/raptor-1.4.18.patch.bundled-soname
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/raptor-1.4.18/src/Makefile.in
-+++ misc/build/raptor-1.4.18/src/Makefile.in
-@@ -404,7 +404,7 @@
- $(am__append_20) $(am__append_21) $(am__append_22) \
- $(am__append_23) $(am__append_24) $(am__append_25) \
- $(am__append_26)
--libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@
-+libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -release lo
- libraptor_la_LIBADD = @LTLIBOBJS@
- EXTRA_DIST = \
- raptor-config.in \
diff --git a/redland/raptor/raptor-1.4.18.patch.cross b/redland/raptor/raptor-1.4.18.patch.cross
deleted file mode 100644
index bf4c432..0000000
--- a/redland/raptor/raptor-1.4.18.patch.cross
+++ /dev/null
@@ -1,35 +0,0 @@
---- misc/raptor-1.4.18/configure
-+++ misc/build/raptor-1.4.18/configure
-@@ -22643,11 +22643,13 @@
- { echo "$as_me:$LINENO: checking vsnprintf has C99 compatible return value" >&5
- echo $ECHO_N "checking vsnprintf has C99 compatible return value... $ECHO_C" >&6; }
- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_C99_VSNPRINTF 1
-+_ACEOF
-+
-+ { echo "$as_me:$LINENO: result: guessing yes" >&5
-+echo "${ECHO_T}guessing yes" >&6; }
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -23367,11 +23369,8 @@
- { echo "$as_me:$LINENO: checking for expat support of UTF-8 BOM" >&5
- echo $ECHO_N "checking for expat support of UTF-8 BOM... $ECHO_C" >&6; }
- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ { echo "$as_me:$LINENO: result: guessing yes" >&5
-+echo "${ECHO_T}guessing yes" >&6; }
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
diff --git a/redland/raptor/raptor-1.4.18.patch.dmake b/redland/raptor/raptor-1.4.18.patch.dmake
deleted file mode 100644
index b017275..0000000
--- a/redland/raptor/raptor-1.4.18.patch.dmake
+++ /dev/null
@@ -1,124 +0,0 @@
---- 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,119 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2000, 2010 Oracle and/or its affiliates.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org. If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=redland
-+TARGET=raptor
-+LIBTARGET=NO
-+UWINAPIDLL=
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-+UWINAPILIB=
-+
-+
-+# --- 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.fixes b/redland/raptor/raptor-1.4.18.patch.fixes
deleted file mode 100644
index 7b7c959..0000000
--- a/redland/raptor/raptor-1.4.18.patch.fixes
+++ /dev/null
@@ -1,42 +0,0 @@
---- misc/raptor-1.4.18/src/raptor_abbrev.c 2008-06-15 09:34:06.000000000 +0200
-+++ misc/build/raptor-1.4.18/src/raptor_abbrev.c 2011-05-18 18:58:35.440435467 +0200
-@@ -124,6 +124,7 @@
- case RAPTOR_IDENTIFIER_TYPE_UNKNOWN:
- default:
- RAPTOR_FREE(raptor_abbrev_node, node);
-+ node = NULL;
- }
-
- }
---- misc/raptor-1.4.18/src/raptor_parse.c 2008-06-15 09:18:50.000000000 +0200
-+++ misc/build/raptor-1.4.18/src/raptor_parse.c 2011-05-18 18:58:32.143702301 +0200
-@@ -1870,7 +1870,7 @@
- ((char*)buffer)[FIRSTN]=c;
- }
-
-- if(i > MAX_PARSERS) {
-+ if(i >= MAX_PARSERS) {
- raptor_finish();
- RAPTOR_FATAL2("Number of parsers greater than static buffer size %d\n",
- MAX_PARSERS);
---- misc/raptor-1.4.18/src/raptor_rdfxml.c 2008-06-15 10:12:06.000000000 +0200
-+++ misc/build/raptor-1.4.18/src/raptor_rdfxml.c 2011-05-18 18:58:30.031671100 +0200
-@@ -404,7 +404,7 @@
- static const char *
- raptor_rdfxml_element_content_type_as_string(raptor_rdfxml_element_content_type type)
- {
-- if(type > RAPTOR_RDFXML_ELEMENT_CONTENT_TYPE_LAST)
-+ if(type >= RAPTOR_RDFXML_ELEMENT_CONTENT_TYPE_LAST)
- return "INVALID";
- return rdf_content_type_info[type].name;
- }
---- misc/raptor-1.4.18/src/raptor_serialize_dot.c 2008-06-15 09:34:29.000000000 +0200
-+++ misc/build/raptor-1.4.18/src/raptor_serialize_dot.c 2011-05-18 18:58:33.986920218 +0200
-@@ -266,6 +266,7 @@
- case RAPTOR_IDENTIFIER_TYPE_UNKNOWN:
- default:
- RAPTOR_FREE(raptor_dot_serializer_node, node);
-+ node = NULL;
- }
-
- }
diff --git a/redland/raptor/raptor-1.4.18.patch.legal b/redland/raptor/raptor-1.4.18.patch.legal
deleted file mode 100644
index 217b7d1..0000000
--- a/redland/raptor/raptor-1.4.18.patch.legal
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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
deleted file mode 100644
index bb9f6f4..0000000
--- a/redland/raptor/raptor-1.4.18.patch.mingw
+++ /dev/null
@@ -1,41 +0,0 @@
---- 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
---- misc/raptor-1.4.18/src/Makefile.in
-+++ misc/build/raptor-1.4.18/src/Makefile.in
-@@ -404,7 +404,7 @@
- $(am__append_20) $(am__append_21) $(am__append_22) \
- $(am__append_23) $(am__append_24) $(am__append_25) \
- $(am__append_26)
--libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@
-+libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -no-undefined
- libraptor_la_LIBADD = @LTLIBOBJS@
- EXTRA_DIST = \
- raptor-config.in \
diff --git a/redland/raptor/raptor-1.4.18.patch.no-soname b/redland/raptor/raptor-1.4.18.patch.no-soname
deleted file mode 100644
index 66d1eff..0000000
--- a/redland/raptor/raptor-1.4.18.patch.no-soname
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/raptor-1.4.18/configure
-+++ misc/build/raptor-1.4.18/configure
-@@ -7848,7 +7848,7 @@
- *)
- tmp_sharedflag='-shared' ;;
- esac
-- archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags -o $lib'
-
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
diff --git a/redland/raptor/raptor-1.4.18.patch.ooo_build b/redland/raptor/raptor-1.4.18.patch.ooo_build
deleted file mode 100644
index a168785..0000000
--- a/redland/raptor/raptor-1.4.18.patch.ooo_build
+++ /dev/null
@@ -1,43 +0,0 @@
---- 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 at includedir@"
--else
-- includes=
--fi
-+#prefix=@prefix@
-+#exec_prefix=@exec_prefix@
-+#
-+#if test "@includedir@" != /usr/include ; then
-+# includes="-I at includedir@"
-+#else
-+# includes=
-+#fi
-
-
- usage()
-@@ -130,7 +139,8 @@
- done
- fi
- if test "$echo_libs" = "yes"; then
-- echo -L at libdir@ -lraptor
-+# echo -L at 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.rindex b/redland/raptor/raptor-1.4.18.patch.rindex
deleted file mode 100644
index d0c0652..0000000
--- a/redland/raptor/raptor-1.4.18.patch.rindex
+++ /dev/null
@@ -1,62 +0,0 @@
---- misc/raptor-1.4.18/librdfa/curie.c 2008-06-14 07:33:37.000000000 +0200
-+++ misc/build/raptor-1.4.18/librdfa/curie.c 2011-09-27 14:48:34.000000000 +0200
-@@ -122,7 +122,7 @@
- {
- // if we have a relative URI, chop off the name of the file
- // and replace it with the relative pathname
-- char* end_index = rindex(context->base, '/');
-+ char* end_index = strrchr(context->base, '/');
-
- if(end_index != NULL)
- {
-@@ -130,7 +130,7 @@
- char* end_index2;
-
- tmpstr = rdfa_replace_string(tmpstr, context->base);
-- end_index2= rindex(tmpstr, '/');
-+ end_index2= strrchr(tmpstr, '/');
- end_index2++;
- *end_index2 = '\0';
-
---- misc/raptor-1.4.18/librdfa/rdfa.c 2008-06-16 04:02:58.000000000 +0200
-+++ misc/build/raptor-1.4.18/librdfa/rdfa.c 2011-09-27 15:03:12.000000000 +0200
-@@ -163,7 +163,7 @@
- {
- char* href_start = strstr(base_start, "href=");
- char* uri_start = href_start + 6;
-- char* uri_end = index(uri_start, '"');
-+ char* uri_end = strchr(uri_start, '"');
-
- if((uri_start != NULL) && (uri_end != NULL))
- {
-@@ -898,8 +898,8 @@
- if(context->xml_literal != NULL)
- {
- // get the data between the first tag and the last tag
-- content_start = index(context->xml_literal, '>');
-- content_end = rindex(context->xml_literal, '<');
-+ content_start = strchr(context->xml_literal, '>');
-+ content_end = strrchr(context->xml_literal, '<');
-
- if((content_start != NULL) && (content_end != NULL))
- {
---- misc/raptor-1.4.18/librdfa/triple.c 2008-06-14 07:33:37.000000000 +0200
-+++ misc/build/raptor-1.4.18/librdfa/triple.c 2011-09-27 15:02:59.000000000 +0200
-@@ -437,7 +437,7 @@
- current_object_literal = context->content;
- type = RDF_TYPE_PLAIN_LITERAL;
- }
-- else if(index(context->xml_literal, '<') == NULL)
-+ else if(strchr(context->xml_literal, '<') == NULL)
- {
- current_object_literal = context->plain_literal;
- type = RDF_TYPE_PLAIN_LITERAL;
-@@ -467,7 +467,7 @@
- // [current element], i.e., not including the element itself, and
- // giving it a datatype of rdf:XMLLiteral.
- if((current_object_literal == NULL) &&
-- (index(context->xml_literal, '<') != NULL) &&
-+ (strchr(context->xml_literal, '<') != NULL) &&
- ((context->datatype == NULL) ||
- (strcmp(context->datatype,
- "http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral") == 0)))
diff --git a/redland/raptor/raptor-1.4.18.patch.win32 b/redland/raptor/raptor-1.4.18.patch.win32
deleted file mode 100644
index 8de0d25..0000000
--- a/redland/raptor/raptor-1.4.18.patch.win32
+++ /dev/null
@@ -1,78 +0,0 @@
---- misc/raptor-1.4.18/src/win32_raptor_config.h Wed Apr 2 06:50:14 2008
-+++ misc/build/raptor-1.4.18/src/win32_raptor_config.h Wed Feb 18 13:21:23 2009
-@@ -38,6 +38,8 @@
-
- #define HAVE_STDLIB_H 1
-
-+#define HAVE_ERRNO_H 1
-+
- #if 0
- /* For using expat on win32 */
- #define RAPTOR_XML_EXPAT 1
-@@ -47,8 +49,17 @@
- /* For using libxml2 on win32 */
- #define RAPTOR_XML_LIBXML
- #define HAVE_LIBXML_XMLREADER_H
-+#define HAVE_LIBXML_HASH_H 1
-+#define HAVE_LIBXML_HTMLPARSER_H 1
-+#define HAVE_LIBXML_NANOHTTP_H 1
-+#define HAVE_LIBXML_PARSER_H 1
-+#define HAVE_LIBXSLT_XSLT_H 1
-+
-+#define RAPTOR_LIBXML_HTML_PARSE_NONET 1
-+#define RAPTOR_LIBXML_XML_PARSE_NONET 1
-+
- /* does libxml struct xmlEntity have a field etype */
--/*#define RAPTOR_LIBXML_ENTITY_ETYPE*/
-+#define RAPTOR_LIBXML_ENTITY_ETYPE
-
- /* does libxml struct xmlEntity have a field name_length */
- /*#define RAPTOR_LIBXML_ENTITY_NAME_LENGTH*/
-@@ -60,16 +71,17 @@
- #define HAVE_XMLSAX2INTERNALSUBSET 1
-
- /* does libxml xmlSAXHandler have externalSubset field */
--/*#define RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET*/
-+#define RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET 1
-
- /* does libxml xmlSAXHandler have initialized field */
--/*#define RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED*/
-+#define RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED 1
- #endif
-
- #define HAVE_STRICMP 1
-
- /* MS names for these functions */
--#define vsnprintf _vsnprintf
-+// next line breaks build on wntmsci12
-+//#define vsnprintf _vsnprintf
- #define snprintf _snprintf
- #define access _access
- #define stricmp _stricmp
-@@ -113,19 +125,23 @@
- #endif
-
- #define RAPTOR_PARSER_GUESS 1
--#define RAPTOR_PARSER_GRDDL 1
-+/* #define RAPTOR_PARSER_GRDDL 1 disabled: (#i93768#) */
-+#ifndef __MINGW32__ /* conflicts with normal configure result */
- #define RAPTOR_PARSER_N3 1
-+#endif
- #define RAPTOR_PARSER_TURTLE 1
- #define RAPTOR_PARSER_NTRIPLES 1
- #define RAPTOR_PARSER_RDFXML 1
-
-+/* does not build on wntmsci12 due to gettimeofday
- #define RAPTOR_SERIALIZER_ATOM 1
--#define RAPTOR_SERIALIZER_RSS_1_0 1
-+#define RAPTOR_SERIALIZER_RSS_1_0 1 */
- #define RAPTOR_SERIALIZER_RDFXML 1
- #define RAPTOR_SERIALIZER_RDFXML_ABBREV 1
- #define RAPTOR_SERIALIZER_NTRIPLES 1
-
--#define RAPTOR_WWW_LIBCURL 1
-+//#define RAPTOR_WWW_LIBCURL 1
-+#define RAPTOR_WWW_LIBXML 1
-
-
- #include <windows.h>
diff --git a/redland/raptor/raptor-1.4.18.rindex.patch b/redland/raptor/raptor-1.4.18.rindex.patch
new file mode 100644
index 0000000..dc038d3
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.rindex.patch
@@ -0,0 +1,62 @@
+--- misc/raptor-1.4.18/librdfa/curie.c 2008-06-14 07:33:37.000000000 +0200
++++ misc/raptor-1.4.18/librdfa/curie.c 2011-09-27 14:48:34.000000000 +0200
+@@ -122,7 +122,7 @@
+ {
+ // if we have a relative URI, chop off the name of the file
+ // and replace it with the relative pathname
+- char* end_index = rindex(context->base, '/');
++ char* end_index = strrchr(context->base, '/');
+
+ if(end_index != NULL)
+ {
+@@ -130,7 +130,7 @@
+ char* end_index2;
+
+ tmpstr = rdfa_replace_string(tmpstr, context->base);
+- end_index2= rindex(tmpstr, '/');
++ end_index2= strrchr(tmpstr, '/');
+ end_index2++;
+ *end_index2 = '\0';
+
+--- misc/raptor-1.4.18/librdfa/rdfa.c 2008-06-16 04:02:58.000000000 +0200
++++ misc/build/raptor-1.4.18/librdfa/rdfa.c 2011-09-27 15:03:12.000000000 +0200
+@@ -163,7 +163,7 @@
+ {
+ char* href_start = strstr(base_start, "href=");
+ char* uri_start = href_start + 6;
+- char* uri_end = index(uri_start, '"');
++ char* uri_end = strchr(uri_start, '"');
+
+ if((uri_start != NULL) && (uri_end != NULL))
+ {
+@@ -898,8 +898,8 @@
+ if(context->xml_literal != NULL)
+ {
+ // get the data between the first tag and the last tag
+- content_start = index(context->xml_literal, '>');
+- content_end = rindex(context->xml_literal, '<');
++ content_start = strchr(context->xml_literal, '>');
++ content_end = strrchr(context->xml_literal, '<');
+
+ if((content_start != NULL) && (content_end != NULL))
+ {
+--- misc/raptor-1.4.18/librdfa/triple.c 2008-06-14 07:33:37.000000000 +0200
++++ misc/build/raptor-1.4.18/librdfa/triple.c 2011-09-27 15:02:59.000000000 +0200
+@@ -437,7 +437,7 @@
+ current_object_literal = context->content;
+ type = RDF_TYPE_PLAIN_LITERAL;
+ }
+- else if(index(context->xml_literal, '<') == NULL)
++ else if(strchr(context->xml_literal, '<') == NULL)
+ {
+ current_object_literal = context->plain_literal;
+ type = RDF_TYPE_PLAIN_LITERAL;
+@@ -467,7 +467,7 @@
+ // [current element], i.e., not including the element itself, and
+ // giving it a datatype of rdf:XMLLiteral.
+ if((current_object_literal == NULL) &&
+- (index(context->xml_literal, '<') != NULL) &&
++ (strchr(context->xml_literal, '<') != NULL) &&
+ ((context->datatype == NULL) ||
+ (strcmp(context->datatype,
+ "http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral") == 0)))
diff --git a/redland/raptor/raptor-1.4.18.win32.patch b/redland/raptor/raptor-1.4.18.win32.patch
new file mode 100644
index 0000000..f7f8bbe
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.win32.patch
@@ -0,0 +1,78 @@
+--- misc/raptor-1.4.18/src/win32_raptor_config.h Wed Apr 2 06:50:14 2008
++++ misc/raptor-1.4.18/src/win32_raptor_config.h Wed Feb 18 13:21:23 2009
+@@ -38,6 +38,8 @@
+
+ #define HAVE_STDLIB_H 1
+
++#define HAVE_ERRNO_H 1
++
+ #if 0
+ /* For using expat on win32 */
+ #define RAPTOR_XML_EXPAT 1
+@@ -47,8 +49,17 @@
+ /* For using libxml2 on win32 */
+ #define RAPTOR_XML_LIBXML
+ #define HAVE_LIBXML_XMLREADER_H
++#define HAVE_LIBXML_HASH_H 1
++#define HAVE_LIBXML_HTMLPARSER_H 1
++#define HAVE_LIBXML_NANOHTTP_H 1
++#define HAVE_LIBXML_PARSER_H 1
++#define HAVE_LIBXSLT_XSLT_H 1
++
++#define RAPTOR_LIBXML_HTML_PARSE_NONET 1
++#define RAPTOR_LIBXML_XML_PARSE_NONET 1
++
+ /* does libxml struct xmlEntity have a field etype */
+-/*#define RAPTOR_LIBXML_ENTITY_ETYPE*/
++#define RAPTOR_LIBXML_ENTITY_ETYPE
+
+ /* does libxml struct xmlEntity have a field name_length */
+ /*#define RAPTOR_LIBXML_ENTITY_NAME_LENGTH*/
+@@ -60,16 +71,17 @@
+ #define HAVE_XMLSAX2INTERNALSUBSET 1
+
+ /* does libxml xmlSAXHandler have externalSubset field */
+-/*#define RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET*/
++#define RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET 1
+
+ /* does libxml xmlSAXHandler have initialized field */
+-/*#define RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED*/
++#define RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED 1
+ #endif
+
+ #define HAVE_STRICMP 1
+
+ /* MS names for these functions */
+-#define vsnprintf _vsnprintf
++// next line breaks build on wntmsci12
++//#define vsnprintf _vsnprintf
+ #define snprintf _snprintf
+ #define access _access
+ #define stricmp _stricmp
+@@ -113,19 +125,23 @@
+ #endif
+
+ #define RAPTOR_PARSER_GUESS 1
+-#define RAPTOR_PARSER_GRDDL 1
++/* #define RAPTOR_PARSER_GRDDL 1 disabled: (#i93768#) */
++#ifndef __MINGW32__ /* conflicts with normal configure result */
+ #define RAPTOR_PARSER_N3 1
++#endif
+ #define RAPTOR_PARSER_TURTLE 1
+ #define RAPTOR_PARSER_NTRIPLES 1
+ #define RAPTOR_PARSER_RDFXML 1
+
++/* does not build on wntmsci12 due to gettimeofday
+ #define RAPTOR_SERIALIZER_ATOM 1
+-#define RAPTOR_SERIALIZER_RSS_1_0 1
++#define RAPTOR_SERIALIZER_RSS_1_0 1 */
+ #define RAPTOR_SERIALIZER_RDFXML 1
+ #define RAPTOR_SERIALIZER_RDFXML_ABBREV 1
+ #define RAPTOR_SERIALIZER_NTRIPLES 1
+
+-#define RAPTOR_WWW_LIBCURL 1
++//#define RAPTOR_WWW_LIBCURL 1
++#define RAPTOR_WWW_LIBXML 1
+
+
+ #include <windows.h>
diff --git a/redland/raptor/raptor-aix.patch b/redland/raptor/raptor-aix.patch
deleted file mode 100644
index d6427c5..0000000
--- a/redland/raptor/raptor-aix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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/raptor/raptor.def b/redland/raptor/raptor.def
new file mode 100644
index 0000000..2b9fd4a
--- /dev/null
+++ b/redland/raptor/raptor.def
@@ -0,0 +1,293 @@
+LIBRARY RAPTOR
+EXPORTS
+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/raptor/raptor2.map b/redland/raptor/raptor2.map
deleted file mode 100644
index 109a74b..0000000
--- a/redland/raptor/raptor2.map
+++ /dev/null
@@ -1,294 +0,0 @@
-UDK_3_0_0 {
- 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;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list