diff options
Diffstat (limited to 'external/redland/redland')
| -rw-r--r-- | external/redland/redland/clang-cl.patch | 20 | ||||
| -rw-r--r-- | external/redland/redland/librdf.h | 434 | ||||
| -rw-r--r-- | external/redland/redland/libtool.patch | 27 | ||||
| -rw-r--r-- | external/redland/redland/redland-android.patch.1 | 14 | ||||
| -rw-r--r-- | external/redland/redland/redland-bundled-soname.patch.1 | 13 | ||||
| -rw-r--r-- | external/redland/redland/redland-format.patch.0 | 10 | ||||
| -rw-r--r-- | external/redland/redland/redland-freebsd.patch.1 | 28 | ||||
| -rw-r--r-- | external/redland/redland/redland-msvc.patch.1 | 123 | ||||
| -rw-r--r-- | external/redland/redland/redland-xcompile.patch.1 | 15 | ||||
| -rw-r--r-- | external/redland/redland/rpath.patch | 10 |
10 files changed, 694 insertions, 0 deletions
diff --git a/external/redland/redland/clang-cl.patch b/external/redland/redland/clang-cl.patch new file mode 100644 index 000000000..b5a7271fb --- /dev/null +++ b/external/redland/redland/clang-cl.patch @@ -0,0 +1,20 @@ +--- src/librdf.h ++++ src/librdf.h +@@ -74,7 +74,7 @@ + /* Use gcc 3.1+ feature to allow marking of deprecated API calls. + * This gives a warning during compiling. + */ +-#if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3 ++#if (defined __GNUC__ && (( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3)) || defined __clang__ + #define REDLAND_DEPRECATED __attribute__((deprecated)) + #define REDLAND_NORETURN __attribute__((__noreturn__)) + #else +@@ -83,7 +83,7 @@ + #endif + + +-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) ++#if (defined __GNUC__ && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4))) || defined __clang__ + #define REDLAND_PRINTF_FORMAT(string_index, first_to_check_index) \ + __attribute__((__format__(__printf__, string_index, first_to_check_index))) + #else diff --git a/external/redland/redland/librdf.h b/external/redland/redland/librdf.h new file mode 100644 index 000000000..44674c583 --- /dev/null +++ b/external/redland/redland/librdf.h @@ -0,0 +1,434 @@ +/* -*- Mode: c; c-basic-offset: 2 -*- + * + * redland.h - Redland RDF Application Framework public API + * + * Copyright (C) 2000-2011, David Beckett http://www.dajobe.org/ + * Copyright (C) 2000-2005, University of Bristol, UK http://www.bristol.ac.uk/ + * + * This package is Free Software and part of Redland http://librdf.org/ + * + * It is licensed under the following three licenses as alternatives: + * 1. GNU Lesser General Public License (LGPL) V2.1 or any newer version + * 2. GNU General Public License (GPL) V2 or any newer version + * 3. Apache License, V2.0 or any newer version + * + * You may not use this file except in compliance with at least one of + * the above three licenses. + * + * See LICENSE.html or LICENSE.txt at the top of this package for the + * complete terms and further detail along with the license texts for + * the licenses in COPYING.LIB, COPYING and LICENSE-2.0.txt respectively. + * + * + */ + + +#ifndef LIBRDF_H +#define LIBRDF_H + +#ifndef LIBRDF_OBJC_FRAMEWORK +/* raptor */ +#include <raptor2.h> +/* rasqal: uses raptor */ +#include <rasqal.h> +/* librdf: uses rasqal and raptor */ +#else +#include <Redland/raptor2.h> +#include <Redland/rasqal.h> +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#include <stdio.h> + +#ifndef REDLAND_API +# ifdef _WIN32 +# ifdef __GNUC__ +# undef _declspec +# define _declspec(x) __declspec(x) +# endif +# ifdef REDLAND_STATIC +# define REDLAND_API +# else +# ifdef LIBRDF_INTERNAL +# define REDLAND_API _declspec(dllexport) +# else +# define REDLAND_API _declspec(dllimport) +# endif +# endif +# else +# define REDLAND_API +# endif +#endif + +#ifndef REDLAND_CALLBACK_STDCALL +# if defined(_WIN32) && defined(USE_STDCALL_CALLBACKS) +# define REDLAND_CALLBACK_STDCALL _stdcall +# else +# define REDLAND_CALLBACK_STDCALL +# endif +#endif + +/* Use gcc 3.1+ feature to allow marking of deprecated API calls. + * This gives a warning during compiling. + */ +#if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3 +#define REDLAND_DEPRECATED __attribute__((deprecated)) +#define REDLAND_NORETURN __attribute__((__noreturn__)) +#else +#define REDLAND_DEPRECATED +#define REDLAND_NORETURN +#endif + + +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) +#define REDLAND_PRINTF_FORMAT(string_index, first_to_check_index) \ + __attribute__((__format__(__printf__, string_index, first_to_check_index))) +#else +#define REDLAND_PRINTF_FORMAT(string_index, first_to_check_index) +#endif + + +/* Public defines */ + +/** + * LIBRDF_VERSION: + * + * Redland librdf library version number + * + * Format: major * 10000 + minor * 100 + release + */ +#define LIBRDF_VERSION 10017 + +/** + * LIBRDF_VERSION_STRING: + * + * Redland librdf library version string + */ +#define LIBRDF_VERSION_STRING "1.0.17" + +/** + * LIBRDF_VERSION_MAJOR: + * + * Redland librdf library major version + */ +#define LIBRDF_VERSION_MAJOR 1 + +/** + * LIBRDF_VERSION_MINOR: + * + * Redland librdf library minor version + */ +#define LIBRDF_VERSION_MINOR 0 + +/** + * LIBRDF_VERSION_RELEASE: + * + * Redland librdf library release + */ +#define LIBRDF_VERSION_RELEASE 17 + + + +/* Public typedefs (references to private structures) */ + +/** + * librdf_world: + * + * Redland world class. + */ +typedef struct librdf_world_s librdf_world; + +/** + * librdf_hash: + * + * Redland hash class. + */ +typedef struct librdf_hash_s librdf_hash; + +/** + * librdf_hash_cursor: + * + * Redland hash cursor class. + */ +typedef struct librdf_hash_cursor_s librdf_hash_cursor; + +/** + * librdf_digest: + * + * Redland content digest class. + */ +typedef struct librdf_digest_s librdf_digest; + +/** + * librdf_digest_factory: + * + * Redland digest factory class. + */ +typedef struct librdf_digest_factory_s librdf_digest_factory; + +/** + * librdf_uri: + * + * Redland URI class. + */ +typedef struct raptor_uri_s librdf_uri; + +/** + * librdf_list: + * + * Redland list class. + */ +typedef struct librdf_list_s librdf_list; + +/** + * librdf_iterator: + * + * Redland iterator class. + */ +typedef struct librdf_iterator_s librdf_iterator; + +/** + * librdf_node: + * + * Redland node class. + */ +typedef raptor_term librdf_node; + +/** + * librdf_statement: + * + * Redland statement class. + */ +typedef raptor_statement librdf_statement; + +/** + * librdf_model: + * + * Redland model class. + */ +typedef struct librdf_model_s librdf_model; + +/** + * librdf_model_factory: + * + * Redland model factory class. + */ +typedef struct librdf_model_factory_s librdf_model_factory; + +/** + * librdf_storage: + * + * Redland storage class. + */ +typedef struct librdf_storage_s librdf_storage; + +/** + * librdf_storage_factory: + * + * Redland storage factory class. + */ +typedef struct librdf_storage_factory_s librdf_storage_factory; + +/** + * librdf_stream: + * + * Redland stream class. + */ +typedef struct librdf_stream_s librdf_stream; + +/** + * librdf_parser: + * + * Redland parser class. + */ +typedef struct librdf_parser_s librdf_parser; + +/** + * librdf_parser_factory: + * + * Redland parser factory class. + */ +typedef struct librdf_parser_factory_s librdf_parser_factory; + +/** + * librdf_query: + * + * Redland query class. + */ +typedef struct librdf_query_s librdf_query; + +/** + * librdf_query_factory: + * + * Redland query factory class. + */ +typedef struct librdf_query_factory_s librdf_query_factory; + +/** + * librdf_query_results: + * + * Redland query results class. + */ +typedef struct librdf_query_results_s librdf_query_results; + +/** + * librdf_query_results_formatter: + * + * Redland query results formatter class. + */ +typedef struct librdf_query_results_formatter_s librdf_query_results_formatter; + +/** + * librdf_serializer: + * + * Redland serializer class. + */ +typedef struct librdf_serializer_s librdf_serializer; + +/** + * librdf_serializer_factory: + * + * Redland serializer factory class. + */ +typedef struct librdf_serializer_factory_s librdf_serializer_factory; + + +/* Public statics */ + +/** + * librdf_short_copyright_string: + * + * Short copyright string (one line). + */ +REDLAND_API +extern const char * const librdf_short_copyright_string; + +/** + * librdf_copyright_string: + * + * Copyright string (multiple lines). + */ +REDLAND_API +extern const char * const librdf_copyright_string; + +/** + * librdf_version_string: + * + * Redland librdf version as a string. + */ +REDLAND_API +extern const char * const librdf_version_string; + +/** + * librdf_version_major: + * + * Redland librdf major version number. + */ +REDLAND_API +extern const unsigned int librdf_version_major; + +/** + * librdf_version_minor: + * + * Redland librdf minor version number. + */ +REDLAND_API +extern const unsigned int librdf_version_minor; + +/** + * librdf_version_release: + * + * Redland librdf release version number. + */ +REDLAND_API +extern const unsigned int librdf_version_release; + +/** + * librdf_version_decimal: + * + * Redland librdf version as a decimal number. + * + * Format: major * 10000 + minor * 100 + release + */ +REDLAND_API +extern const unsigned int librdf_version_decimal; + +/** + * librdf_license_string: + * + * Redland librdf license string. + */ +REDLAND_API +extern const char * const librdf_license_string; + +/** + * librdf_home_url_string: + * + * Redland librdf home page URL. + */ +REDLAND_API +extern const char * const librdf_home_url_string; + +/* Required for va_list in error handler function registrations + * which are in the public API + */ +#include <stdarg.h> + + +/* internal interfaces */ +#ifdef LIBRDF_INTERNAL +#include <rdf_internal.h> +#endif + +/* public interfaces */ + +/* FIXME: Should be replaced with automatically pulled + * definitions from the listed rdf_*.h header files. + */ + +#ifndef LIBRDF_OBJC_FRAMEWORK +#include <rdf_log.h> +#include <rdf_digest.h> +#include <rdf_hash.h> +#include <rdf_init.h> +#include <rdf_iterator.h> +#include <rdf_uri.h> +#include <rdf_node.h> +#include <rdf_concepts.h> +#include <rdf_statement.h> +#include <rdf_model.h> +#include <rdf_storage.h> +#include <rdf_parser.h> +#include <rdf_raptor.h> +#include <rdf_serializer.h> +#include <rdf_stream.h> +#include <rdf_query.h> +#include <rdf_utf8.h> +#else +#include <Redland/rdf_log.h> +#include <Redland/rdf_digest.h> +#include <Redland/rdf_hash.h> +#include <Redland/rdf_init.h> +#include <Redland/rdf_iterator.h> +#include <Redland/rdf_uri.h> +#include <Redland/rdf_node.h> +#include <Redland/rdf_concepts.h> +#include <Redland/rdf_statement.h> +#include <Redland/rdf_model.h> +#include <Redland/rdf_storage.h> +#include <Redland/rdf_parser.h> +#include <Redland/rdf_raptor.h> +#include <Redland/rdf_serializer.h> +#include <Redland/rdf_stream.h> +#include <Redland/rdf_query.h> +#include <Redland/rdf_utf8.h> +#endif + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/external/redland/redland/libtool.patch b/external/redland/redland/libtool.patch new file mode 100644 index 000000000..b0baae661 --- /dev/null +++ b/external/redland/redland/libtool.patch @@ -0,0 +1,27 @@ +--- build/ltmain.sh ++++ build/ltmain.sh +@@ -5301,6 +5301,12 @@ + prev= + continue + ;; ++ mllvm) ++ # Clang does not use LLVM to link, so we can simply discard any ++ # '-mllvm $arg' options when doing the link step. ++ prev= ++ continue ++ ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg +@@ -5639,6 +5645,11 @@ + continue + ;; + ++ -mllvm) ++ prev=mllvm ++ continue ++ ;; ++ + -module) + module=yes + continue diff --git a/external/redland/redland/redland-android.patch.1 b/external/redland/redland/redland-android.patch.1 new file mode 100644 index 000000000..c28fa19ff --- /dev/null +++ b/external/redland/redland/redland-android.patch.1 @@ -0,0 +1,14 @@ +No sonames on Android + +--- a/configure 2013-03-29 19:46:34.922901756 +0100 ++++ b/configure 2013-03-29 19:46:56.051901574 +0100 +@@ -10267,7 +10267,7 @@ + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac +- archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags -o $lib' + + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + diff --git a/external/redland/redland/redland-bundled-soname.patch.1 b/external/redland/redland/redland-bundled-soname.patch.1 new file mode 100644 index 000000000..867cd81e2 --- /dev/null +++ b/external/redland/redland/redland-bundled-soname.patch.1 @@ -0,0 +1,13 @@ +rhbz#809466 change soname of bundled redland libs + +--- a/src/Makefile.in 2013-03-30 17:43:48.127008037 +0100 ++++ b/src/Makefile.in 2013-03-30 17:44:19.294007769 +0100 +@@ -625,7 +625,7 @@ + rdf_parser_raptor.c + + EXTRA_DIST = redland.spec redland.spec.in mysql-v1.ttl mysql-v2.ttl +-librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ \ ++librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ -release lo \ + @LIBRDF_LDFLAGS@ @LIBRDF_EXTERNAL_LIBS@ + + pkgdata_DATA = $(am__append_13) diff --git a/external/redland/redland/redland-format.patch.0 b/external/redland/redland/redland-format.patch.0 new file mode 100644 index 000000000..7bd62a8bb --- /dev/null +++ b/external/redland/redland/redland-format.patch.0 @@ -0,0 +1,10 @@ +--- src/rdf_log.c ++++ src/rdf_log.c +@@ -136,6 +136,7 @@ + char *buffer = LIBRDF_MALLOC(char*, slocator_len + 2); + *buffer=' '; + raptor_locator_format(buffer + 1, slocator_len, (raptor_locator*)locator); ++ buffer[slocator_len + 1] = '\0'; + fputs(buffer, stderr); + LIBRDF_FREE(char*, buffer); + } diff --git a/external/redland/redland/redland-freebsd.patch.1 b/external/redland/redland/redland-freebsd.patch.1 new file mode 100644 index 000000000..349f3a197 --- /dev/null +++ b/external/redland/redland/redland-freebsd.patch.1 @@ -0,0 +1,28 @@ +Usual patch to produce Linux-like .so files on FreeBSD + +--- a/build/ltmain.sh 2008-02-02 22:28:24.000000000 +0900 ++++ b/build/ltmain.sh 2008-07-08 11:58:42.000000000 +0900 +@@ -7341,9 +7341,9 @@ + revision="$number_revision" + ;; + freebsd-aout|freebsd-elf|qnx|sunos) +- current="$number_major" +- revision="$number_minor" +- age="0" ++ current=`expr $number_major + $number_minor` ++ age="$number_minor" ++ revision="$number_revision" + ;; + irix|nonstopux) + func_arith $number_major + $number_minor +@@ -7420,8 +7420,8 @@ + ;; + + freebsd-elf) +- major=".$current" +- versuffix=".$current" ++ major=.`expr $current - $age` ++ versuffix="$major.$age.$revision" + ;; + + irix | nonstopux) diff --git a/external/redland/redland/redland-msvc.patch.1 b/external/redland/redland/redland-msvc.patch.1 new file mode 100644 index 000000000..e1f96b42a --- /dev/null +++ b/external/redland/redland/redland-msvc.patch.1 @@ -0,0 +1,123 @@ +--- redland.orig/src/win32_rdf_config.h 2015-09-02 23:12:12.894126138 +0200 ++++ redland/src/win32_rdf_config.h 2015-09-02 23:23:54.600173246 +0200 +@@ -43,7 +43,6 @@ + /* MS names for these functions */ + // next line breaks build on wntmsci12 + //#define vsnprintf _vsnprintf +-#define snprintf _snprintf + #define access _access + #define stricmp _stricmp + #define strnicmp _strnicmp +@@ -75,40 +78,40 @@ + */ + + /* BDB has close method with 2 args */ +-#define HAVE_BDB_CLOSE_2_ARGS 1 ++// #define HAVE_BDB_CLOSE_2_ARGS 1 + + /* BDB defines DBC */ +-#define HAVE_BDB_CURSOR 1 ++// #define HAVE_BDB_CURSOR 1 + + /* BDB cursor method has 4 arguments */ +-#define HAVE_BDB_CURSOR_4_ARGS 1 ++// #define HAVE_BDB_CURSOR_4_ARGS 1 + + /* BDB defines DB_TXN */ +-#define HAVE_BDB_DB_TXN 1 ++// #define HAVE_BDB_DB_TXN 1 + + /* BDB has fd method with 2 args */ +-#define HAVE_BDB_FD_2_ARGS 1 ++// #define HAVE_BDB_FD_2_ARGS 1 + + /* Have BDB hash support */ +-#define HAVE_BDB_HASH 1 ++// #define HAVE_BDB_HASH 1 + + /* BDB has open method with 6 args */ + /* #undef HAVE_BDB_OPEN_6_ARGS */ + + /* BDB has open method with 7 args */ +-#define HAVE_BDB_OPEN_7_ARGS 1 ++// #define HAVE_BDB_OPEN_7_ARGS 1 + + /* BDB has set_flags method */ +-#define HAVE_BDB_SET_FLAGS 1 ++// #define HAVE_BDB_SET_FLAGS 1 + + /* BDB has dbopen method */ + /* #undef HAVE_DBOPEN */ + + /* BDB has db_create method */ +-#define HAVE_DB_CREATE 1 ++// #define HAVE_DB_CREATE 1 + + /* Define to 1 if you have the <db.h> header file. */ +-#define HAVE_DB_H 1 ++// #define HAVE_DB_H 1 + + /* Define to 1 if you have the <dlfcn.h> header file. */ + /* undef HAVE_DLFCN_H */ +@@ -141,13 +144,13 @@ + /* #undef HAVE_LIBWWW */ + + /* Have local MD5 digest */ +-#define HAVE_LOCAL_MD5_DIGEST 1 ++// #define HAVE_LOCAL_MD5_DIGEST 1 + + /* Have local RIPEMD160 digest */ + /* #undef HAVE_LOCAL_RIPEMD160_DIGEST */ + + /* Have local SHA1 digest */ +-#define HAVE_LOCAL_SHA1_DIGEST 1 ++// #define HAVE_LOCAL_SHA1_DIGEST 1 + + /* Define to 1 if you have the <memory.h> header file. */ + #define HAVE_MEMORY_H 1 +@@ -159,7 +162,7 @@ + #define HAVE_MKTEMP 1 + + /* MySQL libraries are present */ +-#define HAVE_MYSQL 1 ++// #define HAVE_MYSQL 1 + + /* Define to 1 if you have the <openssl/crypto.h> header file. */ + /* #undef HAVE_OPENSSL_CRYPTO_H */ +@@ -261,7 +267,7 @@ + /*#undef STORAGE_POSTGRESQL*/ + + /* Building SQLite storage */ +-#define STORAGE_SQLITE 1 ++// #define STORAGE_SQLITE 1 + + /* Building 3store storage */ + /*#undef STORAGE_TSTORE*/ +@@ -288,11 +288,11 @@ + #include <io.h> + #include <memory.h> + +-/* get _isnan() since it is not in math.h */ +-#include <float.h> +-#ifndef isnan +-#define isnan(d) (_isnan(d)) +-#endif ++// /* get _isnan() since it is not in math.h */ ++// #include <float.h> ++// #ifndef isnan ++// #define isnan(d) (_isnan(d)) ++// #endif + + #ifdef __cplusplus + } +--- redland.orig/src/rdf_init.c 2015-09-02 23:12:12.894126138 +0200 ++++ redland/src/rdf_init.c 2015-09-02 23:23:54.600173246 +0200 +@@ -42,6 +42,8 @@ + #endif + #ifdef HAVE_UNISTD_H + #include <unistd.h> /* for getpid() */ ++#else ++#include <process.h> + #endif + + /* for gettimeofday */ diff --git a/external/redland/redland/redland-xcompile.patch.1 b/external/redland/redland/redland-xcompile.patch.1 new file mode 100644 index 000000000..2635359e7 --- /dev/null +++ b/external/redland/redland/redland-xcompile.patch.1 @@ -0,0 +1,15 @@ +No point in creating example or util executables when cross-compiling. +(Especially as doing it anyway wouldn't work without tweaks to have it find +libxml2 and libm, at least for Android.) + +--- a/Makefile.in ++++ b/Makefile.in +@@ -395,7 +395,7 @@ + DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc + + # Subdirectories to build/install/distribute etc. +-SUBDIRS = $(subdirs) src examples utils demos docs data scripts ++SUBDIRS = $(subdirs) src docs data scripts + EXTRA_DIST = \ + ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \ + ChangeLog.5 ChangeLog.6 ChangeLog.7 ChangeLog.8 ChangeLog.9 ChangeLog.10 \ diff --git a/external/redland/redland/rpath.patch b/external/redland/redland/rpath.patch new file mode 100644 index 000000000..ec8c765d5 --- /dev/null +++ b/external/redland/redland/rpath.patch @@ -0,0 +1,10 @@ +--- configure ++++ configure +@@ -10308,6 +10308,7 @@ + else + ld_shlibs=no + fi ++hardcode_libdir_flag_spec= + ;; + + netbsd* | netbsdelf*-gnu) |