diff options
| -rw-r--r-- | Module_tail_build.mk | 1 | ||||
| -rwxr-xr-x | Repository.mk | 2 | ||||
| -rw-r--r-- | RepositoryExternal.mk | 30 | ||||
| -rw-r--r-- | RepositoryFixes.mk | 1 | ||||
| -rw-r--r-- | RepositoryModule_ooo.mk | 1 | ||||
| -rw-r--r-- | config_host.mk.in | 3 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | redland/ExternalPackage_raptor.mk | 29 | ||||
| -rw-r--r-- | redland/ExternalPackage_rasqal.mk | 29 | ||||
| -rw-r--r-- | redland/ExternalPackage_redland.mk | 27 | ||||
| -rw-r--r-- | redland/ExternalProject_raptor.mk | 57 | ||||
| -rw-r--r-- | redland/ExternalProject_rasqal.mk | 55 | ||||
| -rw-r--r-- | redland/ExternalProject_redland.mk | 58 | ||||
| -rw-r--r-- | redland/Library_raptor.mk | 83 | ||||
| -rw-r--r-- | redland/Library_rasqal.mk | 59 | ||||
| -rw-r--r-- | redland/Library_rdf.mk | 76 | ||||
| -rw-r--r-- | redland/Makefile | 7 | ||||
| -rw-r--r-- | redland/Module_redland.mk | 36 | ||||
| -rw-r--r-- | redland/UnpackedTarball_raptor.mk | 31 | ||||
| -rw-r--r-- | redland/UnpackedTarball_rasqal.mk | 25 | ||||
| -rw-r--r-- | redland/UnpackedTarball_redland.mk | 25 | ||||
| -rw-r--r-- | redland/prj/build.lst | 5 | ||||
| -rw-r--r-- | redland/prj/d.lst | 22 | ||||
| -rw-r--r-- | redland/prj/dmake | 0 | ||||
| -rw-r--r-- | redland/raptor/makefile.mk | 238 | ||||
| -rw-r--r-- | redland/raptor/raptor-1.4.18.aix.patch (renamed from redland/raptor/raptor-aix.patch) | 2 | ||||
| -rw-r--r-- | redland/raptor/raptor-1.4.18.autotools.patch (renamed from redland/raptor/raptor-1.4.18.patch.autotools) | 2 | ||||
| -rw-r--r-- | redland/raptor/raptor-1.4.18.bundled-soname.patch (renamed from redland/raptor/raptor-1.4.18.patch.bundled-soname) | 2 | ||||
| -rw-r--r-- | redland/raptor/raptor-1.4.18.cross.patch (renamed from redland/raptor/raptor-1.4.18.patch.cross) | 2 | ||||
| -rw-r--r-- | redland/raptor/raptor-1.4.18.entities.patch | 22 | ||||
| -rw-r--r-- | redland/raptor/raptor-1.4.18.fixes.patch (renamed from redland/raptor/raptor-1.4.18.patch.fixes) | 2 | ||||
| -rw-r--r-- | redland/raptor/raptor-1.4.18.legal.patch (renamed from redland/raptor/raptor-1.4.18.patch.legal) | 2 | ||||
| -rw-r--r-- | redland/raptor/raptor-1.4.18.libxml.patch | 2 | ||||
| -rw-r--r-- | redland/raptor/raptor-1.4.18.libxslt.patch | 2 | ||||
| -rw-r--r-- | redland/raptor/raptor-1.4.18.mingw.patch (renamed from redland/raptor/raptor-1.4.18.patch.mingw) | 2 | ||||
| -rw-r--r-- | redland/raptor/raptor-1.4.18.no-soname.patch (renamed from redland/raptor/raptor-1.4.18.patch.no-soname) | 2 | ||||
| -rw-r--r-- | redland/raptor/raptor-1.4.18.ooo_build.patch (renamed from redland/raptor/raptor-1.4.18.patch.ooo_build) | 2 | ||||
| -rw-r--r-- | redland/raptor/raptor-1.4.18.patch.dmake | 124 | ||||
| -rw-r--r-- | redland/raptor/raptor-1.4.18.rindex.patch (renamed from redland/raptor/raptor-1.4.18.patch.rindex) | 2 | ||||
| -rw-r--r-- | redland/raptor/raptor-1.4.18.win32.patch (renamed from redland/raptor/raptor-1.4.18.patch.win32) | 2 | ||||
| -rw-r--r-- | redland/raptor/raptor.def | 293 | ||||
| -rw-r--r-- | redland/raptor/raptor2.map | 294 | ||||
| -rw-r--r-- | redland/rasqal/makefile.mk | 191 | ||||
| -rw-r--r-- | redland/rasqal/rasqal-0.9.16.aix.patch (renamed from redland/rasqal/rasqal-aix.patch) | 0 | ||||
| -rw-r--r-- | redland/rasqal/rasqal-0.9.16.autotools.patch (renamed from redland/rasqal/rasqal-0.9.16.patch.autotools) | 0 | ||||
| -rw-r--r-- | redland/rasqal/rasqal-0.9.16.bundled-soname.patch (renamed from redland/rasqal/rasqal-0.9.16.patch.bundled-soname) | 0 | ||||
| -rw-r--r-- | redland/rasqal/rasqal-0.9.16.legal.patch (renamed from redland/rasqal/rasqal-0.9.16.patch.legal) | 0 | ||||
| -rw-r--r-- | redland/rasqal/rasqal-0.9.16.mingw.patch (renamed from redland/rasqal/rasqal-0.9.16.patch.mingw) | 0 | ||||
| -rw-r--r-- | redland/rasqal/rasqal-0.9.16.no-soname.patch (renamed from redland/rasqal/rasqal-0.9.16.patch.no-soname) | 0 | ||||
| -rw-r--r-- | redland/rasqal/rasqal-0.9.16.ooo_build.patch (renamed from redland/rasqal/rasqal-0.9.16.patch.ooo_build) | 0 | ||||
| -rw-r--r-- | redland/rasqal/rasqal-0.9.16.patch.dmake | 98 | ||||
| -rw-r--r-- | redland/rasqal/rasqal-0.9.16.win32.patch (renamed from redland/rasqal/rasqal-0.9.16.patch.win32) | 0 | ||||
| -rw-r--r-- | redland/rasqal/rasqal.def | 186 | ||||
| -rw-r--r-- | redland/rasqal/rasqal2.map | 194 | ||||
| -rw-r--r-- | redland/redland/makefile.mk | 191 | ||||
| -rw-r--r-- | redland/redland/rdf.def | 314 | ||||
| -rw-r--r-- | redland/redland/redland-1.0.8.aix.patch (renamed from redland/redland/redland-aix.patch) | 0 | ||||
| -rw-r--r-- | redland/redland/redland-1.0.8.autotools.patch (renamed from redland/redland/redland-1.0.8.patch.autotools) | 0 | ||||
| -rw-r--r-- | redland/redland/redland-1.0.8.bundled-soname.patch (renamed from redland/redland/redland-1.0.8.patch.bundled-soname) | 0 | ||||
| -rw-r--r-- | redland/redland/redland-1.0.8.legal.patch (renamed from redland/redland/redland-1.0.8.patch.legal) | 0 | ||||
| -rw-r--r-- | redland/redland/redland-1.0.8.mingw.patch (renamed from redland/redland/redland-1.0.8.patch.mingw) | 0 | ||||
| -rw-r--r-- | redland/redland/redland-1.0.8.no-soname.patch (renamed from redland/redland/redland-1.0.8.patch.no-soname) | 0 | ||||
| -rw-r--r-- | redland/redland/redland-1.0.8.ooo_build.patch (renamed from redland/redland/redland-1.0.8.patch.ooo_build) | 0 | ||||
| -rw-r--r-- | redland/redland/redland-1.0.8.patch.dmake | 115 | ||||
| -rw-r--r-- | redland/redland/redland-1.0.8.win32.patch (renamed from redland/redland/redland-1.0.8.patch.win32) | 0 | ||||
| -rw-r--r-- | redland/redland/redland2.map | 316 | ||||
| -rw-r--r-- | redland/redlandversion.mk | 32 | ||||
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 1 | ||||
| -rw-r--r-- | tail_build/prj/build.lst | 2 | ||||
| -rw-r--r-- | unoxml/Library_unordf.mk | 11 |
70 files changed, 1468 insertions, 1848 deletions
diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 5aab2bda2ffa..4dcc77967330 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 751d226a8b91..b712bd247bd1 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 4ae674563ee9..abfc4a34ada8 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 ecc63690fcef..9ff66563a1c4 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 c09aa34a65b0..a96096e60cc5 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 1cd888e8d1d4..08f6a855e9d2 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 3171e90c9ef3..c74e1a24c2ee 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 000000000000..414b9c8ba321 --- /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 000000000000..88c48c6de978 --- /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 000000000000..10eaecd4d4a3 --- /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 000000000000..69650c799531 --- /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 000000000000..99ee3b83334e --- /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 000000000000..62cf9d5d398b --- /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 000000000000..cdb4cd4b8838 --- /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 000000000000..7b20dccc13f9 --- /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 000000000000..cb20604061ba --- /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 000000000000..ccb1c85a04da --- /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 000000000000..5b1f2a12230d --- /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 000000000000..ad445fb38525 --- /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 000000000000..1b8e3e4f121d --- /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 000000000000..a7cfa66ac891 --- /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 c23ad527fc71..9d4e244ca8e9 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 39b7afaf8066..e69de29bb2d1 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 e69de29bb2d1..000000000000 --- a/redland/prj/dmake +++ /dev/null diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk deleted file mode 100644 index 3617feaa9989..000000000000 --- 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-aix.patch b/redland/raptor/raptor-1.4.18.aix.patch index d6427c501d68..df426404e37b 100644 --- a/redland/raptor/raptor-aix.patch +++ b/redland/raptor/raptor-1.4.18.aix.patch @@ -1,5 +1,5 @@ --- 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 ++++ 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 diff --git a/redland/raptor/raptor-1.4.18.patch.autotools b/redland/raptor/raptor-1.4.18.autotools.patch index b91444edc813..8a29070de2f9 100644 --- a/redland/raptor/raptor-1.4.18.patch.autotools +++ b/redland/raptor/raptor-1.4.18.autotools.patch @@ -1,5 +1,5 @@ --- 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 ++++ 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/'` diff --git a/redland/raptor/raptor-1.4.18.patch.bundled-soname b/redland/raptor/raptor-1.4.18.bundled-soname.patch index cd8e87e2037f..407e0601be3a 100644 --- a/redland/raptor/raptor-1.4.18.patch.bundled-soname +++ b/redland/raptor/raptor-1.4.18.bundled-soname.patch @@ -1,5 +1,5 @@ --- misc/raptor-1.4.18/src/Makefile.in -+++ misc/build/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) \ diff --git a/redland/raptor/raptor-1.4.18.patch.cross b/redland/raptor/raptor-1.4.18.cross.patch index bf4c43240492..82df18273515 100644 --- a/redland/raptor/raptor-1.4.18.patch.cross +++ b/redland/raptor/raptor-1.4.18.cross.patch @@ -1,5 +1,5 @@ --- misc/raptor-1.4.18/configure -+++ misc/build/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; } diff --git a/redland/raptor/raptor-1.4.18.entities.patch b/redland/raptor/raptor-1.4.18.entities.patch index d31187908286..84ffdb5f67d2 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.patch.fixes b/redland/raptor/raptor-1.4.18.fixes.patch index 7b7c959fe8f2..67a8f5abb4ca 100644 --- a/redland/raptor/raptor-1.4.18.patch.fixes +++ b/redland/raptor/raptor-1.4.18.fixes.patch @@ -1,5 +1,5 @@ --- 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 ++++ 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: diff --git a/redland/raptor/raptor-1.4.18.patch.legal b/redland/raptor/raptor-1.4.18.legal.patch index 217b7d154812..b3ad82ce74b5 100644 --- a/redland/raptor/raptor-1.4.18.patch.legal +++ b/redland/raptor/raptor-1.4.18.legal.patch @@ -1,5 +1,5 @@ --- 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 ++++ misc/raptor-1.4.18/LICENSE.txt Mon Jun 16 15:55:38 2008 @@ -60,3 +60,15 @@ Copyright (C) 2000-2008 David Beckett diff --git a/redland/raptor/raptor-1.4.18.libxml.patch b/redland/raptor/raptor-1.4.18.libxml.patch index 59e5ceb2e842..04994fa0c0d5 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 6dfffd93429f..49d2a26b8c21 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.patch.mingw b/redland/raptor/raptor-1.4.18.mingw.patch index bb9f6f4eff48..4027c308c1be 100644 --- a/redland/raptor/raptor-1.4.18.patch.mingw +++ b/redland/raptor/raptor-1.4.18.mingw.patch @@ -1,5 +1,5 @@ --- 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 ++++ misc/raptor-1.4.18/configure 2009-06-04 21:10:22.447125000 +0900 @@ -25238,6 +25238,12 @@ rdfa_parser=yes diff --git a/redland/raptor/raptor-1.4.18.patch.no-soname b/redland/raptor/raptor-1.4.18.no-soname.patch index 66d1effa64cf..fddb5d42a1a7 100644 --- a/redland/raptor/raptor-1.4.18.patch.no-soname +++ b/redland/raptor/raptor-1.4.18.no-soname.patch @@ -1,5 +1,5 @@ --- misc/raptor-1.4.18/configure -+++ misc/build/raptor-1.4.18/configure ++++ misc/raptor-1.4.18/configure @@ -7848,7 +7848,7 @@ *) tmp_sharedflag='-shared' ;; diff --git a/redland/raptor/raptor-1.4.18.patch.ooo_build b/redland/raptor/raptor-1.4.18.ooo_build.patch index a16878503ede..2f25232f59d4 100644 --- a/redland/raptor/raptor-1.4.18.patch.ooo_build +++ b/redland/raptor/raptor-1.4.18.ooo_build.patch @@ -1,5 +1,5 @@ --- 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 ++++ misc/raptor-1.4.18/src/raptor-config.in Mon Jun 16 15:55:38 2008 @@ -21,14 +21,23 @@ # # 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 b0172754d8f1..000000000000 --- 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.rindex b/redland/raptor/raptor-1.4.18.rindex.patch index d0c06520b2b6..dc038d3842aa 100644 --- a/redland/raptor/raptor-1.4.18.patch.rindex +++ b/redland/raptor/raptor-1.4.18.rindex.patch @@ -1,5 +1,5 @@ --- 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 ++++ 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 diff --git a/redland/raptor/raptor-1.4.18.patch.win32 b/redland/raptor/raptor-1.4.18.win32.patch index 8de0d25cad5e..f7f8bbe4e0fa 100644 --- a/redland/raptor/raptor-1.4.18.patch.win32 +++ b/redland/raptor/raptor-1.4.18.win32.patch @@ -1,5 +1,5 @@ --- 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 ++++ 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 diff --git a/redland/raptor/raptor.def b/redland/raptor/raptor.def new file mode 100644 index 000000000000..2b9fd4a853c6 --- /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 109a74b632bb..000000000000 --- 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; -raptor_namespaces_namespace_in_scope; -raptor_namespaces_find_namespace_by_uri; -raptor_namespaces_get_default_namespace; -raptor_namespaces_start_namespace; -raptor_new_parser_for_content; -raptor_new_parser; -raptor_parse_file; -raptor_parse_file_stream; -raptor_parse_uri; -raptor_parse_uri_with_connection; -raptor_parse_chunk; -raptor_start_parse; -raptor_free_parser; -raptor_features_enumerate; -raptor_parser_set_feature_string; -raptor_parser_get_feature_string; -raptor_set_default_generate_id_parameters; -raptor_guess_parser_name; -raptor_syntax_name_check; -raptor_parser_get_accept_header; -raptor_parsers_enumerate; -raptor_syntaxes_enumerate; -raptor_get_mime_type; -raptor_get_locator; -raptor_parse_abort; -raptor_get_need_base_uri; -raptor_get_label; -raptor_get_name; -raptor_set_parser_strict; -raptor_get_feature; -raptor_set_feature; -raptor_parser_set_uri_filter; -raptor_set_namespace_handler; -raptor_set_generate_id_handler; -raptor_set_graph_handler; -raptor_set_statement_handler; -raptor_set_warning_handler; -raptor_set_error_handler; -raptor_set_fatal_error_handler; -raptor_new_qname; -raptor_new_qname_from_namespace_local_name; -raptor_qname_copy; -raptor_free_qname; -raptor_qname_equal; -raptor_qname_string_to_uri; -raptor_iostream_write_qname; -raptor_qname_get_counted_value; -raptor_qname_get_value; -raptor_qname_get_local_name; -raptor_qname_get_namespace; -raptor_uri_resolve_uri_reference; -raptor_new_sax2; -raptor_sax2_parse_start; -raptor_free_sax2; -raptor_sax2_parse_chunk; -raptor_sax2_inscope_base_uri; -raptor_sax2_inscope_xml_language; -raptor_xml_element_is_empty; -raptor_sax2_set_namespace_handler; -raptor_sax2_set_external_entity_ref_handler; -raptor_sax2_set_unparsed_entity_decl_handler; -raptor_sax2_set_comment_handler; -raptor_sax2_set_cdata_handler; -raptor_sax2_set_characters_handler; -raptor_sax2_set_end_element_handler; -raptor_sax2_set_start_element_handler; -raptor_compare_strings; -raptor_sequence_sort; -raptor_sequence_print_string; -raptor_sequence_print_uri; -raptor_sequence_print; -raptor_free_sequence; -raptor_sequence_set_at; -raptor_sequence_push; -raptor_sequence_shift; -raptor_sequence_join; -raptor_new_sequence; -raptor_sequence_size; -raptor_sequence_get_at; -raptor_sequence_pop; -raptor_sequence_unshift; -raptor_sequence_set_print_handler; -raptor_serializer_syntax_name_check; -raptor_new_serializer; -raptor_serializers_enumerate; -raptor_serialize_start_to_filename; -raptor_serialize_start_to_string; -raptor_serialize_start_to_file_handle; -raptor_serialize_start; -raptor_serialize_set_namespace_from_namespace; -raptor_serialize_end; -raptor_free_serializer; -raptor_serializer_features_enumerate; -raptor_serializer_set_feature_string; -raptor_serializer_get_feature_string; -raptor_serializer_get_locator; -raptor_serializer_set_warning_handler; -raptor_serializer_set_error_handler; -raptor_serializer_get_feature; -raptor_serializer_set_feature; -raptor_serializer_get_iostream; -raptor_serialize_statement; -raptor_serialize_set_namespace; -raptor_iostream_write_statement_ntriples; -raptor_iostream_write_string_ntriples; -raptor_new_stringbuffer; -raptor_free_stringbuffer; -raptor_stringbuffer_append_decimal; -raptor_stringbuffer_append_counted_string; -raptor_stringbuffer_append_string; -raptor_stringbuffer_append_stringbuffer; -raptor_stringbuffer_prepend_counted_string; -raptor_stringbuffer_prepend_string; -raptor_stringbuffer_as_string; -raptor_stringbuffer_copy_to_string; -raptor_stringbuffer_length; -raptor_uri_set_handler; -raptor_uri_filename_to_uri_string; -raptor_uri_uri_string_to_filename; -raptor_uri_uri_string_to_filename_fragment; -raptor_uri_is_file_uri; -raptor_uri_uri_string_is_file_uri; -raptor_new_uri_for_xmlbase; -raptor_new_uri_for_retrieval; -raptor_new_uri_from_id; -raptor_uri_to_relative_uri_string; -raptor_uri_to_relative_counted_uri_string; -raptor_uri_compare; -raptor_uri_print; -raptor_uri_to_string; -raptor_uri_to_counted_string; -raptor_uri_as_counted_string; -raptor_uri_as_string; -raptor_uri_copy; -raptor_uri_equals; -raptor_free_uri; -raptor_new_uri_for_rdf_concept; -raptor_new_uri_relative_to_base; -raptor_new_uri_from_uri_local_name; -raptor_new_uri; -raptor_uri_get_handler; -raptor_utf8_check; -raptor_unicode_is_xml10_namechar; -raptor_unicode_is_xml10_namestartchar; -raptor_unicode_is_xml11_namechar; -raptor_unicode_is_xml11_namestartchar; -raptor_utf8_to_unicode_char; -raptor_unicode_char_to_utf8; -raptor_www_new; -raptor_www_new_with_connection; -raptor_www_free; -raptor_www_set_user_agent; -raptor_www_set_proxy; -raptor_www_set_http_accept; -raptor_www_set_http_cache_control; -raptor_www_fetch_to_string; -raptor_www_fetch; -raptor_www_get_final_uri; -raptor_www_set_final_uri_handler; -raptor_www_abort; -raptor_www_get_connection; -raptor_www_set_uri_filter; -raptor_www_set_connection_timeout; -raptor_www_set_content_type_handler; -raptor_www_set_write_bytes_handler; -raptor_www_set_error_handler; -raptor_www_finish; -raptor_www_no_www_library_init_finish; -raptor_www_init; -raptor_new_xml_element_from_namespace_local_name; -raptor_new_xml_element; -raptor_free_xml_element; -raptor_xml_element_declare_namespace; -raptor_iostream_write_xml_element; -raptor_xml_escape_string; -raptor_xml_any_escape_string; -raptor_iostream_write_xml_escaped_string; -raptor_iostream_write_xml_any_escaped_string; -raptor_xml_name_check; -raptor_xml_element_get_language; -raptor_xml_element_get_attributes_count; -raptor_xml_element_get_attributes; -raptor_xml_element_set_attributes; -raptor_xml_element_get_name; -raptor_new_xml_writer; -raptor_free_xml_writer; -raptor_xml_writer_empty_element; -raptor_xml_writer_start_element; -raptor_xml_writer_end_element; -raptor_xml_writer_comment; -raptor_xml_writer_cdata; -raptor_xml_writer_comment_counted; -raptor_xml_writer_cdata_counted; -raptor_xml_writer_raw; -raptor_xml_writer_raw_counted; -raptor_xml_writer_features_enumerate; -raptor_xml_writer_set_feature_string; -raptor_xml_writer_get_feature_string; -raptor_xml_writer_get_feature; -raptor_xml_writer_set_feature; -raptor_statement_part_as_string; -raptor_statement_part_as_counted_string; -raptor_print_statement_as_ntriples; -raptor_print_statement_detailed; -raptor_print_statement; -raptor_statement_compare; -raptor_iostream_write_string_turtle; -raptor_iostream_write_string_python; -}; diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk deleted file mode 100644 index 6fa126061f8b..000000000000 --- a/redland/rasqal/makefile.mk +++ /dev/null @@ -1,191 +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_rasqal - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(SYSTEM_REDLAND)" == "YES" -all: - @echo "An already available installation of Redland RDF should exist on your system." - @echo "Therefore the version provided here does not need to be built in addition." -.ENDIF - -# --- Files -------------------------------------------------------- - -.INCLUDE : ../redlandversion.mk - -RASQALVERSION=0.9.16 - -TARFILE_NAME=rasqal-$(RASQALVERSION) -TARFILE_MD5=fca8706f2c4619e2fa3f8f42f8fc1e9d - -ADDITIONAL_FILES=src/makefile.mk src/rasqal_config.h - -OOO_PATCH_FILES= \ - $(TARFILE_NAME).patch.legal \ - $(TARFILE_NAME).patch.autotools \ - $(TARFILE_NAME).patch.ooo_build \ - $(TARFILE_NAME).patch.dmake \ - $(TARFILE_NAME).patch.win32 \ - rasqal-aix.patch - -.IF "$(OS)" != "WNT" -OOO_PATCH_FILES+= \ - $(TARFILE_NAME).patch.bundled-soname -.ENDIF - -PATCH_FILES=$(OOO_PATCH_FILES) - -.IF "$(OS)"=="ANDROID" -PATCH_FILES+=$(TARFILE_NAME).patch.no-soname -.ENDIF - -.IF "$(OS)"=="WNT" -.IF "$(COM)"=="GCC" -OOO_PATCH_FILES+=$(TARFILE_NAME).patch.mingw -rasqal_CC=$(CC) -mthreads -.IF "$(MINGW_SHARED_GCCLIB)"=="YES" -rasqal_CC+=-shared-libgcc -.ENDIF -rasqal_LIBS= - -rasqal_LDFLAGS=-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols -.IF "$(ILIB)"!="" -rasqal_LDFLAGS+= -L$(ILIB:s/;/ -L/) -.ENDIF - -CONFIGURE_DIR= -CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" -CONFIGURE_FLAGS=--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" CC="$(rasqal_CC)" CPPFLAGS="$(INCLUDE)" LDFLAGS="$(rasqal_LDFLAGS)" LIBS="$(rasqal_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 "$(DISABLE_DYNLOADING)"=="TRUE" -CFLAGS=-fvisibility=hidden -.ENDIF - -.IF "$(COM)"=="C52" && "$(CPU)"=="U" -CFLAGS+=-m64 -.EXPORT: CFLAGS -.ENDIF - -# NB: SOLARDIR before SYSBASE, because linux SYSBASE contains obsolete libcrypto -CPPFLAGS+:=-I$(SOLARINCDIR)$/external -LDFLAGS+:=-L$(SOLARLIBDIR) - -.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)"!="" - -.IF "$(OS)"=="MACOSX" && "$(SYSTEM_LIBXML)" != "YES" -LDFLAGS+:=-Wl,-dylib_file,@loader_path/../ure-link/lib/libxml2.2.dylib:$(SOLARLIBDIR)/libxml2.2.dylib -.ENDIF - -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 PATH="..$/..$/..$/bin:$$PATH" -.IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID" -CONFIGURE_FLAGS=--disable-shared -.ELSE -CONFIGURE_FLAGS=--disable-static -.ENDIF -CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml -.IF "$(OS)" == "MACOSX" -CONFIGURE_FLAGS += \ - --prefix=/@.__________________________________________________$(EXTRPATH) -.END -.IF "$(CROSS_COMPILING)"=="YES" -CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) -.ENDIF -BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) -BUILD_FLAGS+= -j$(EXTMAXPROCESS) -BUILD_DIR=$(CONFIGURE_DIR) -.ENDIF - - -OUT2INC+=src$/rasqal.h - -.IF "$(OS)"=="MACOSX" -OUT2LIB+=src$/.libs$/librasqal-lo.$(RASQAL_MAJOR).dylib src$/.libs$/librasqal.dylib -OUT2BIN+=src/rasqal-config -.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID" -OUT2LIB+=src$/.libs$/librasqal.a -OUT2BIN+=src/rasqal-config -.ELIF "$(OS)"=="WNT" -.IF "$(COM)"=="GCC" -OUT2LIB+=src$/.libs$/*.a -OUT2BIN+=src$/.libs$/*.dll -OUT2BIN+=src/rasqal-config -.ELSE -# if we use dmake, this is done automagically -.ENDIF -.ELSE -OUT2LIB+=src$/.libs$/librasqal-lo.so.$(RASQAL_MAJOR) src$/.libs$/librasqal.so -OUT2BIN+=src/rasqal-config -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk -.INCLUDE : tg_ext.mk - diff --git a/redland/rasqal/rasqal-aix.patch b/redland/rasqal/rasqal-0.9.16.aix.patch index 86470d421f81..86470d421f81 100644 --- a/redland/rasqal/rasqal-aix.patch +++ b/redland/rasqal/rasqal-0.9.16.aix.patch diff --git a/redland/rasqal/rasqal-0.9.16.patch.autotools b/redland/rasqal/rasqal-0.9.16.autotools.patch index a8e07a377733..a8e07a377733 100644 --- a/redland/rasqal/rasqal-0.9.16.patch.autotools +++ b/redland/rasqal/rasqal-0.9.16.autotools.patch diff --git a/redland/rasqal/rasqal-0.9.16.patch.bundled-soname b/redland/rasqal/rasqal-0.9.16.bundled-soname.patch index 5e5bea4378a0..5e5bea4378a0 100644 --- a/redland/rasqal/rasqal-0.9.16.patch.bundled-soname +++ b/redland/rasqal/rasqal-0.9.16.bundled-soname.patch diff --git a/redland/rasqal/rasqal-0.9.16.patch.legal b/redland/rasqal/rasqal-0.9.16.legal.patch index 59b125d6b64e..59b125d6b64e 100644 --- a/redland/rasqal/rasqal-0.9.16.patch.legal +++ b/redland/rasqal/rasqal-0.9.16.legal.patch diff --git a/redland/rasqal/rasqal-0.9.16.patch.mingw b/redland/rasqal/rasqal-0.9.16.mingw.patch index 9c42a986b1d0..9c42a986b1d0 100644 --- a/redland/rasqal/rasqal-0.9.16.patch.mingw +++ b/redland/rasqal/rasqal-0.9.16.mingw.patch diff --git a/redland/rasqal/rasqal-0.9.16.patch.no-soname b/redland/rasqal/rasqal-0.9.16.no-soname.patch index 08c54acfe5ab..08c54acfe5ab 100644 --- a/redland/rasqal/rasqal-0.9.16.patch.no-soname +++ b/redland/rasqal/rasqal-0.9.16.no-soname.patch diff --git a/redland/rasqal/rasqal-0.9.16.patch.ooo_build b/redland/rasqal/rasqal-0.9.16.ooo_build.patch index 827147995e6f..827147995e6f 100644 --- a/redland/rasqal/rasqal-0.9.16.patch.ooo_build +++ b/redland/rasqal/rasqal-0.9.16.ooo_build.patch diff --git a/redland/rasqal/rasqal-0.9.16.patch.dmake b/redland/rasqal/rasqal-0.9.16.patch.dmake deleted file mode 100644 index 6795eb95c43d..000000000000 --- a/redland/rasqal/rasqal-0.9.16.patch.dmake +++ /dev/null @@ -1,98 +0,0 @@ ---- misc/rasqal-0.9.16/src/makefile.mk Thu Nov 6 15:56:45 2008 -+++ misc/build/rasqal-0.9.16/src/makefile.mk Thu Nov 6 15:55:09 2008 -@@ -1,1 +1,94 @@ --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=rasqal -+LIBTARGET=NO -+UWINAPILIB= -+ -+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE -+ -+ -+# --- Settings ----------------------------------------------------- -+ -+.INCLUDE : settings.mk -+ -+CDEFS+=-DRASQAL_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS -D_MT -+ -+# --- Files -------------------------------------------------------- -+ -+SLOFILES = \ -+ $(SLO)$/rasqal_datetime.obj \ -+ $(SLO)$/rasqal_decimal.obj \ -+ $(SLO)$/rasqal_engine.obj \ -+ $(SLO)$/rasqal_expr.obj \ -+ $(SLO)$/rasqal_feature.obj \ -+ $(SLO)$/rasqal_general.obj \ -+ $(SLO)$/rasqal_graph_pattern.obj \ -+ $(SLO)$/rasqal_literal.obj \ -+ $(SLO)$/rasqal_map.obj \ -+ $(SLO)$/rasqal_query_results.obj \ -+ $(SLO)$/rasqal_query.obj \ -+ $(SLO)$/rasqal_raptor.obj \ -+ $(SLO)$/rasqal_result_formats.obj \ -+ $(SLO)$/rasqal_rowsource.obj \ -+ $(SLO)$/rasqal_sparql_xml.obj \ -+ $(SLO)$/rasqal_xsd_datatypes.obj \ -+ $(SLO)$/rdql_lexer.obj \ -+ $(SLO)$/rdql_parser.obj \ -+ $(SLO)$/sparql_lexer.obj \ -+ $(SLO)$/sparql_parser.obj \ -+ $(SLO)$/strcasecmp.obj \ -+ -+ -+# $(SLO)$/rasqal_redland.obj \ -+ -+SHL1DEPN= makefile.mk -+SHL1OBJS= $(SLOFILES) -+SHL1USE_EXPORTS=name -+ -+#SHL1TARGET= $(TARGET)$(DLLPOSTFIX) -+SHL1TARGET= $(TARGET) -+SHL1IMPLIB= lib$(TARGET) -+ -+#SHL1VERSIONMAP=../service/exports.map -+SHL1DEF=$(MISC)$/$(SHL1TARGET).def -+DEF1NAME=$(SHL1TARGET) -+ -+SHL1STDLIBS= \ -+ $(PRJ)$/$(INPATH)$/lib$/libraptor.lib \ -+ -+ -+#$(LIBXML2LIB) \ -+# $(XSLTLIB) \ -+ -+# --- Targets ------------------------------------------------------ -+ -+.INCLUDE : target.mk -+ diff --git a/redland/rasqal/rasqal-0.9.16.patch.win32 b/redland/rasqal/rasqal-0.9.16.win32.patch index 51bad96e0e29..51bad96e0e29 100644 --- a/redland/rasqal/rasqal-0.9.16.patch.win32 +++ b/redland/rasqal/rasqal-0.9.16.win32.patch diff --git a/redland/rasqal/rasqal.def b/redland/rasqal/rasqal.def new file mode 100644 index 000000000000..2da34feb7b51 --- /dev/null +++ b/redland/rasqal/rasqal.def @@ -0,0 +1,186 @@ +LIBRARY RASQAL +EXPORTS +rasqal_xsd_decimal_set_string +rasqal_xsd_decimal_print +rasqal_xsd_decimal_as_counted_string +rasqal_xsd_decimal_as_string +rasqal_new_xsd_decimal +rasqal_free_xsd_decimal +rasqal_xsd_decimal_set_long +rasqal_xsd_decimal_set_double +rasqal_xsd_decimal_add +rasqal_xsd_decimal_subtract +rasqal_xsd_decimal_multiply +rasqal_xsd_decimal_divide +rasqal_xsd_decimal_negate +rasqal_xsd_decimal_equals +rasqal_xsd_decimal_compare +rasqal_xsd_decimal_is_zero +rasqal_xsd_decimal_get_double +rasqal_set_triples_source_factory +rasqal_new_variable +rasqal_new_variable_typed +rasqal_data_graph_print +rasqal_prefix_print +rasqal_new_data_graph +rasqal_new_prefix +rasqal_new_triple +rasqal_new_triple_from_triple +rasqal_new_0op_expression +rasqal_new_1op_expression +rasqal_new_2op_expression +rasqal_new_3op_expression +rasqal_new_string_op_expression +rasqal_new_literal_expression +rasqal_new_function_expression +rasqal_new_cast_expression +rasqal_free_variable +rasqal_free_expression +rasqal_free_data_graph +rasqal_free_prefix +rasqal_free_triple +rasqal_expression_evaluate +rasqal_variable_set_value +rasqal_variable_print +rasqal_expression_print +rasqal_expression_print_op +rasqal_triple_print +rasqal_expression_visit +rasqal_new_expression_from_expression +rasqal_triple_get_origin +rasqal_triple_set_origin +rasqal_features_enumerate +rasqal_feature_from_uri +rasqal_get_feature_count +rasqal_feature_value_type +rasqal_version_decimal +rasqal_version_release +rasqal_version_minor +rasqal_version_major +rasqal_version_string +rasqal_home_url_string +rasqal_license_string +rasqal_copyright_string +rasqal_short_copyright_string +rasqal_language_name_check +rasqal_query_set_default_generate_bnodeid_parameters +rasqal_free_memory +rasqal_alloc_memory +rasqal_calloc_memory +rasqal_query_set_generate_bnodeid_handler +rasqal_languages_enumerate +rasqal_graph_pattern_add_constraint +rasqal_graph_pattern_print +rasqal_graph_pattern_add_sub_graph_pattern +rasqal_graph_pattern_visit +rasqal_graph_pattern_get_constraint +rasqal_graph_pattern_get_triple +rasqal_graph_pattern_get_sub_graph_pattern +rasqal_graph_pattern_get_sub_graph_pattern_sequence +rasqal_graph_pattern_get_index +rasqal_graph_pattern_operator_as_string +rasqal_graph_pattern_get_operator +rasqal_graph_pattern_get_constraint_sequence +rasqal_literal_compare +rasqal_literal_equals +rasqal_new_double_literal +rasqal_new_integer_literal +rasqal_new_float_literal +rasqal_new_typed_literal +rasqal_new_decimal_literal +rasqal_new_decimal_literal_from_decimal +rasqal_new_string_literal +rasqal_new_uri_literal +rasqal_new_boolean_literal +rasqal_literal_as_node +rasqal_free_literal +rasqal_literal_print +rasqal_literal_print_type +rasqal_new_pattern_literal +rasqal_new_simple_literal +rasqal_new_variable_literal +rasqal_literal_as_string +rasqal_literal_as_string_flags +rasqal_literal_value +rasqal_literal_datatype +rasqal_literal_as_variable +rasqal_new_literal_from_literal +rasqal_free_query_results +rasqal_query_results_get_bindings +rasqal_query_results_get_binding_value +rasqal_query_results_get_binding_value_by_name +rasqal_query_results_get_triple +rasqal_query_results_next +rasqal_query_results_next_triple +rasqal_query_results_write +rasqal_query_results_formatter_write +rasqal_query_results_get_boolean +rasqal_query_results_get_bindings_count +rasqal_query_results_get_binding_name +rasqal_query_results_finished +rasqal_query_results_get_count +rasqal_query_results_is_syntax +rasqal_query_results_is_graph +rasqal_query_results_is_boolean +rasqal_query_results_is_bindings +rasqal_new_query +rasqal_free_query +rasqal_query_set_feature_string +rasqal_query_get_feature_string +rasqal_query_add_data_graph +rasqal_query_set_variable +rasqal_query_add_prefix +rasqal_query_add_variable +rasqal_query_prepare +rasqal_query_execute +rasqal_query_print +rasqal_query_graph_pattern_visit +rasqal_query_write +rasqal_query_get_graph_pattern_sequence +rasqal_query_get_graph_pattern +rasqal_query_get_data_graph +rasqal_query_get_variable +rasqal_query_has_variable +rasqal_query_get_triple +rasqal_query_get_prefix +rasqal_query_get_construct_triple +rasqal_query_get_order_condition +rasqal_query_get_group_condition +rasqal_query_escape_counted_string +rasqal_query_iostream_write_escaped_counted_string +rasqal_query_get_group_conditions_sequence +rasqal_query_get_order_conditions_sequence +rasqal_query_get_wildcard +rasqal_query_get_verb +rasqal_query_set_user_data +rasqal_query_get_user_data +rasqal_query_verb_as_string +rasqal_query_get_construct_triples_sequence +rasqal_query_get_query_graph_pattern +rasqal_query_get_prefix_sequence +rasqal_query_get_triple_sequence +rasqal_query_get_all_variable_sequence +rasqal_query_get_anonymous_variable_sequence +rasqal_query_get_bound_variable_sequence +rasqal_query_get_data_graph_sequence +rasqal_query_set_offset +rasqal_query_get_offset +rasqal_query_set_limit +rasqal_query_get_limit +rasqal_query_set_explain +rasqal_query_get_explain +rasqal_query_set_distinct +rasqal_query_get_distinct +rasqal_query_get_feature +rasqal_query_set_feature +rasqal_query_set_warning_handler +rasqal_query_set_error_handler +rasqal_query_set_fatal_error_handler +rasqal_query_get_label +rasqal_query_get_name +rasqal_query_results_formats_check +rasqal_new_query_results_formatter +rasqal_new_query_results_formatter_by_mime_type +rasqal_query_results_formats_enumerate +rasqal_free_query_results_formatter +rasqal_query_results_formatter_get_mime_type diff --git a/redland/rasqal/rasqal2.map b/redland/rasqal/rasqal2.map deleted file mode 100644 index 622043ac984c..000000000000 --- a/redland/rasqal/rasqal2.map +++ /dev/null @@ -1,194 +0,0 @@ -UDK_3_0_0 { -global: -GetVersionInfo; -rasqal_xsd_decimal_set_string; -rasqal_xsd_decimal_print; -rasqal_xsd_decimal_as_counted_string; -rasqal_xsd_decimal_as_string; -rasqal_new_xsd_decimal; -rasqal_free_xsd_decimal; -rasqal_xsd_decimal_set_long; -rasqal_xsd_decimal_set_double; -rasqal_xsd_decimal_add; -rasqal_xsd_decimal_subtract; -rasqal_xsd_decimal_multiply; -rasqal_xsd_decimal_divide; -rasqal_xsd_decimal_negate; -rasqal_xsd_decimal_equals; -rasqal_xsd_decimal_compare; -rasqal_xsd_decimal_is_zero; -rasqal_xsd_decimal_get_double; -rasqal_set_triples_source_factory; -rasqal_new_variable; -rasqal_new_variable_typed; -rasqal_data_graph_print; -rasqal_prefix_print; -rasqal_new_data_graph; -rasqal_new_prefix; -rasqal_new_triple; -rasqal_new_triple_from_triple; -rasqal_new_0op_expression; -rasqal_new_1op_expression; -rasqal_new_2op_expression; -rasqal_new_3op_expression; -rasqal_new_string_op_expression; -rasqal_new_literal_expression; -rasqal_new_function_expression; -rasqal_new_cast_expression; -rasqal_free_variable; -rasqal_free_expression; -rasqal_free_data_graph; -rasqal_free_prefix; -rasqal_free_triple; -rasqal_expression_evaluate; -rasqal_variable_set_value; -rasqal_variable_print; -rasqal_expression_print; -rasqal_expression_print_op; -rasqal_triple_print; -rasqal_expression_foreach; -rasqal_expression_visit; -rasqal_new_expression_from_expression; -rasqal_triple_get_origin; -rasqal_triple_set_origin; -rasqal_features_enumerate; -rasqal_feature_from_uri; -rasqal_get_feature_count; -rasqal_feature_value_type; -rasqal_version_decimal; -rasqal_version_release; -rasqal_version_minor; -rasqal_version_major; -rasqal_version_string; -rasqal_home_url_string; -rasqal_license_string; -rasqal_copyright_string; -rasqal_short_copyright_string; -rasqal_init; -rasqal_finish; -rasqal_language_name_check; -rasqal_query_set_default_generate_bnodeid_parameters; -rasqal_free_memory; -rasqal_alloc_memory; -rasqal_calloc_memory; -rasqal_query_set_generate_bnodeid_handler; -rasqal_languages_enumerate; -rasqal_graph_pattern_add_constraint; -rasqal_graph_pattern_print; -rasqal_graph_pattern_add_sub_graph_pattern; -rasqal_graph_pattern_get_flags; -rasqal_graph_pattern_visit; -rasqal_graph_pattern_get_constraint; -rasqal_graph_pattern_get_triple; -rasqal_graph_pattern_get_sub_graph_pattern; -rasqal_graph_pattern_get_sub_graph_pattern_sequence; -rasqal_graph_pattern_get_index; -rasqal_graph_pattern_operator_as_string; -rasqal_graph_pattern_get_operator; -rasqal_graph_pattern_get_constraint_sequence; -rasqal_new_floating_literal; -rasqal_literal_compare; -rasqal_literal_equals; -rasqal_new_double_literal; -rasqal_new_integer_literal; -rasqal_new_float_literal; -rasqal_new_typed_literal; -rasqal_new_decimal_literal; -rasqal_new_decimal_literal_from_decimal; -rasqal_new_string_literal; -rasqal_new_uri_literal; -rasqal_new_boolean_literal; -rasqal_literal_as_node; -rasqal_free_literal; -rasqal_literal_print; -rasqal_literal_print_type; -rasqal_new_pattern_literal; -rasqal_new_simple_literal; -rasqal_new_variable_literal; -rasqal_literal_as_string; -rasqal_literal_as_string_flags; -rasqal_literal_value; -rasqal_literal_datatype; -rasqal_literal_as_variable; -rasqal_new_literal_from_literal; -rasqal_free_query_results; -rasqal_query_results_get_bindings; -rasqal_query_results_get_binding_value; -rasqal_query_results_get_binding_value_by_name; -rasqal_query_results_get_triple; -rasqal_query_results_next; -rasqal_query_results_next_triple; -rasqal_query_results_write; -rasqal_query_results_formatter_write; -rasqal_query_results_get_boolean; -rasqal_query_results_get_bindings_count; -rasqal_query_results_get_binding_name; -rasqal_query_results_finished; -rasqal_query_results_get_count; -rasqal_query_results_is_syntax; -rasqal_query_results_is_graph; -rasqal_query_results_is_boolean; -rasqal_query_results_is_bindings; -rasqal_new_query; -rasqal_free_query; -rasqal_query_set_feature_string; -rasqal_query_get_feature_string; -rasqal_query_add_data_graph; -rasqal_query_set_variable; -rasqal_query_add_prefix; -rasqal_query_add_variable; -rasqal_query_prepare; -rasqal_query_execute; -rasqal_query_print; -rasqal_query_graph_pattern_visit; -rasqal_query_write; -rasqal_query_get_graph_pattern_sequence; -rasqal_query_get_graph_pattern; -rasqal_query_get_data_graph; -rasqal_query_get_variable; -rasqal_query_has_variable; -rasqal_query_get_triple; -rasqal_query_get_prefix; -rasqal_query_get_construct_triple; -rasqal_query_get_order_condition; -rasqal_query_get_group_condition; -rasqal_query_escape_counted_string; -rasqal_query_iostream_write_escaped_counted_string; -rasqal_query_get_group_conditions_sequence; -rasqal_query_get_order_conditions_sequence; -rasqal_query_get_wildcard; -rasqal_query_get_verb; -rasqal_query_set_user_data; -rasqal_query_get_user_data; -rasqal_query_verb_as_string; -rasqal_query_get_construct_triples_sequence; -rasqal_query_get_query_graph_pattern; -rasqal_query_get_prefix_sequence; -rasqal_query_get_triple_sequence; -rasqal_query_get_all_variable_sequence; -rasqal_query_get_anonymous_variable_sequence; -rasqal_query_get_bound_variable_sequence; -rasqal_query_get_data_graph_sequence; -rasqal_query_set_offset; -rasqal_query_get_offset; -rasqal_query_set_limit; -rasqal_query_get_limit; -rasqal_query_set_explain; -rasqal_query_get_explain; -rasqal_query_set_distinct; -rasqal_query_get_distinct; -rasqal_query_get_feature; -rasqal_query_set_feature; -rasqal_query_set_warning_handler; -rasqal_query_set_error_handler; -rasqal_query_set_fatal_error_handler; -rasqal_query_get_label; -rasqal_query_get_name; -rasqal_query_results_formats_check; -rasqal_new_query_results_formatter; -rasqal_new_query_results_formatter_by_mime_type; -rasqal_query_results_formats_enumerate; -rasqal_query_results_formats_enumerate_full; -rasqal_free_query_results_formatter; -rasqal_query_results_formatter_get_mime_type; -}; diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk deleted file mode 100644 index 74420397cd73..000000000000 --- a/redland/redland/makefile.mk +++ /dev/null @@ -1,191 +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_redland - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(SYSTEM_REDLAND)" == "YES" -all: - @echo "An already available installation of Redland RDF should exist on your system." - @echo "Therefore the version provided here does not need to be built in addition." -.ENDIF - -# --- Files -------------------------------------------------------- - -.INCLUDE : ../redlandversion.mk - -REDLANDVERSION=1.0.8 - -TARFILE_NAME=redland-$(REDLANDVERSION) -TARFILE_MD5=ca66e26082cab8bb817185a116db809b - -ADDITIONAL_FILES=librdf/makefile.mk librdf/rdf_config.h - -OOO_PATCH_FILES= \ - $(TARFILE_NAME).patch.legal \ - $(TARFILE_NAME).patch.autotools \ - $(TARFILE_NAME).patch.dmake \ - $(TARFILE_NAME).patch.ooo_build \ - $(TARFILE_NAME).patch.win32 \ - redland-aix.patch - -.IF "$(OS)" != "WNT" -OOO_PATCH_FILES+= \ - $(TARFILE_NAME).patch.bundled-soname -.ENDIF - -PATCH_FILES=$(OOO_PATCH_FILES) \ - -.IF "$(OS)"=="ANDROID" -PATCH_FILES+=$(TARFILE_NAME).patch.no-soname -.ENDIF - -.IF "$(OS)"=="WNT" -.IF "$(COM)"=="GCC" -OOO_PATCH_FILES+=$(TARFILE_NAME).patch.mingw -redland_CC=$(CC) -mthreads -.IF "$(MINGW_SHARED_GCCLIB)"=="YES" -redland_CC+=-shared-libgcc -.ENDIF -redland_LIBS= - -redland_LDFLAGS=-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols -.IF "$(ILIB)"!="" -redland_LDFLAGS+= -L$(ILIB:s/;/ -L/) -.ENDIF - -CONFIGURE_DIR= -CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-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" CC="$(redland_CC)" CPPFLAGS="$(INCLUDE)" LDFLAGS="$(redland_LDFLAGS)" LIBS="$(redland_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)$/librdf -.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 "$(COM)"=="C52" && "$(CPU)"=="U" -CFLAGS=-m64 -.EXPORT: CFLAGS -.ENDIF - -# NB: SOLARDIR before SYSBASE, because linux SYSBASE contains obsolete libcrypto -CPPFLAGS+:=-I$(PWD)$/$(INCCOM) -I$(SOLARINCDIR)$/external -LDFLAGS+:=-L$(PWD)$/$(LB) -L$(SOLARLIBDIR) - -.IF "$(OS)"=="AIX" -LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) -.ENDIF - -.IF "$(SYSBASE)"!="" -CPPFLAGS+:=-I$(SYSBASE)$/usr$/include -.IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX" -LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl -.ENDIF -.ENDIF # "$(SYSBASE)"!="" - -.IF "$(OS)"=="MACOSX" -LDFLAGS+:=-Wl,-dylib_file,@loader_path/libraptor-lo.$(RAPTOR_MAJOR).dylib:$(PWD)/$(LB)/libraptor-lo.$(RAPTOR_MAJOR).dylib -.IF "$(SYSTEM_LIBXML)" != "YES" -LDFLAGS+:=-Wl,-dylib_file,@loader_path/../ure-link/lib/libxml2.2.dylib:$(SOLARLIBDIR)/libxml2.2.dylib -.ENDIF - -.ENDIF - -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 PATH="..$/..$/..$/bin:$$PATH" -CONFIGURE_FLAGS=--disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml -.IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID" -CFLAGS=-fvisibility=hidden -CONFIGURE_FLAGS+= --disable-shared -.ELSE -CONFIGURE_FLAGS+= --disable-static -.ENDIF -.IF "$(OS)"!="ANDROID" -CONFIGURE_FLAGS+= --with-threads -.ENDIF -.IF "$(OS)" == "MACOSX" -CONFIGURE_FLAGS += \ - --prefix=/@.__________________________________________________$(EXTRPATH) -.END -.IF "$(CROSS_COMPILING)"=="YES" -CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) -.ENDIF -BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) -BUILD_FLAGS+= -j$(EXTMAXPROCESS) -BUILD_DIR=$(CONFIGURE_DIR) -.ENDIF - - -OUT2INC+=librdf$/*.h - -.IF "$(OS)"=="MACOSX" -OUT2LIB+=librdf$/.libs$/librdf-lo.$(REDLAND_MAJOR).dylib -.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID" -OUT2LIB+=librdf$/.libs$/librdf.a -.ELIF "$(OS)"=="WNT" -.IF "$(COM)"=="GCC" -OUT2LIB+=librdf$/.libs$/*.a -OUT2BIN+=librdf$/.libs$/*.dll -.ELSE -# if we use dmake, this is done automagically -.ENDIF -.ELSE -OUT2LIB+=librdf$/.libs$/librdf-lo.so.$(REDLAND_MAJOR) -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk -.INCLUDE : tg_ext.mk - diff --git a/redland/redland/rdf.def b/redland/redland/rdf.def new file mode 100644 index 000000000000..3164107cb2c2 --- /dev/null +++ b/redland/redland/rdf.def @@ -0,0 +1,314 @@ +LIBRARY RDF +EXPORTS +librdf_get_concept_resource_by_index +librdf_get_concept_uri_by_index +librdf_new_digest +librdf_digest_update_string +librdf_digest_final +librdf_digest_print +librdf_digest_to_string +librdf_free_digest +librdf_digest_get_digest_length +librdf_digest_get_digest +librdf_digest_update +librdf_digest_init +librdf_new_hash_from_string +librdf_new_hash_from_array_of_strings +librdf_hash_get_del +librdf_hash_get_as_boolean +librdf_hash_get_as_long +librdf_hash_get +librdf_hash_interpret_template +librdf_hash_print +librdf_hash_print_keys +librdf_hash_print_values +librdf_new_hash_from_hash +librdf_free_hash +librdf_hash_put_strings +librdf_version_decimal +librdf_version_release +librdf_version_minor +librdf_version_major +librdf_version_string +librdf_copyright_string +librdf_short_copyright_string +librdf_init_world +librdf_new_world +librdf_destroy_world +librdf_free_world +librdf_world_open +librdf_world_init_mutex +librdf_world_set_feature +librdf_world_get_feature +librdf_world_set_digest +librdf_world_set_logger +librdf_world_set_warning +librdf_world_set_error +librdf_iterator_have_elements +librdf_iterator_end +librdf_iterator_next +librdf_iterator_get_object +librdf_iterator_get_context +librdf_iterator_get_key +librdf_iterator_get_value +librdf_free_iterator +librdf_iterator_add_map +librdf_new_iterator +librdf_new_empty_iterator +librdf_log_message_locator +librdf_log_message_message +librdf_log_message_facility +librdf_log_message_level +librdf_log_message_code +librdf_new_model +librdf_new_model_with_options +librdf_model_enumerate +librdf_free_model +librdf_model_add_typed_literal_statement +librdf_model_add_string_literal_statement +librdf_model_add +librdf_model_get_source +librdf_model_get_arc +librdf_model_get_target +librdf_model_add_submodel +librdf_model_remove_submodel +librdf_model_print +librdf_model_add_statement +librdf_model_remove_statement +librdf_model_contains_statement +librdf_model_context_add_statements +librdf_model_context_add_statement +librdf_model_context_remove_statements +librdf_model_context_remove_statement +librdf_model_find_statements_with_options +librdf_model_find_statements_in_context +librdf_new_model_from_model +librdf_model_size +librdf_model_add_statements +librdf_model_as_stream +librdf_model_serialise +librdf_model_find_statements +librdf_model_get_sources +librdf_model_get_arcs +librdf_model_get_targets +librdf_model_get_arcs_in +librdf_model_get_arcs_out +librdf_model_has_arc_in +librdf_model_has_arc_out +librdf_model_contains_context +librdf_model_context_as_stream +librdf_model_context_serialize +librdf_model_query_execute +librdf_model_sync +librdf_model_get_storage +librdf_model_get_contexts +librdf_model_get_feature +librdf_model_set_feature +librdf_model_load +librdf_model_to_string +librdf_model_to_counted_string +librdf_model_transaction_get_handle +librdf_model_transaction_rollback +librdf_model_transaction_commit +librdf_model_transaction_start_with_handle +librdf_model_transaction_start +librdf_new_node_from_uri_local_name +librdf_new_node_from_normalised_uri_string +librdf_node_decode +librdf_new_node_from_uri_string +librdf_new_node_from_uri +librdf_new_node_from_literal +librdf_new_node_from_typed_literal +librdf_new_node_from_typed_counted_literal +librdf_new_node +librdf_new_node_from_blank_identifier +librdf_free_node +librdf_node_get_literal_value_as_latin1 +librdf_node_get_literal_value_is_wf_xml +librdf_node_get_li_ordinal +librdf_node_print +librdf_node_to_string +librdf_node_to_counted_string +librdf_node_encode +librdf_node_static_iterator_create +librdf_new_node_from_node +librdf_node_get_uri +librdf_node_get_type +librdf_node_get_literal_value +librdf_node_get_literal_value_as_counted_string +librdf_node_get_literal_value_language +librdf_node_get_literal_value_datatype_uri +librdf_node_get_blank_identifier +librdf_node_is_resource +librdf_node_is_literal +librdf_node_is_blank +librdf_node_equals +librdf_parser_register_factory +librdf_new_parser +librdf_parser_enumerate +librdf_new_parser_from_factory +librdf_free_parser +librdf_parser_parse_as_stream +librdf_parser_parse_into_model +librdf_parser_parse_string_as_stream +librdf_parser_parse_string_into_model +librdf_parser_parse_counted_string_as_stream +librdf_parser_parse_counted_string_into_model +librdf_parser_get_feature +librdf_parser_set_feature +librdf_parser_guess_name +librdf_parser_get_uri_filter +librdf_parser_set_uri_filter +librdf_parser_get_namespaces_seen_count +librdf_parser_get_namespaces_seen_uri +librdf_parser_get_namespaces_seen_prefix +librdf_parser_get_accept_header +librdf_parser_set_warning +librdf_parser_set_error +librdf_query_register_factory +librdf_new_query +librdf_new_query_from_query +librdf_new_query_from_factory +librdf_free_query +librdf_query_execute +librdf_query_set_offset +librdf_query_get_offset +librdf_query_set_limit +librdf_query_get_limit +librdf_free_query_results +librdf_query_results_to_string +librdf_query_results_to_counted_string +librdf_query_results_to_file +librdf_query_results_to_file_handle +librdf_query_results_get_count +librdf_query_results_next +librdf_query_results_finished +librdf_query_results_get_bindings +librdf_query_results_get_binding_value +librdf_query_results_get_binding_name +librdf_query_results_get_binding_value_by_name +librdf_query_results_get_bindings_count +librdf_query_results_is_bindings +librdf_query_results_is_boolean +librdf_query_results_is_graph +librdf_query_results_is_syntax +librdf_query_results_get_boolean +librdf_query_results_as_stream +librdf_query_results_formats_check +librdf_query_results_formats_enumerate +librdf_query_results_formatter_write +librdf_free_query_results_formatter +librdf_new_query_results_formatter_by_mime_type +librdf_new_query_results_formatter +librdf_serializer_register_factory +librdf_new_serializer +librdf_serializer_enumerate +librdf_new_serializer_from_factory +librdf_free_serializer +librdf_serializer_serialize_stream_to_file +librdf_serializer_serialize_model_to_file +librdf_serializer_set_namespace +librdf_serializer_serialize_stream_to_file_handle +librdf_serializer_serialize_model +librdf_serializer_serialize_model_to_file_handle +librdf_serializer_serialize_stream_to_counted_string +librdf_serializer_serialize_model_to_counted_string +librdf_serializer_serialize_stream_to_string +librdf_serializer_serialize_model_to_string +librdf_serializer_serialize_stream_to_iostream +librdf_serializer_serialize_model_to_iostream +librdf_serializer_get_feature +librdf_serializer_set_feature +librdf_serializer_set_warning +librdf_serializer_set_error +librdf_new_statement_from_statement +librdf_new_statement_from_nodes +librdf_new_statement +librdf_statement_init +librdf_free_statement +librdf_statement_is_complete +librdf_statement_print +librdf_statement_to_string +librdf_statement_equals +librdf_statement_match +librdf_statement_encode +librdf_statement_encode_parts +librdf_statement_decode +librdf_statement_decode_parts +librdf_statement_clear +librdf_statement_get_subject +librdf_statement_set_subject +librdf_statement_get_predicate +librdf_statement_set_predicate +librdf_statement_get_object +librdf_statement_set_object +librdf_storage_register_factory +librdf_new_storage +librdf_new_storage_with_options +librdf_storage_enumerate +librdf_new_storage_from_factory +librdf_storage_context_add_statements +librdf_storage_add_statements +librdf_storage_context_add_statement +librdf_storage_add_statement +librdf_storage_contains_statement +librdf_storage_find_statements +librdf_storage_has_arc_in +librdf_storage_get_sources +librdf_storage_get_arcs +librdf_storage_has_arc_out +librdf_storage_get_targets +librdf_storage_get_arcs_in +librdf_storage_get_arcs_out +librdf_new_storage_from_storage +librdf_storage_remove_reference +librdf_free_storage +librdf_storage_context_remove_statements +librdf_storage_find_statements_with_options +librdf_storage_find_statements_in_context +librdf_storage_open +librdf_storage_close +librdf_storage_size +librdf_storage_remove_statement +librdf_storage_context_remove_statement +librdf_storage_context_serialise +librdf_storage_context_as_stream +librdf_storage_supports_query +librdf_storage_query_execute +librdf_storage_sync +librdf_storage_get_contexts +librdf_storage_get_feature +librdf_storage_set_feature +librdf_storage_transaction_get_handle +librdf_storage_transaction_rollback +librdf_storage_transaction_commit +librdf_storage_transaction_start_with_handle +librdf_storage_transaction_start +librdf_storage_serialise +librdf_storage_add_reference +librdf_free_stream +librdf_stream_print +librdf_stream_end +librdf_stream_next +librdf_stream_get_object +librdf_stream_get_context +librdf_stream_add_map +librdf_new_stream_from_node_iterator +librdf_new_stream +librdf_new_empty_stream +librdf_new_uri_from_uri_local_name +librdf_new_uri_normalised_to_base +librdf_new_uri_relative_to_base +librdf_new_uri_from_filename +librdf_new_uri +librdf_free_uri +librdf_uri_print +librdf_uri_to_string +librdf_uri_to_counted_string +librdf_uri_is_file_uri +librdf_uri_to_filename +librdf_new_uri_from_uri +librdf_uri_as_string +librdf_uri_as_counted_string +librdf_uri_equals +librdf_uri_compare diff --git a/redland/redland/redland-aix.patch b/redland/redland/redland-1.0.8.aix.patch index 20d52e4787f0..20d52e4787f0 100644 --- a/redland/redland/redland-aix.patch +++ b/redland/redland/redland-1.0.8.aix.patch diff --git a/redland/redland/redland-1.0.8.patch.autotools b/redland/redland/redland-1.0.8.autotools.patch index c46b69dadb2e..c46b69dadb2e 100644 --- a/redland/redland/redland-1.0.8.patch.autotools +++ b/redland/redland/redland-1.0.8.autotools.patch diff --git a/redland/redland/redland-1.0.8.patch.bundled-soname b/redland/redland/redland-1.0.8.bundled-soname.patch index 68c9dfed19d2..68c9dfed19d2 100644 --- a/redland/redland/redland-1.0.8.patch.bundled-soname +++ b/redland/redland/redland-1.0.8.bundled-soname.patch diff --git a/redland/redland/redland-1.0.8.patch.legal b/redland/redland/redland-1.0.8.legal.patch index 9e9a25bef78e..9e9a25bef78e 100644 --- a/redland/redland/redland-1.0.8.patch.legal +++ b/redland/redland/redland-1.0.8.legal.patch diff --git a/redland/redland/redland-1.0.8.patch.mingw b/redland/redland/redland-1.0.8.mingw.patch index a32621b51acc..a32621b51acc 100644 --- a/redland/redland/redland-1.0.8.patch.mingw +++ b/redland/redland/redland-1.0.8.mingw.patch diff --git a/redland/redland/redland-1.0.8.patch.no-soname b/redland/redland/redland-1.0.8.no-soname.patch index 224a7046f817..224a7046f817 100644 --- a/redland/redland/redland-1.0.8.patch.no-soname +++ b/redland/redland/redland-1.0.8.no-soname.patch diff --git a/redland/redland/redland-1.0.8.patch.ooo_build b/redland/redland/redland-1.0.8.ooo_build.patch index 805a88d49ea2..805a88d49ea2 100644 --- a/redland/redland/redland-1.0.8.patch.ooo_build +++ b/redland/redland/redland-1.0.8.ooo_build.patch diff --git a/redland/redland/redland-1.0.8.patch.dmake b/redland/redland/redland-1.0.8.patch.dmake deleted file mode 100644 index 34ba51d1c29a..000000000000 --- a/redland/redland/redland-1.0.8.patch.dmake +++ /dev/null @@ -1,115 +0,0 @@ ---- misc/redland-1.0.8/librdf/makefile.mk Mon Jun 16 19:32:46 2008 -+++ misc/build/redland-1.0.8/librdf/makefile.mk Mon Jun 16 19:26:20 2008 -@@ -1,1 +1,111 @@ --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=librdf -+LIBTARGET=NO -+UWINAPILIB= -+ -+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE -+ -+ -+# --- Settings ----------------------------------------------------- -+ -+.INCLUDE : settings.mk -+ -+CDEFS+=-DLIBRDF_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS -+ -+# --- Files -------------------------------------------------------- -+ -+SLOFILES = \ -+ $(SLO)$/rdf_concepts.obj \ -+ $(SLO)$/rdf_digest.obj \ -+ $(SLO)$/rdf_digest_md5.obj \ -+ $(SLO)$/rdf_digest_openssl.obj \ -+ $(SLO)$/rdf_digest_sha1.obj \ -+ $(SLO)$/rdf_files.obj \ -+ $(SLO)$/rdf_hash.obj \ -+ $(SLO)$/rdf_hash_cursor.obj \ -+ $(SLO)$/rdf_hash_memory.obj \ -+ $(SLO)$/rdf_heuristics.obj \ -+ $(SLO)$/rdf_init.obj \ -+ $(SLO)$/rdf_iterator.obj \ -+ $(SLO)$/rdf_list.obj \ -+ $(SLO)$/rdf_log.obj \ -+ $(SLO)$/rdf_model.obj \ -+ $(SLO)$/rdf_model_storage.obj \ -+ $(SLO)$/rdf_node.obj \ -+ $(SLO)$/rdf_parser.obj \ -+ $(SLO)$/rdf_parser_raptor.obj \ -+ $(SLO)$/rdf_query.obj \ -+ $(SLO)$/rdf_query_rasqal.obj \ -+ $(SLO)$/rdf_query_results.obj \ -+ $(SLO)$/rdf_query_triples.obj \ -+ $(SLO)$/rdf_serializer.obj \ -+ $(SLO)$/rdf_serializer_raptor.obj \ -+ $(SLO)$/rdf_statement.obj \ -+ $(SLO)$/rdf_storage.obj \ -+ $(SLO)$/rdf_storage_file.obj \ -+ $(SLO)$/rdf_storage_list.obj \ -+ $(SLO)$/rdf_storage_hashes.obj \ -+ $(SLO)$/rdf_stream.obj \ -+ $(SLO)$/rdf_uri.obj \ -+ $(SLO)$/rdf_utf8.obj \ -+ -+ -+# $(SLO)$/rdf_hash_bdb.obj \ -+# $(SLO)$/rdf_storage_mysql.obj \ -+# $(SLO)$/rdf_storage_sqlite.obj \ -+ -+ -+SHL1DEPN= makefile.mk -+SHL1OBJS= $(SLOFILES) -+ -+#SHL1TARGET= $(TARGET)$(DLLPOSTFIX) -+SHL1TARGET= $(TARGET) -+SHL1IMPLIB= $(TARGET) -+SHL1USE_EXPORTS=name -+ -+#SHL1VERSIONMAP=../service/exports.map -+SHL1DEF=$(MISC)$/$(SHL1TARGET).def -+DEF1NAME=$(SHL1TARGET) -+ -+SHL1STDLIBS= \ -+ $(OPENSSLLIB) \ -+ $(PRJ)$/$(INPATH)$/lib$/libraptor.lib \ -+ $(PRJ)$/$(INPATH)$/lib$/librasqal.lib \ -+ -+ -+#$(LIBXML2LIB) \ -+# $(XSLTLIB) \ -+ -+# --- Targets ------------------------------------------------------ -+ -+.INCLUDE : target.mk -+ diff --git a/redland/redland/redland-1.0.8.patch.win32 b/redland/redland/redland-1.0.8.win32.patch index 41d3503dcc98..41d3503dcc98 100644 --- a/redland/redland/redland-1.0.8.patch.win32 +++ b/redland/redland/redland-1.0.8.win32.patch diff --git a/redland/redland/redland2.map b/redland/redland/redland2.map deleted file mode 100644 index 5798f461684b..000000000000 --- a/redland/redland/redland2.map +++ /dev/null @@ -1,316 +0,0 @@ -UDK_3_0_0 { -global: -GetVersionInfo; -librdf_get_concept_resource_by_index; -librdf_get_concept_uri_by_index; -librdf_new_digest; -librdf_digest_update_string; -librdf_digest_final; -librdf_digest_print; -librdf_digest_to_string; -librdf_free_digest; -librdf_digest_get_digest_length; -librdf_digest_get_digest; -librdf_digest_update; -librdf_digest_init; -librdf_new_hash_from_string; -librdf_new_hash_from_array_of_strings; -librdf_hash_get_del; -librdf_hash_get_as_boolean; -librdf_hash_get_as_long; -librdf_hash_get; -librdf_hash_interpret_template; -librdf_hash_print; -librdf_hash_print_keys; -librdf_hash_print_values; -librdf_new_hash_from_hash; -librdf_free_hash; -librdf_hash_put_strings; -librdf_version_decimal; -librdf_version_release; -librdf_version_minor; -librdf_version_major; -librdf_version_string; -librdf_copyright_string; -librdf_short_copyright_string; -librdf_init_world; -librdf_new_world; -librdf_destroy_world; -librdf_free_world; -librdf_world_open; -librdf_world_init_mutex; -librdf_world_set_feature; -librdf_world_get_feature; -librdf_world_set_digest; -librdf_world_set_logger; -librdf_world_set_warning; -librdf_world_set_error; -librdf_iterator_have_elements; -librdf_iterator_end; -librdf_iterator_next; -librdf_iterator_get_object; -librdf_iterator_get_context; -librdf_iterator_get_key; -librdf_iterator_get_value; -librdf_free_iterator; -librdf_iterator_add_map; -librdf_new_iterator; -librdf_new_empty_iterator; -librdf_log_message_locator; -librdf_log_message_message; -librdf_log_message_facility; -librdf_log_message_level; -librdf_log_message_code; -librdf_new_model; -librdf_new_model_with_options; -librdf_model_enumerate; -librdf_free_model; -librdf_model_add_typed_literal_statement; -librdf_model_add_string_literal_statement; -librdf_model_add; -librdf_model_get_source; -librdf_model_get_arc; -librdf_model_get_target; -librdf_model_add_submodel; -librdf_model_remove_submodel; -librdf_model_print; -librdf_model_add_statement; -librdf_model_remove_statement; -librdf_model_contains_statement; -librdf_model_context_add_statements; -librdf_model_context_add_statement; -librdf_model_context_remove_statements; -librdf_model_context_remove_statement; -librdf_model_find_statements_with_options; -librdf_model_find_statements_in_context; -librdf_new_model_from_model; -librdf_model_size; -librdf_model_add_statements; -librdf_model_as_stream; -librdf_model_serialise; -librdf_model_find_statements; -librdf_model_get_sources; -librdf_model_get_arcs; -librdf_model_get_targets; -librdf_model_get_arcs_in; -librdf_model_get_arcs_out; -librdf_model_has_arc_in; -librdf_model_has_arc_out; -librdf_model_contains_context; -librdf_model_context_as_stream; -librdf_model_context_serialize; -librdf_model_query_execute; -librdf_model_sync; -librdf_model_get_storage; -librdf_model_get_contexts; -librdf_model_get_feature; -librdf_model_set_feature; -librdf_model_load; -librdf_model_to_string; -librdf_model_to_counted_string; -librdf_model_transaction_get_handle; -librdf_model_transaction_rollback; -librdf_model_transaction_commit; -librdf_model_transaction_start_with_handle; -librdf_model_transaction_start; -librdf_new_node_from_uri_local_name; -librdf_new_node_from_normalised_uri_string; -librdf_node_decode; -librdf_new_node_from_uri_string; -librdf_new_node_from_uri; -librdf_new_node_from_literal; -librdf_new_node_from_typed_literal; -librdf_new_node_from_typed_counted_literal; -librdf_new_node; -librdf_new_node_from_blank_identifier; -librdf_free_node; -librdf_node_get_literal_value_as_latin1; -librdf_node_get_literal_value_is_wf_xml; -librdf_node_get_li_ordinal; -librdf_node_print; -librdf_node_to_string; -librdf_node_to_counted_string; -librdf_node_encode; -librdf_node_static_iterator_create; -librdf_new_node_from_node; -librdf_node_get_uri; -librdf_node_get_type; -librdf_node_get_literal_value; -librdf_node_get_literal_value_as_counted_string; -librdf_node_get_literal_value_language; -librdf_node_get_literal_value_datatype_uri; -librdf_node_get_blank_identifier; -librdf_node_is_resource; -librdf_node_is_literal; -librdf_node_is_blank; -librdf_node_equals; -librdf_parser_register_factory; -librdf_new_parser; -librdf_parser_enumerate; -librdf_new_parser_from_factory; -librdf_free_parser; -librdf_parser_parse_as_stream; -librdf_parser_parse_into_model; -librdf_parser_parse_string_as_stream; -librdf_parser_parse_string_into_model; -librdf_parser_parse_counted_string_as_stream; -librdf_parser_parse_counted_string_into_model; -librdf_parser_get_feature; -librdf_parser_set_feature; -librdf_parser_guess_name; -librdf_parser_get_uri_filter; -librdf_parser_set_uri_filter; -librdf_parser_get_namespaces_seen_count; -librdf_parser_get_namespaces_seen_uri; -librdf_parser_get_namespaces_seen_prefix; -librdf_parser_get_accept_header; -librdf_parser_set_warning; -librdf_parser_set_error; -librdf_query_register_factory; -librdf_new_query; -librdf_new_query_from_query; -librdf_new_query_from_factory; -librdf_free_query; -librdf_query_execute; -librdf_query_set_offset; -librdf_query_get_offset; -librdf_query_set_limit; -librdf_query_get_limit; -librdf_free_query_results; -librdf_query_results_to_string; -librdf_query_results_to_counted_string; -librdf_query_results_to_file; -librdf_query_results_to_file_handle; -librdf_query_results_get_count; -librdf_query_results_next; -librdf_query_results_finished; -librdf_query_results_get_bindings; -librdf_query_results_get_binding_value; -librdf_query_results_get_binding_name; -librdf_query_results_get_binding_value_by_name; -librdf_query_results_get_bindings_count; -librdf_query_results_is_bindings; -librdf_query_results_is_boolean; -librdf_query_results_is_graph; -librdf_query_results_is_syntax; -librdf_query_results_get_boolean; -librdf_query_results_as_stream; -librdf_query_results_formats_check; -librdf_query_results_formats_enumerate; -librdf_query_results_formatter_write; -librdf_free_query_results_formatter; -librdf_new_query_results_formatter_by_mime_type; -librdf_new_query_results_formatter; -librdf_serializer_register_factory; -librdf_new_serializer; -librdf_serializer_enumerate; -librdf_new_serializer_from_factory; -librdf_free_serializer; -librdf_serializer_serialize_stream_to_file; -librdf_serializer_serialize_model_to_file; -librdf_serializer_set_namespace; -librdf_serializer_serialize_stream_to_file_handle; -librdf_serializer_serialize_model; -librdf_serializer_serialize_model_to_file_handle; -librdf_serializer_serialize_stream_to_counted_string; -librdf_serializer_serialize_model_to_counted_string; -librdf_serializer_serialize_stream_to_string; -librdf_serializer_serialize_model_to_string; -librdf_serializer_serialize_stream_to_iostream; -librdf_serializer_serialize_model_to_iostream; -librdf_serializer_get_feature; -librdf_serializer_set_feature; -librdf_serializer_set_warning; -librdf_serializer_set_error; -librdf_new_statement_from_statement; -librdf_new_statement_from_nodes; -librdf_new_statement; -librdf_statement_init; -librdf_free_statement; -librdf_statement_is_complete; -librdf_statement_print; -librdf_statement_to_string; -librdf_statement_equals; -librdf_statement_match; -librdf_statement_encode; -librdf_statement_encode_parts; -librdf_statement_decode; -librdf_statement_decode_parts; -librdf_statement_clear; -librdf_statement_get_subject; -librdf_statement_set_subject; -librdf_statement_get_predicate; -librdf_statement_set_predicate; -librdf_statement_get_object; -librdf_statement_set_object; -librdf_storage_register_factory; -librdf_new_storage; -librdf_new_storage_with_options; -librdf_storage_enumerate; -librdf_new_storage_from_factory; -librdf_storage_context_add_statements; -librdf_storage_add_statements; -librdf_storage_context_add_statement; -librdf_storage_add_statement; -librdf_storage_contains_statement; -librdf_storage_find_statements; -librdf_storage_has_arc_in; -librdf_storage_get_sources; -librdf_storage_get_arcs; -librdf_storage_has_arc_out; -librdf_storage_get_targets; -librdf_storage_get_arcs_in; -librdf_storage_get_arcs_out; -librdf_new_storage_from_storage; -librdf_storage_remove_reference; -librdf_free_storage; -librdf_storage_context_remove_statements; -librdf_storage_find_statements_with_options; -librdf_storage_find_statements_in_context; -librdf_storage_open; -librdf_storage_close; -librdf_storage_size; -librdf_storage_remove_statement; -librdf_storage_context_remove_statement; -librdf_storage_context_serialise; -librdf_storage_context_as_stream; -librdf_storage_supports_query; -librdf_storage_query_execute; -librdf_storage_sync; -librdf_storage_get_contexts; -librdf_storage_get_feature; -librdf_storage_set_feature; -librdf_storage_transaction_get_handle; -librdf_storage_transaction_rollback; -librdf_storage_transaction_commit; -librdf_storage_transaction_start_with_handle; -librdf_storage_transaction_start; -librdf_storage_serialise; -librdf_storage_add_reference; -librdf_free_stream; -librdf_stream_print; -librdf_stream_end; -librdf_stream_next; -librdf_stream_get_object; -librdf_stream_get_context; -librdf_stream_add_map; -librdf_new_stream_from_node_iterator; -librdf_new_stream; -librdf_new_empty_stream; -librdf_new_uri_from_uri_local_name; -librdf_new_uri_normalised_to_base; -librdf_new_uri_relative_to_base; -librdf_new_uri_from_filename; -librdf_new_uri; -librdf_free_uri; -librdf_uri_print; -librdf_uri_to_string; -librdf_uri_to_counted_string; -librdf_uri_is_file_uri; -librdf_uri_to_filename; -librdf_new_uri_from_uri; -librdf_uri_as_string; -librdf_uri_as_counted_string; -librdf_uri_equals; -librdf_uri_compare; -}; diff --git a/redland/redlandversion.mk b/redland/redlandversion.mk deleted file mode 100644 index e5389da3b419..000000000000 --- a/redland/redlandversion.mk +++ /dev/null @@ -1,32 +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. -# -#************************************************************************* - -RAPTOR_MAJOR=1 -RASQAL_MAJOR=1 -# redland has no stable abi -REDLAND_MAJOR=0 - diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index f3e4015b6fe9..8c9a84d5b819 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -170,7 +170,6 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\ endif ifneq ($(SYSTEM_REDLAND),YES) -include $(OUTDIR)/inc/redlandversion.mk $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\ -DRAPTOR_MAJOR=$(RAPTOR_MAJOR) \ diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index 942388219e71..e0de3082fa23 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : EXPAT:expat FONTCONFIG:fontconfig LIBXML2:libxml2 LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python3 REDLAND:redland XPDF:xpdf external solenv soltools NULL +tb tail_build : EXPAT:expat FONTCONFIG:fontconfig LIBXML2:libxml2 LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python3 XPDF:xpdf external solenv soltools NULL tb tail_build\prj nmake - all tb_prj NULL diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk index 348b919dce17..60f5b96f9823 100644 --- a/unoxml/Library_unordf.mk +++ b/unoxml/Library_unordf.mk @@ -35,9 +35,14 @@ $(eval $(call gb_Library_use_libraries,unordf,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_use_externals,unordf,librdf)) -$(eval $(call gb_Library_use_externals,unordf,libxslt)) -$(eval $(call gb_Library_use_externals,unordf,libxml2)) +$(eval $(call gb_Library_use_externals,unordf,\ + librdf \ + redland_headers \ + raptor_headers \ + rasqal_headers \ + libxslt \ + libxml2 \ +)) $(eval $(call gb_Library_add_exception_objects,unordf,\ unoxml/source/rdf/CBlankNode \ |