redland: upgrade raptor to 2.0.15, rasqal to 0.9.33, redland to 1.0.17:

- drop rasqal-pkgconfig.patch.1:
merged upstream
- drop most of rasqal-msvc.patch.1:
merged upstream
- drop redland-query-rasqal-avoid-assert.patch.1:
merged upstream
- drop redland-pkgconfig.patch.1:
merged upstream

Change-Id: I4f03bed5fc5c4b30151c0c532572e438681da041
Reviewed-on: https://gerrit.libreoffice.org/28416
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

6 files changed, 119 insertions, 620 deletions

diff --git a/external/redland/rasqal/rasqal-bundled-soname.patch.1 b/external/redland/rasqal/rasqal-bundled-soname.patch.1
index 81585cfbeb32..2c674516d140 100644
--- a/external/redland/rasqal/rasqal-bundled-soname.patch.1
+++ b/external/redland/rasqal/rasqal-bundled-soname.patch.1
@@ -4,10 +4,10 @@ rhbz#809466 change soname of bundled redland libs
 +++ b/src/Makefile.in	2013-03-29 21:45:01.252840697 +0100
 @@ -621,7 +621,7 @@
  	$(am__append_2) $(am__append_3) $(am__append_4) \
- 	$(am__append_5) $(am__append_6) $(am__append_8)
- nodist_librasqal_la_SOURCES = $(am__append_7)
+ 	$(am__append_5) $(am__append_6) $(am__append_7)
+ nodist_librasqal_la_SOURCES = $(am__append_8)
 -librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@
 +librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@ -release lo
- librasqal_la_LIBADD = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@ @RASQAL_EXTERNAL_LIBS@ $(MEM_LIBS)
- librasqal_la_DEPENDENCIES = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@
- EXTRA_DIST = \
+ librasqal_la_LIBADD = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@ \
+ 	@RASQAL_EXTERNAL_LIBS@ $(MEM_LIBS) \
+ 	$(top_builddir)/libsv/libsv.la $(am__append_10)
diff --git a/external/redland/rasqal/rasqal-mingw.patch.1 b/external/redland/rasqal/rasqal-mingw.patch.1
index 5d8a5e497450..5d808b7330c0 100644
--- a/external/redland/rasqal/rasqal-mingw.patch.1
+++ b/external/redland/rasqal/rasqal-mingw.patch.1
@@ -4,10 +4,10 @@ MinGW: libtool falls back to static lib unless -no-undefined given
 +++ b/src/Makefile.in	2013-03-29 21:46:43.024839823 +0100
 @@ -621,7 +621,7 @@
  	$(am__append_2) $(am__append_3) $(am__append_4) \
- 	$(am__append_5) $(am__append_6) $(am__append_8)
- nodist_librasqal_la_SOURCES = $(am__append_7)
+ 	$(am__append_5) $(am__append_6) $(am__append_7)
+ nodist_librasqal_la_SOURCES = $(am__append_8)
 -librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@
 +librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@ -no-undefined
