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, 36 insertions, 36 deletions

diff --git a/redland/Library_rdf.mk b/redland/Library_rdf.mk
index a4a3140bcf38..6fd3dd0af3df 100644
--- a/redland/Library_rdf.mk
+++ b/redland/Library_rdf.mk
@@ -14,13 +14,11 @@ $(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 \
+	raptor2 \
 	rasqal \
 ))
 
 $(eval $(call gb_Library_use_externals,rdf,\
-	openssl \
-	openssl_headers \
 	raptor_headers \
 	rasqal_headers \
 ))
@@ -39,39 +37,41 @@ $(eval $(call gb_Library_add_defs,rdf,\
 ))
 
 $(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 \
+	UnpackedTarball/redland/src/rdf_concepts \
+	UnpackedTarball/redland/src/rdf_digest \
+	UnpackedTarball/redland/src/rdf_digest_md5 \
+	UnpackedTarball/redland/src/rdf_digest_sha1 \
+	UnpackedTarball/redland/src/rdf_files \
+	UnpackedTarball/redland/src/rdf_hash \
+	UnpackedTarball/redland/src/rdf_hash_cursor \
+	UnpackedTarball/redland/src/rdf_hash_memory \
+	UnpackedTarball/redland/src/rdf_heuristics \
+	UnpackedTarball/redland/src/rdf_init \
+	UnpackedTarball/redland/src/rdf_iterator \
+	UnpackedTarball/redland/src/rdf_list \
+	UnpackedTarball/redland/src/rdf_log \
+	UnpackedTarball/redland/src/rdf_model \
+	UnpackedTarball/redland/src/rdf_model_storage \
+	UnpackedTarball/redland/src/rdf_node \
+	UnpackedTarball/redland/src/rdf_node_common \
+	UnpackedTarball/redland/src/rdf_parser \
+	UnpackedTarball/redland/src/rdf_parser_raptor \
+	UnpackedTarball/redland/src/rdf_raptor \
+	UnpackedTarball/redland/src/rdf_query \
+	UnpackedTarball/redland/src/rdf_query_rasqal \
+	UnpackedTarball/redland/src/rdf_query_results \
+	UnpackedTarball/redland/src/rdf_serializer \
+	UnpackedTarball/redland/src/rdf_serializer_raptor \
+	UnpackedTarball/redland/src/rdf_statement \
+	UnpackedTarball/redland/src/rdf_statement_common \
+	UnpackedTarball/redland/src/rdf_storage \
+	UnpackedTarball/redland/src/rdf_storage_file \
+	UnpackedTarball/redland/src/rdf_storage_list \
+	UnpackedTarball/redland/src/rdf_storage_hashes \
+	UnpackedTarball/redland/src/rdf_storage_trees \
+	UnpackedTarball/redland/src/rdf_stream \
+	UnpackedTarball/redland/src/rdf_uri \
+	UnpackedTarball/redland/src/rdf_utf8 \
 ))
 
 # vim: set noet sw=4 ts=4: