Easter Bunny brings new redland tarballs

upgrade raptor to 2.0.9, rasqal to 0.9.30, redland to 1.0.16:
- new raptor depends on libxml2 version 2.6.27 and thus will _not_
build against system libxml2 on Mac OS X 10.4/10.5
- stop delivering raptor-config/rasqal-config, set env vars instead
(which unfortunately requires patching configures, TODO: upstream that)
- remove redundant configure flags
- stop passing -Wl,no-inhibit-exec (causes HP-UX code to be built on Linux)
- disable new rasqal build deps:
--with-uuid-library=internal --with-digest-library=internal
- disable redland "libltdl" nonsense via --disable-modular
- fortunately openssl digest support has been removed too
- drop raptor-1.4.18.ooo_build.patch, set RAPTOR2_CFLAGS/LIBS instead
- drop raptor-1.4.18.autotools.patch:
+ FreeBSD parts moved to raptor-freebsd.patch.1
+ Android parts obsolete
+ don't know about the MinGW part (TODO)
- from drop raptor-1.4.18.mingw.patch dropped the part defining parsers
to be built, done via --enable-parsers
- drop redland/raptor/raptor-1.4.18.cross.patch:
the vsnprintf check is now done at runtime, and expat has been removed
- drop raptor-1.4.18.aix.patch,redland-1.0.8.aix.patch:
presumably don't need special check for V7BETA since it's released now
- drop raptor-1.4.18.rindex.patch, index/rindex no longer used
- drop raptor-1.4.18.entities.patch, fixed upstream in 2.0.7
- drop raptor-1.4.18.fixes.patch, fixed upstream in 2.0.9
- drop raptor-1.4.18.{libxml,libxslt}.patch: TODO
- drop {raptor-1.4.18,rasqal-0.9.16,redland-1.0.8}.legal.patch:
we don't care any more about Sun legal dept.
- drop rasqal-0.9.16.ooo_build.patch, set RASQAL_CFLAGS/LIBS instead
- drop rasqal-0.9.16.autotools.patch:
+ FreeBSD parts moved to rasqal-freebsd.patch.1
+ Android parts obsolete
+ MinGW part only for cygwin build
- drop redland-1.0.8.autotools.patch:
+ FreeBSD parts moved to redland-freebsd.patch.1
+ Android parts obsolete
+ don't know about the MinGW part (TODO)
- drop redland-1.0.8.ooo_build.patch,
hopefully not necessary to disable utils build

Change-Id: I9cc44928ba87392d69e809abe2236cec0e4a508a
Reviewed-on: https://gerrit.libreoffice.org/3154
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 64c2b4da354d..295058f25baa 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -878,7 +878,7 @@ else # !SYSTEM_REDLAND
 
 define gb_LinkTarget__use_redland_headers
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,redland)/librdf \
+	-I$(call gb_UnpackedTarball_get_dir,redland)/src \
 	$$(INCLUDE) \
 )
 
@@ -913,7 +913,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\
 
 ifeq ($(OS),MACOSX)
 
-$(call gb_LinkTarget_add_libs,$(1),$(foreach replaceme,librasqal-lo.1 libraptor-lo.1,-dylib_file @loader_path/$(replaceme).dylib:$(gb_Library_OUTDIRLOCATION)/$(replaceme).dylib))
+$(call gb_LinkTarget_add_libs,$(1),$(foreach replaceme,librasqal-lo.$(RASQAL_MAJOR) libraptor2-lo.$(RAPTOR_MAJOR),-dylib_file @loader_path/$(replaceme).dylib:$(gb_Library_OUTDIRLOCATION)/$(replaceme).dylib))
 
 endif
 
@@ -924,14 +924,14 @@ else # ANDROID
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 	rdf \
 	rasqal \
-	raptor \
+	raptor2 \
 ))
 
 define gb_LinkTarget__use_librdf
 $(call gb_LinkTarget_use_static_libraries,$(1),\
 	rdf \
 	rasqal \
-	raptor \
+	raptor2 \
 	crypto \
 )