- librasqal_la_LIBADD = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@ @RASQAL_EXTERNAL_LIBS@ $(MEM_LIBS)
- librasqal_la_DEPENDENCIES = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@
- EXTRA_DIST = \
+ librasqal_la_LIBADD = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@ \
+ 	@RASQAL_EXTERNAL_LIBS@ $(MEM_LIBS) \
+ 	$(top_builddir)/libsv/libsv.la $(am__append_10)
diff --git a/external/redland/rasqal/rasqal-msvc.patch.1 b/external/redland/rasqal/rasqal-msvc.patch.1
index 95b4ce8f80f7..79fce7a8dc5e 100644
--- a/external/redland/rasqal/rasqal-msvc.patch.1
+++ b/external/redland/rasqal/rasqal-msvc.patch.1
@@ -1,93 +1,51 @@
-diff -ru rasqal.orig/src/rasqal_digest_md5.c rasqal/src/rasqal_digest_md5.c
---- rasqal.orig/src/rasqal_digest_md5.c	2012-02-11 00:41:11.000000000 +0100
-+++ rasqal/src/rasqal_digest_md5.c	2015-09-02 23:26:38.094184222 +0200
-@@ -50,7 +50,6 @@
- 
- #include <stdio.h>
- #include <string.h>
--#include <stdint.h>
- #include <stdarg.h>
- 
- #include "rasqal.h"
-diff -ru rasqal.orig/src/rasqal_digest_sha1.c rasqal/src/rasqal_digest_sha1.c
---- rasqal.orig/src/rasqal_digest_sha1.c	2012-02-16 06:54:24.000000000 +0100
-+++ rasqal/src/rasqal_digest_sha1.c	2015-09-02 23:26:44.922184681 +0200
-@@ -93,7 +93,6 @@
- #include <stdio.h>
- #include <string.h>
- #include <stdarg.h>
--#include <stdint.h>
- 
- #include "rasqal.h"
- #include "rasqal_internal.h"
-diff -ru rasqal.orig/src/rasqal_internal.h rasqal/src/rasqal_internal.h
---- rasqal.orig/src/rasqal_internal.h	2012-07-30 00:21:11.000000000 +0200
-+++ rasqal/src/rasqal_internal.h	2015-09-02 23:26:50.240185038 +0200
-@@ -26,6 +26,13 @@
- #ifndef RASQAL_INTERNAL_H
- #define RASQAL_INTERNAL_H
- 
-+#if defined(_MSC_VER) && _MSC_VER < 1600
-+typedef unsigned __int32 uint32_t;
-+typedef __int16 int16_t;
-+#else
-+#include <stdint.h>
-+#endif
-+
- #ifdef __cplusplus
- extern "C" {
- #define RASQAL_EXTERN_C extern "C"
 diff -ru rasqal.orig/src/win32_rasqal_config.h rasqal/src/win32_rasqal_config.h
 --- rasqal.orig/src/win32_rasqal_config.h	2015-09-02 23:12:00.733125322 +0200
 +++ rasqal/src/win32_rasqal_config.h	2015-09-02 23:28:10.152190403 +0200
-@@ -31,17 +31,23 @@
- #endif
- 
- #define WIN32_LEAN_AND_MEAN 1
-+#include <windows.h>
- 
- /* getopt is not in standard win32 C library - define if we have it */
- /* #define HAVE_GETOPT_H 1 */
- 
- #define HAVE_STDLIB_H 1
- 
-+#define HAVE_ERRNO_H 1
-+
- #define HAVE_STRICMP 1
- 
+@@ -31,7 +31,9 @@
  /* MS names for these functions */
--#define vsnprintf _vsnprintf
-+// next line breaks build on wntmsci12
-+//#define vsnprintf _vsnprintf
+ // next line breaks build on wntmsci12
+ //#define vsnprintf _vsnprintf
 +#if _MSC_VER < 1900 // older than VC 2015
  #define snprintf _snprintf
 +#endif
  #define access _access
  #define stricmp _stricmp
  #define strnicmp _strnicmp
-@@ -101,7 +107,6 @@
-  * Defines that come from config.h
-  */
- 
--#include <windows.h>
- #include <io.h>
- #include <memory.h>
- 
-@@ -149,7 +154,15 @@
- /* #define RAPTOR_TRIPLES_SOURCE_REDLAND 1 */
+--- rasqal/src/rasqal_ntriples.c.orig	2016-08-26 23:29:58.343472683 +0200
++++ rasqal/src/rasqal_ntriples.c	2016-08-26 23:30:10.553471736 +0200
+@@ -25,6 +25,10 @@
+ #include <rasqal_config.h>
+ #endif
  
- /* Use PCRE regex library */
--#define RASQAL_REGEX_PCRE 1
-+//#define RASQAL_REGEX_PCRE 1
-+
-+#define HAVE_LIBXML_SCHEMASINTERNALS_H 1
-+#define HAVE_LIBXML_XMLSCHEMASTYPES_H 1
-+#define HAVE_LIBXML_XMLSCHEMAS_H 1
++#ifdef WIN32
++#include <win32_rasqal_config.h>
++#endif
 +
-+#define RASQAL_DECIMAL_NONE 1
-+#define RASQAL_UUID_INTERNAL 1
-+#define RASQAL_DIGEST_INTERNAL 1
+ #include <stdio.h>
+ #include <string.h>
+ #include <ctype.h>
+--- rasqal/src/sv_config.h.orig	2016-08-26 23:29:42.408473919 +0200
++++ rasqal/src/sv_config.h	2016-08-26 23:29:44.760473737 +0200
+@@ -29,7 +29,11 @@
+ extern "C" {
+ #endif
+ 
++#ifdef WIN32
++#include <win32_rasqal_config.h>
++#else
+ #include <rasqal_config.h>
++#endif
  
- #ifdef _DEBUG
- #define RASQAL_DEBUG 1
- #define RASQAL_EXTERN_C extern "C"
+ #define sv_new rasqal_sv_new
+ #define sv_free rasqal_sv_free
+--- rasqal/src/rasqal.h.in.orig	2016-08-26 23:42:23.198414915 +0200
++++ rasqal/src/rasqal.h.in	2016-08-26 23:42:34.627414028 +0200
+@@ -1473,7 +1473,7 @@
+ 
+ RASQAL_API
+ int rasqal_query_results_formats_check2(rasqal_world* world, const char *name, raptor_uri* uri, const char *mime_type, int flags);
+-RASQAL_API RASQAL_API RASQAL_DEPRECATED
++RASQAL_API RASQAL_DEPRECATED
+ int rasqal_query_results_formats_check(rasqal_world* world, const char *name, raptor_uri* uri, const char *mime_type, int flags);
+ RASQAL_API
+ rasqal_query_results_formatter* rasqal_new_query_results_formatter(rasqal_world* world, const char *name, const char *mime_type, raptor_uri* format_uri);
diff --git a/external/redland/rasqal/rasqal-pkgconfig.patch.1 b/external/redland/rasqal/rasqal-pkgconfig.patch.1
index 154b1e6b9d77..ac3eab07c4e4 100644
--- a/external/redland/rasqal/rasqal-pkgconfig.patch.1
+++ b/external/redland/rasqal/rasqal-pkgconfig.patch.1
@@ -1,512 +1,14 @@
 Let the pkg-config stuff be overridden by variables
 
---- a/configure.ac	2013-03-29 23:57:59.782772145 +0100
-+++ b/configure.ac	2013-03-30 00:09:41.823766113 +0100
-@@ -394,25 +394,15 @@
- RAPTOR_MIN_VERSION=2.0.7
+--- a/configure
++++ b/configure
+@@ -14119,7 +14119,7 @@
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
  
- 
--AC_CHECK_PROGS(PKG_CONFIG, pkg-config)
--if test "X$PKG_CONFIG" = X; then
--  AC_MSG_ERROR(pkg-config not found. configuring raptor V2 requires it.  Get it from http://pkg-config.freedesktop.org/)
--fi
-+PKG_PROG_PKG_CONFIG
- 
--AC_MSG_CHECKING(for raptor)
--if $PKG_CONFIG raptor2 --exists; then
-+PKG_CHECK_MODULES([RAPTOR2],[raptor2 >= $RAPTOR_MIN_VERSION],[
-   RAPTOR_VERSION=`$PKG_CONFIG raptor2 --modversion 2>/dev/null`
--  AC_MSG_RESULT(system $RAPTOR_VERSION)
--
--  if $PKG_CONFIG raptor2 --atleast-version=$RAPTOR_MIN_VERSION; then
--    :
--  else
--    AC_MSG_ERROR(Installed raptor $RAPTOR_VERSION is too old - need $RAPTOR_MIN_VERSION)
--  fi
--else
--  AC_MSG_RESULT(not found)
-+],[
-   AC_MSG_ERROR(Raptor is not installed - see http://librdf.org/raptor/ to get a version newer than $RAPTOR_MIN_VERSION)
--fi
-+])
-+AC_SUBST(RAPTOR2_CFLAGS)
-+AC_SUBST(RAPTOR2_LIBS)
- 
- RAPTOR_VERSION_DEC=`echo $RAPTOR_VERSION | $AWK -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
- AC_SUBST(RAPTOR_VERSION_DEC)
-@@ -879,8 +867,8 @@
- 
- 
- 
--RASQAL_INTERNAL_CPPFLAGS="$RASQAL_INTERNAL_CPPFLAGS `$PKG_CONFIG raptor2 --cflags`"
--RASQAL_EXTERNAL_LIBS="$RASQAL_EXTERNAL_LIBS `$PKG_CONFIG raptor2 --libs`"
-+RASQAL_INTERNAL_CPPFLAGS="$RASQAL_INTERNAL_CPPFLAGS $RAPTOR2_CFLAGS"
-+RASQAL_EXTERNAL_LIBS="$RASQAL_EXTERNAL_LIBS $RAPTOR2_LIBS"
- RAPPER_PATH=""
- 
- if test $need_regex_pcre = 1; then
---- a/configure	2013-03-31 00:36:31.396795267 +0100
-+++ b/configure	2013-03-31 00:36:42.820795169 +0100
-@@ -652,8 +652,6 @@
- GTKDOC_MKPDF
- GTKDOC_REBASE
- GTKDOC_CHECK
--PKG_CONFIG_LIBDIR
--PKG_CONFIG_PATH
- AM_BACKSLASH
- AM_DEFAULT_VERBOSITY
- AM_DEFAULT_V
-@@ -687,6 +685,10 @@
- PCRE_CONFIG
- RAPTOR_MIN_VERSION
- RAPTOR_VERSION_DEC
-+RAPTOR2_LIBS
-+RAPTOR2_CFLAGS
-+PKG_CONFIG_LIBDIR
-+PKG_CONFIG_PATH
- PKG_CONFIG
- GETTIMEOFDAY_FALSE
- GETTIMEOFDAY_TRUE
-@@ -872,6 +874,8 @@
- PKG_CONFIG
- PKG_CONFIG_PATH
- PKG_CONFIG_LIBDIR
-+RAPTOR2_CFLAGS
-+RAPTOR2_LIBS
- GTKDOC_DEPS_CFLAGS
- GTKDOC_DEPS_LIBS'
- 
-@@ -1554,6 +1558,10 @@
-               directories to add to pkg-config's search path
-   PKG_CONFIG_LIBDIR
-               path overriding pkg-config's built-in search path
-+  RAPTOR2_CFLAGS
-+              C compiler flags for RAPTOR2, overriding pkg-config
-+  RAPTOR2_LIBS
-+              linker flags for RAPTOR2, overriding pkg-config
-   GTKDOC_DEPS_CFLAGS
-               C compiler flags for GTKDOC_DEPS, overriding pkg-config
-   GTKDOC_DEPS_LIBS
-@@ -13818,26 +13826,35 @@
- RAPTOR_MIN_VERSION=2.0.7
- 
- 
--for ac_prog in pkg-config
--do
--  # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
-+
-+
-+
-+
-+
-+
-+
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+	if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_prog_PKG_CONFIG+:} false; then :
-+if ${ac_cv_path_PKG_CONFIG+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
--  if test -n "$PKG_CONFIG"; then
--  ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+  case $PKG_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
-   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_PKG_CONFIG="$ac_prog"
-+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
-@@ -13845,9 +13862,10 @@
-   done
- IFS=$as_save_IFS
- 
-+  ;;
-+esac
- fi
--fi
--PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
- if test -n "$PKG_CONFIG"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
- $as_echo "$PKG_CONFIG" >&6; }
-@@ -13857,31 +13875,158 @@
- fi
- 
- 
--  test -n "$PKG_CONFIG" && break
-+fi
-+if test -z "$ac_cv_path_PKG_CONFIG"; then
-+  ac_pt_PKG_CONFIG=$PKG_CONFIG
-+  # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $ac_pt_PKG_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
- done
-+  done
-+IFS=$as_save_IFS
- 
--if test "X$PKG_CONFIG" = X; then
--  as_fn_error $? "pkg-config not found. configuring raptor V2 requires it.  Get it from http://pkg-config.freedesktop.org/" "$LINENO" 5
-+  ;;
-+esac
-+fi
-+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-+if test -n "$ac_pt_PKG_CONFIG"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for raptor" >&5
--$as_echo_n "checking for raptor... " >&6; }
--if $PKG_CONFIG raptor2 --exists; then
 -  RAPTOR_VERSION=`$PKG_CONFIG raptor2 --modversion 2>/dev/null`
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: system $RAPTOR_VERSION" >&5
--$as_echo "system $RAPTOR_VERSION" >&6; }
--
--  if $PKG_CONFIG raptor2 --atleast-version=$RAPTOR_MIN_VERSION; then
--    :
-+  if test "x$ac_pt_PKG_CONFIG" = x; then
-+    PKG_CONFIG=""
-   else
--    as_fn_error $? "Installed raptor $RAPTOR_VERSION is too old - need $RAPTOR_MIN_VERSION" "$LINENO" 5
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    PKG_CONFIG=$ac_pt_PKG_CONFIG
-   fi
- else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
--$as_echo "not found" >&6; }
-+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-+fi
-+
-+fi
-+if test -n "$PKG_CONFIG"; then
-+	_pkg_min_version=0.9.0
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+	else
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+		PKG_CONFIG=""
-+	fi
-+fi
-+
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RAPTOR2" >&5
-+$as_echo_n "checking for RAPTOR2... " >&6; }
-+
-+if test -n "$RAPTOR2_CFLAGS"; then
-+    pkg_cv_RAPTOR2_CFLAGS="$RAPTOR2_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"raptor2 >= \$RAPTOR_MIN_VERSION\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "raptor2 >= $RAPTOR_MIN_VERSION") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+  pkg_cv_RAPTOR2_CFLAGS=`$PKG_CONFIG --cflags "raptor2 >= $RAPTOR_MIN_VERSION" 2>/dev/null`
-+		      test "x$?" != "x0" && pkg_failed=yes
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+if test -n "$RAPTOR2_LIBS"; then
-+    pkg_cv_RAPTOR2_LIBS="$RAPTOR2_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"raptor2 >= \$RAPTOR_MIN_VERSION\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "raptor2 >= $RAPTOR_MIN_VERSION") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+  pkg_cv_RAPTOR2_LIBS=`$PKG_CONFIG --libs "raptor2 >= $RAPTOR_MIN_VERSION" 2>/dev/null`
-+		      test "x$?" != "x0" && pkg_failed=yes
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+        _pkg_short_errors_supported=yes
-+else
-+        _pkg_short_errors_supported=no
-+fi
-+        if test $_pkg_short_errors_supported = yes; then
-+	        RAPTOR2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "raptor2 >= $RAPTOR_MIN_VERSION" 2>&1`
-+        else
-+	        RAPTOR2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "raptor2 >= $RAPTOR_MIN_VERSION" 2>&1`
-+        fi
-+	# Put the nasty error message in config.log where it belongs
-+	echo "$RAPTOR2_PKG_ERRORS" >&5
-+
-+
-+  as_fn_error $? "Raptor is not installed - see http://librdf.org/raptor/ to get a version newer than $RAPTOR_MIN_VERSION" "$LINENO" 5
-+
-+elif test $pkg_failed = untried; then
-+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-   as_fn_error $? "Raptor is not installed - see http://librdf.org/raptor/ to get a version newer than $RAPTOR_MIN_VERSION" "$LINENO" 5
-+
-+else
-+	RAPTOR2_CFLAGS=$pkg_cv_RAPTOR2_CFLAGS
-+	RAPTOR2_LIBS=$pkg_cv_RAPTOR2_LIBS
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+  RAPTOR_VERSION=`$PKG_CONFIG raptor2 --modversion 2>/dev/null`
-+
- fi
- 
-+
-+
- RAPTOR_VERSION_DEC=`echo $RAPTOR_VERSION | $AWK -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
- 
- 
-@@ -14883,8 +15028,8 @@
- 
- 
- 
--RASQAL_INTERNAL_CPPFLAGS="$RASQAL_INTERNAL_CPPFLAGS `$PKG_CONFIG raptor2 --cflags`"
--RASQAL_EXTERNAL_LIBS="$RASQAL_EXTERNAL_LIBS `$PKG_CONFIG raptor2 --libs`"
-+RASQAL_INTERNAL_CPPFLAGS="$RASQAL_INTERNAL_CPPFLAGS $RAPTOR2_CFLAGS"
-+RASQAL_EXTERNAL_LIBS="$RASQAL_EXTERNAL_LIBS $RAPTOR2_LIBS"
- RAPPER_PATH=""
- 
- if test $need_regex_pcre = 1; then
-@@ -15579,126 +15724,6 @@
- 
- 
- 
--
--
--
--
--if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
--	if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
--set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_path_PKG_CONFIG+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  case $PKG_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--  ;;
--esac
--fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--fi
--if test -z "$ac_cv_path_PKG_CONFIG"; then
--  ac_pt_PKG_CONFIG=$PKG_CONFIG
--  # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  case $ac_pt_PKG_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--  ;;
--esac
--fi
--ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
--if test -n "$ac_pt_PKG_CONFIG"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
--$as_echo "$ac_pt_PKG_CONFIG" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--  if test "x$ac_pt_PKG_CONFIG" = x; then
--    PKG_CONFIG=""
--  else
--    case $cross_compiling:$ac_tool_warned in
--yes:)
--{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
--ac_tool_warned=yes ;;
--esac
--    PKG_CONFIG=$ac_pt_PKG_CONFIG
--  fi
--else
--  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
--fi
--
--fi
--if test -n "$PKG_CONFIG"; then
--	_pkg_min_version=0.9.0
--	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
--$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
--	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
--		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--	else
--		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--		PKG_CONFIG=""
--	fi
--fi
--
--
--
-     # Extract the first word of "gtkdoc-check", so it can be a program name with args.
- set dummy gtkdoc-check; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
---- a/utils/Makefile.am	2013-03-31 00:39:54.396793523 +0100
-+++ b/utils/Makefile.am	2013-03-31 00:34:47.293796162 +0100
-@@ -37,22 +37,22 @@
- roqet_SOURCES += getopt.c rasqal_getopt.h
- endif
- roqet_LDADD = $(top_builddir)/src/librasqal.la
--roqet_LDFLAGS = `$(PKG_CONFIG) raptor2 --libs`
-+roqet_LDFLAGS = @RAPTOR2_LIBS@
- 
- check_query_SOURCES = check_query.c
- if GETOPT
- check_query_SOURCES += getopt.c rasqal_getopt.h
- endif
- check_query_LDADD = $(top_builddir)/src/librasqal.la
--check_query_LDFLAGS = `$(PKG_CONFIG) raptor2 --libs`
-+check_query_LDFLAGS = @RAPTOR2_LIBS@
- 
- srxread_SOURCES = srxread.c
- srxread_LDADD = $(top_builddir)/src/librasqal.la
--srxread_LDFLAGS = `$(PKG_CONFIG) raptor2 --libs`
-+srxread_LDFLAGS = @RAPTOR2_LIBS@
- 
- srxwrite_SOURCES = srxwrite.c
- srxwrite_LDADD = $(top_builddir)/src/librasqal.la
--srxwrite_LDFLAGS = `$(PKG_CONFIG) raptor2 --libs`
-+srxwrite_LDFLAGS = @RAPTOR2_LIBS@
- 
- EXTRA_DIST= \
- $(man_MANS) \
---- a/utils/Makefile.in	2013-03-31 00:40:02.603793453 +0100
-+++ b/utils/Makefile.in	2013-03-31 00:35:44.498795670 +0100
-@@ -359,16 +359,16 @@
- AM_CFLAGS = $(MEM)
- roqet_SOURCES = roqet.c $(am__append_1)
- roqet_LDADD = $(top_builddir)/src/librasqal.la
--roqet_LDFLAGS = `$(PKG_CONFIG) raptor2 --libs`
-+roqet_LDFLAGS = @RAPTOR2_LIBS@
- check_query_SOURCES = check_query.c $(am__append_2)
- check_query_LDADD = $(top_builddir)/src/librasqal.la
--check_query_LDFLAGS = `$(PKG_CONFIG) raptor2 --libs`
-+check_query_LDFLAGS = @RAPTOR2_LIBS@
- srxread_SOURCES = srxread.c
- srxread_LDADD = $(top_builddir)/src/librasqal.la
--srxread_LDFLAGS = `$(PKG_CONFIG) raptor2 --libs`
-+srxread_LDFLAGS = @RAPTOR2_LIBS@
- srxwrite_SOURCES = srxwrite.c
- srxwrite_LDADD = $(top_builddir)/src/librasqal.la
--srxwrite_LDFLAGS = `$(PKG_CONFIG) raptor2 --libs`
-+srxwrite_LDFLAGS = @RAPTOR2_LIBS@
- EXTRA_DIST = \
- $(man_MANS) \
- roqet.html
++  RAPTOR_VERSION=2.0.15
+   raptor_too_old=0
+   as_arg_v1=$RAPTOR_VERSION
+ as_arg_v2=$RAPTOR_MIN_VERSION
+
diff --git a/external/redland/rasqal/rasqal-xcompile.patch.1 b/external/redland/rasqal/rasqal-xcompile.patch.1
index 546975ca7b87..65efc3047995 100644
--- a/external/redland/rasqal/rasqal-xcompile.patch.1
+++ b/external/redland/rasqal/rasqal-xcompile.patch.1
@@ -8,8 +8,9 @@ libxml2 and libm, at least for Android.)
  top_srcdir = @top_srcdir@
  noinst_SCRIPTS = rasqal-src-config
  ACLOCAL_AMFLAGS = -I build
--SUBDIRS = src utils tests docs data win32 scripts
-+SUBDIRS = src docs data win32 scripts
+-SUBDIRS = libsv $(am__append_1) $(am__append_2) src utils tests docs \
++SUBDIRS = libsv $(am__append_1) $(am__append_2) src docs \
+ 	data win32 scripts
+ DIST_SUBDIRS = libsv libmtwist getopt src utils tests docs data win32 scripts
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = rasqal.pc
- EXTRA_DIST = \
diff --git a/external/redland/rasqal/rasqal.h b/external/redland/rasqal/rasqal.h
index c44039d734bb..a8d9b4a4306e 100644
--- a/external/redland/rasqal/rasqal.h
+++ b/external/redland/rasqal/rasqal.h
@@ -39,14 +39,14 @@ extern "C" {
  *
  * Format: major * 10000 + minor * 100 + release
  */
-#define RASQAL_VERSION 930
+#define RASQAL_VERSION 933
 
 /**
  * RASQAL_VERSION_STRING:
  *
  * Rasqal library version string
  */
-#define RASQAL_VERSION_STRING "0.9.30"
+#define RASQAL_VERSION_STRING "0.9.33"
 
 /**
  * RASQAL_VERSION_MAJOR:
@@ -67,7 +67,7 @@ extern "C" {
  *
  * Rasqal library release
  */
-#define RASQAL_VERSION_RELEASE 30
+#define RASQAL_VERSION_RELEASE 33
 
 
 /**
@@ -202,7 +202,7 @@ extern const char * const rasqal_home_url_string;
  *
  * Version of Raptor that Rasqal was configured against.
  */
-#define RASQAL_RAPTOR_VERSION 0
+#define RASQAL_RAPTOR_VERSION 20015
 
 
 /* Public structures */
@@ -363,7 +363,7 @@ typedef struct {
 typedef enum {
   RASQAL_DATA_GRAPH_NONE  = 0,
   RASQAL_DATA_GRAPH_NAMED = 1,
-  RASQAL_DATA_GRAPH_BACKGROUND = 2,
+  RASQAL_DATA_GRAPH_BACKGROUND = 2
 } rasqal_data_graph_flags;
 
 
@@ -393,7 +393,7 @@ typedef struct {
   rasqal_world* world;
   raptor_uri* uri;
   raptor_uri* name_uri;
-  int flags;
+  unsigned int flags;
   char* format_type;
   char* format_name;
   raptor_uri* format_uri;
@@ -612,7 +612,7 @@ struct rasqal_literal_s {
   } value;
 
   /* for string */
-  const char *language;
+  char *language;
   raptor_uri *datatype;
 
   /* various flags for literal types:
@@ -856,6 +856,7 @@ typedef enum {
  * @args: args for extension function qname(args...), cast-to-uri and COALESCE
  * @params: args for extension function parameters (SPARQL 1.1) (Rasqal 0.9.20+)
  * @flags: bitflags from #rasqal_expression_flags for expressions (Rasqal 0.9.20+)
+ * @arg4: fourth argument (for #RASQAL_EXPR_REPLACE )
  *
  * Expression with arguments
  *
@@ -970,6 +971,7 @@ typedef enum {
  * @RASQAL_QUERY_RESULTS_GRAPH: an RDF graph
  * @RASQAL_QUERY_RESULTS_SYNTAX: a syntax
  * @RASQAL_QUERY_RESULTS_UNKNOWN: unknown type
+ * @RASQAL_QUERY_RESULTS_LAST: internal
  *
  * Query result type.
  */
@@ -979,7 +981,8 @@ typedef enum {
   RASQAL_QUERY_RESULTS_BOOLEAN,
   RASQAL_QUERY_RESULTS_GRAPH,
   RASQAL_QUERY_RESULTS_SYNTAX,
-  RASQAL_QUERY_RESULTS_UNKNOWN
+  RASQAL_QUERY_RESULTS_UNKNOWN,
+  RASQAL_QUERY_RESULTS_LAST = RASQAL_QUERY_RESULTS_UNKNOWN
 } rasqal_query_results_type;
 
 
@@ -991,7 +994,7 @@ typedef enum {
  * @RASQAL_UPDATE_TYPE_LOAD: Load graph.
  * @RASQAL_UPDATE_TYPE_UPDATE: Insert or Delete graph or triples.
  * @RASQAL_UPDATE_TYPE_ADD: Add graph to another graph.
- * @RASQAL_UPDATE_TYPE_MOVE: Move graph to another graph.
+ * @RASQAL_UPDATE_TYPE_MOVE: Move graph to another grpah.
  * @RASQAL_UPDATE_TYPE_COPY: Copy graph to another graph.
  * @RASQAL_UPDATE_TYPE_UNKNOWN: Internal
  * @RASQAL_UPDATE_TYPE_LAST: Internal
@@ -1100,6 +1103,7 @@ typedef struct {
  * @RASQAL_GRAPH_PATTERN_OPERATOR_SELECT: SELECT graph pattern
  * @RASQAL_GRAPH_PATTERN_OPERATOR_SERVICE: SERVICE graph pattern
  * @RASQAL_GRAPH_PATTERN_OPERATOR_MINUS: MINUS graph pattern
+ * @RASQAL_GRAPH_PATTERN_OPERATOR_VALUES: VALUES graph pattern
  * @RASQAL_GRAPH_PATTERN_OPERATOR_UNKNOWN: Internal.
  * @RASQAL_GRAPH_PATTERN_OPERATOR_LAST: Internal.
  *
@@ -1117,8 +1121,9 @@ typedef enum {
   RASQAL_GRAPH_PATTERN_OPERATOR_SELECT    = 8,
   RASQAL_GRAPH_PATTERN_OPERATOR_SERVICE   = 9,
   RASQAL_GRAPH_PATTERN_OPERATOR_MINUS     = 10,
+  RASQAL_GRAPH_PATTERN_OPERATOR_VALUES    = 11,
 
-  RASQAL_GRAPH_PATTERN_OPERATOR_LAST = RASQAL_GRAPH_PATTERN_OPERATOR_MINUS
+  RASQAL_GRAPH_PATTERN_OPERATOR_LAST = RASQAL_GRAPH_PATTERN_OPERATOR_VALUES
 } rasqal_graph_pattern_operator;
 
 
@@ -1352,6 +1357,9 @@ RASQAL_API
 rasqal_literal* rasqal_graph_pattern_get_service(rasqal_graph_pattern* graph_pattern);
 RASQAL_API
 raptor_sequence* rasqal_graph_pattern_get_flattened_triples(rasqal_query* query, rasqal_graph_pattern* graph_pattern);
+RASQAL_API
+raptor_sequence* rasqal_graph_pattern_get_triples(rasqal_query* query, rasqal_graph_pattern* graph_pattern);
+
 
 /* Utility methods */
 RASQAL_API
@@ -1383,8 +1391,12 @@ rasqal_query_results_type rasqal_query_get_result_type(rasqal_query* query);
 
 /* query results */
 RASQAL_API
+rasqal_query_results* rasqal_new_query_results2(rasqal_world* world, rasqal_query* query, rasqal_query_results_type type);
+RASQAL_API RASQAL_DEPRECATED
 rasqal_query_results* rasqal_new_query_results(rasqal_world* world, rasqal_query* query, rasqal_query_results_type type, rasqal_variables_table* vars_table);
 RASQAL_API
+rasqal_query_results* rasqal_new_query_results_from_string(rasqal_world* world, rasqal_query_results_type type, raptor_uri* base_uri, const char* string, size_t string_len);
+RASQAL_API
 void rasqal_free_query_results(rasqal_query_results *query_results);
 
 RASQAL_API
@@ -1394,6 +1406,8 @@ rasqal_query* rasqal_query_results_get_query(rasqal_query_results* query_results
 RASQAL_API
 rasqal_query_results_type rasqal_query_results_get_type(rasqal_query_results* query_results);
 RASQAL_API
+const char* rasqal_query_results_type_label(rasqal_query_results_type type);
+RASQAL_API
 int rasqal_query_results_is_bindings(rasqal_query_results *query_results);
 RASQAL_API
 int rasqal_query_results_get_count(rasqal_query_results *query_results);
@@ -1458,6 +1472,8 @@ typedef enum {
 
 
 RASQAL_API
+int rasqal_query_results_formats_check2(rasqal_world* world, const char *name, raptor_uri* uri, const char *mime_type, int flags);
+RASQAL_API RASQAL_DEPRECATED
 int rasqal_query_results_formats_check(rasqal_world* world, const char *name, raptor_uri* uri, const char *mime_type, int flags);
 RASQAL_API
 rasqal_query_results_formatter* rasqal_new_query_results_formatter(rasqal_world* world, const char *name, const char *mime_type, raptor_uri* format_uri);
@@ -1478,7 +1494,7 @@ unsigned char* rasqal_query_escape_counted_string(rasqal_query* query, const uns
 
 /* Data graph class */
 RASQAL_API
-rasqal_data_graph* rasqal_new_data_graph_from_uri(rasqal_world* world, raptor_uri* uri, raptor_uri* name_uri, int flags, const char* format_type, const char* format_name, raptor_uri* format_uri);
+rasqal_data_graph* rasqal_new_data_graph_from_uri(rasqal_world* world, raptor_uri* uri, raptor_uri* name_uri, unsigned int flags, const char* format_type, const char* format_name, raptor_uri* format_uri);
 RASQAL_API
 rasqal_data_graph* rasqal_new_data_graph_from_iostream(rasqal_world* world, raptor_iostream* iostr, raptor_uri* base_uri, raptor_uri* name_uri, unsigned int flags, const char* format_type, const char* format_name, raptor_uri* format_uri);
 RASQAL_API
@@ -1492,8 +1508,8 @@ int rasqal_data_graph_print(rasqal_data_graph* dg, FILE* fh);
 /**
  * rasqal_compare_flags:
  * @RASQAL_COMPARE_NOCASE: String comparisons are case independent.
- * @RASQAL_COMPARE_XQUERY: XQuery comparison rules apply.
- * @RASQAL_COMPARE_RDF:    RDF Term comparison rules apply.
+ * @RASQAL_COMPARE_XQUERY: XQuery comparsion rules apply.
+ * @RASQAL_COMPARE_RDF:    RDF Term comparsion rules apply.
  * @RASQAL_COMPARE_URI:    Allow comparison of URIs and allow strings to have a boolean value (unused; was for RDQL)
  * @RASQAL_COMPARE_SAMETERM: SPARQL sameTerm() builtin rules apply.
  *
@@ -1523,7 +1539,7 @@ typedef struct rasqal_random_s rasqal_random;
  * @base_uri: base URI of expression context (or NULL)
  * @locator: locator or NULL
  * @flags: expression comparison flags
- * @seed: random seed
+ * @seed: random seeed
  * @random: random number generator object
  *
  * A context for evaluating an expression such as with
@@ -1565,7 +1581,7 @@ rasqal_expression* rasqal_new_expr_seq_expression(rasqal_world* world, rasqal_op
 RASQAL_API
 rasqal_expression* rasqal_new_set_expression(rasqal_world* world, rasqal_op op, rasqal_expression* arg1, raptor_sequence* args);
 RASQAL_API
-rasqal_expression* rasqal_new_group_concat_expression(rasqal_world* world,  int flags, raptor_sequence* args, rasqal_literal* separator);
+rasqal_expression* rasqal_new_group_concat_expression(rasqal_world* world, unsigned int flags, raptor_sequence* args, rasqal_literal* separator);
 RASQAL_API
 rasqal_expression* rasqal_new_expression_from_expression(rasqal_expression* e);
 
@@ -1675,6 +1691,10 @@ int rasqal_literal_same_term(rasqal_literal* l1, rasqal_literal* l2);
 RASQAL_API
 rasqal_literal_type rasqal_literal_get_rdf_term_type(rasqal_literal* l);
 RASQAL_API
+rasqal_literal_type rasqal_literal_get_type(rasqal_literal* l);
+RASQAL_API
+char* rasqal_literal_get_language(rasqal_literal* l);
+RASQAL_API
 int rasqal_literal_is_rdf_literal(rasqal_literal* l);
 
 
@@ -1725,9 +1745,11 @@ RASQAL_API
 rasqal_variables_table* rasqal_new_variables_table(rasqal_world* world);
 RASQAL_API
 void rasqal_free_variables_table(rasqal_variables_table* vt);
-RASQAL_API
+RASQAL_API RASQAL_DEPRECATED
 rasqal_variable* rasqal_variables_table_add(rasqal_variables_table* vt, rasqal_variable_type type, const unsigned char *name, rasqal_literal *value);
 RASQAL_API
+rasqal_variable* rasqal_variables_table_add2(rasqal_variables_table* vt, rasqal_variable_type type, const unsigned char *name, size_t name_len, rasqal_literal *value);
+RASQAL_API
 int rasqal_variables_table_add_variable(rasqal_variables_table* vt, rasqal_variable* variable);
 RASQAL_API
 rasqal_variable* rasqal_variables_table_get_by_name(rasqal_variables_table* vt, rasqal_variable_type type, const unsigned char *name);
@@ -1988,7 +2010,7 @@ typedef enum {
  * @version: API version - only V1 is defined for now
  * @query: Source for this query.
  * @user_data: Context user data passed into the factory methods.
- * @init_triples_match: Factory method to initialise a new #rasqal_triples_match.
+ * @init_triples_match: Factory method to initalise a new #rasqal_triples_match.
  * @triple_present: Factory method to return presence or absence of a complete triple.
  * @free_triples_source: Factory method to deallocate resources.
  * @support_feature: Factory method to test support for a feature, returning non-0 if supported
@@ -2027,7 +2049,7 @@ typedef struct rasqal_triples_source_s rasqal_triples_source;
  *
  * Highest accepted @rasqal_triples_source_factory API version
  */
-#define RASQAL_TRIPLES_SOURCE_FACTORY_MAX_VERSION 2
+#define RASQAL_TRIPLES_SOURCE_FACTORY_MAX_VERSION 3
 
 
 /**
@@ -2042,12 +2064,24 @@ typedef void (*rasqal_triples_error_handler)(rasqal_query* query, raptor_locator
 
 
 /**
+ * rasqal_triples_error_handler2:
+ * @world: world object
+ * @locator: error locator (or NULL)
+ * @message: error message
+ *
+ * Triples source factory error handler callback.
+ */
+typedef void (*rasqal_triples_error_handler2)(rasqal_world* world, raptor_locator* locator, const char* message);
+
+
+/**
  * rasqal_triples_source_factory:
- * @version: API factory version from 1 to 2
+ * @version: API factory version from 1 to 3
  * @user_data: User data for triples_source_factory.
  * @user_data_size: Size of @user_data for new_triples_source.
  * @new_triples_source: Create a new triples source - returns non-zero on failure &lt; 0 is a 'no rdf data error', &gt; 0 is an unspecified error. Error messages are generated by rasqal internally. (V1)
  * @init_triples_source: Initialise a new triples source V2 for a particular source URI/base URI and syntax. Returns non-zero on failure with errors reported via the handler callback by the implementation. (V2)
+ * @init_triples_source2: Initialise a new triples source V3 for a particular source URI/base URI and syntax and given data graphs. Returns non-zero on failure with errors reported via the handler callback by the implementation. If bit 0 of flags is 1, enforce RAPTOR_FEATURE_NO_NET (V3)
  *
  * A factory that initialises #rasqal_triples_source structures to
  * returning matches to a triple pattern across the dataset formed
@@ -2063,6 +2097,8 @@ typedef struct {
   int (*new_triples_source)(rasqal_query* query, void *factory_user_data, void *user_data, rasqal_triples_source* rts);
   /* API v2 onwards */
   int (*init_triples_source)(rasqal_query* query, void *factory_user_data, void *user_data, rasqal_triples_source* rts, rasqal_triples_error_handler handler);
+  /* API v3 onwards */
+  int (*init_triples_source2)(rasqal_world* world, raptor_sequence* data_graphs, void *factory_user_data, void *user_data, rasqal_triples_source *rts, rasqal_triples_error_handler2 handler, unsigned int flags);
 } rasqal_triples_source_factory;
 
 
@@ -2112,6 +2148,7 @@ int rasqal_set_triples_source_factory(rasqal_world* world, rasqal_triples_source
 
 /**
  * rasqal_expression_s:
+ * @world: Internal
  * @usage: Internal
  * @op: Internal
  * @arg1: Internal
@@ -2123,6 +2160,7 @@ int rasqal_set_triples_source_factory(rasqal_world* world, rasqal_triples_source
  * @args: Internal
  * @params: Internal
  * @flags: Internal
+ * @arg4: Internal
  *
  * Internal - see #rasqal_expression.
  *