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/28416Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

download.lst

@@ -147,9 +147,9 @@ export PYTHON_MD5SUM := a56c0c0b45d75a0ec9c6dee933c41c36
 export PYTHON_TARBALL := Python-3.5.0.tgz
 endif
 
-export RAPTOR_TARBALL := 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz
-export RASQAL_TARBALL := b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
-export REDLAND_TARBALL := 32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz
+export RAPTOR_TARBALL := a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz
+export RASQAL_TARBALL := 1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz
+export REDLAND_TARBALL := e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz
 export REVENGE_MD5SUM := 5b9ac52ec77d4d19157cf5962ebc0aea
 export REVENGE_VERSION_MICRO := 4
 export REVENGE_TARBALL := librevenge-0.0.$(REVENGE_VERSION_MICRO).tar.bz2

external/redland/Library_raptor.mk

@@ -35,6 +35,7 @@ $(eval $(call gb_Library_add_generated_cobjects,raptor2,\
 	UnpackedTarball/raptor/src/raptor_abbrev \
 	UnpackedTarball/raptor/src/raptor_avltree \
 	UnpackedTarball/raptor/src/raptor_concepts \
+	UnpackedTarball/raptor/src/raptor_escaped \
 	UnpackedTarball/raptor/src/raptor_general \
 	UnpackedTarball/raptor/src/raptor_guess \
 	UnpackedTarball/raptor/src/raptor_iostream \
@@ -44,6 +45,7 @@ $(eval $(call gb_Library_add_generated_cobjects,raptor2,\
 	UnpackedTarball/raptor/src/raptor_log \
 	UnpackedTarball/raptor/src/raptor_memstr \
 	UnpackedTarball/raptor/src/raptor_namespace \
+	UnpackedTarball/raptor/src/raptor_ntriples \
 	UnpackedTarball/raptor/src/raptor_option \
 	UnpackedTarball/raptor/src/raptor_parse \
 	UnpackedTarball/raptor/src/raptor_qname \
@@ -55,6 +57,7 @@ $(eval $(call gb_Library_add_generated_cobjects,raptor2,\
 	UnpackedTarball/raptor/src/raptor_serialize_ntriples \
 	UnpackedTarball/raptor/src/raptor_serialize_rdfxml \
 	UnpackedTarball/raptor/src/raptor_serialize_rdfxmla \
+	UnpackedTarball/raptor/src/raptor_serialize_turtle \
 	UnpackedTarball/raptor/src/raptor_set \
 	UnpackedTarball/raptor/src/raptor_statement \
 	UnpackedTarball/raptor/src/raptor_stringbuffer \
@@ -67,6 +70,7 @@ $(eval $(call gb_Library_add_generated_cobjects,raptor2,\
 	UnpackedTarball/raptor/src/raptor_xml \
 	UnpackedTarball/raptor/src/raptor_xml_writer \
 	UnpackedTarball/raptor/src/snprintf \
+	UnpackedTarball/raptor/src/sort_r \
 	UnpackedTarball/raptor/src/strcasecmp \
 	UnpackedTarball/raptor/src/turtle_common \
 	UnpackedTarball/raptor/src/turtle_lexer \

external/redland/Library_rasqal.mk

@@ -18,6 +18,7 @@ $(eval $(call gb_Library_use_external,rasqal,raptor_headers))
 $(eval $(call gb_Library_use_libraries,rasqal,raptor2))
 
 $(eval $(call gb_Library_add_defs,rasqal,\
+	-DSV_CONFIG \
 	-DRASQAL_INTERNAL \
 	-DWIN32 \
 	-DNDEBUG \
@@ -29,12 +30,15 @@ $(eval $(call gb_Library_add_defs,rasqal,\
 
 $(eval $(call gb_Library_set_include,rasqal,\
 	-I$(WORKDIR)/UnpackedTarball/rasqal/libmtwist \
+	-I$(WORKDIR)/UnpackedTarball/rasqal/libsv \
+	-I$(WORKDIR)/UnpackedTarball/rasqal/src \
 	$$(INCLUDE) \
 ))
 
 $(eval $(call gb_Library_add_generated_cobjects,rasqal,\
 	UnpackedTarball/rasqal/libmtwist/mt \
 	UnpackedTarball/rasqal/libmtwist/seed \
+	UnpackedTarball/rasqal/libsv/sv \
 	UnpackedTarball/rasqal/src/rasqal_algebra \
 	UnpackedTarball/rasqal/src/rasqal_bindings \
 	UnpackedTarball/rasqal/src/rasqal_data_graph \
@@ -66,6 +70,7 @@ $(eval $(call gb_Library_add_generated_cobjects,rasqal,\
 	UnpackedTarball/rasqal/src/rasqal_iostream \
 	UnpackedTarball/rasqal/src/rasqal_literal \
 	UnpackedTarball/rasqal/src/rasqal_map \
+	UnpackedTarball/rasqal/src/rasqal_ntriples \
 	UnpackedTarball/rasqal/src/rasqal_prefix \
 	UnpackedTarball/rasqal/src/rasqal_projection \
 	UnpackedTarball/rasqal/src/rasqal_query \
@@ -76,11 +81,13 @@ $(eval $(call gb_Library_add_generated_cobjects,rasqal,\
 	UnpackedTarball/rasqal/src/rasqal_raptor \
 	UnpackedTarball/rasqal/src/rasqal_regex \
 	UnpackedTarball/rasqal/src/rasqal_result_formats \
+	UnpackedTarball/rasqal/src/rasqal_results_compare \
 	UnpackedTarball/rasqal/src/rasqal_row \
 	UnpackedTarball/rasqal/src/rasqal_row_compatible \
 	UnpackedTarball/rasqal/src/rasqal_rowsource \
 	UnpackedTarball/rasqal/src/rasqal_rowsource_aggregation \
 	UnpackedTarball/rasqal/src/rasqal_rowsource_assignment \
+	UnpackedTarball/rasqal/src/rasqal_rowsource_bindings \
 	UnpackedTarball/rasqal/src/rasqal_rowsource_distinct \
 	UnpackedTarball/rasqal/src/rasqal_rowsource_empty \
 	UnpackedTarball/rasqal/src/rasqal_rowsource_filter \
@@ -90,12 +97,14 @@ $(eval $(call gb_Library_add_generated_cobjects,rasqal,\
 	UnpackedTarball/rasqal/src/rasqal_rowsource_join \
 	UnpackedTarball/rasqal/src/rasqal_rowsource_project \
 	UnpackedTarball/rasqal/src/rasqal_rowsource_rowsequence \
+	UnpackedTarball/rasqal/src/rasqal_rowsource_service \
 	UnpackedTarball/rasqal/src/rasqal_rowsource_slice \
 	UnpackedTarball/rasqal/src/rasqal_rowsource_sort \
 	UnpackedTarball/rasqal/src/rasqal_rowsource_triples \
 	UnpackedTarball/rasqal/src/rasqal_rowsource_union \
 	UnpackedTarball/rasqal/src/rasqal_service \
 	UnpackedTarball/rasqal/src/rasqal_solution_modifier \
+	UnpackedTarball/rasqal/src/rasqal_sort \
 	UnpackedTarball/rasqal/src/rasqal_triple \
 	UnpackedTarball/rasqal/src/rasqal_triples_source \
 	UnpackedTarball/rasqal/src/rasqal_update \

external/redland/UnpackedTarball_raptor.mk

@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,raptor,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,raptor,\
 	external/redland/raptor/raptor-freebsd.patch.1 \
+	external/redland/raptor/raptor-msvc.patch.1 \
 	$(if $(filter WNTGCC,$(OS)$(COM)),external/redland/raptor/raptor-mingw.patch.1) \
 	$(if $(filter-out WNT,$(OS)),external/redland/raptor/raptor-bundled-soname.patch.1) \
 	$(if $(filter ANDROID,$(OS)),external/redland/raptor/raptor-android.patch.1) \

external/redland/UnpackedTarball_redland.mk

@@ -19,8 +19,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,redland,0))
 # redland-format.patch.0 sent upstream as
 #  <https://github.com/dajobe/librdf/pull/6>
 $(eval $(call gb_UnpackedTarball_add_patches,redland,\
-	external/redland/redland/redland-query-rasqal-avoid-assert.patch.1 \
-	external/redland/redland/redland-pkgconfig.patch.1 \
 	external/redland/redland/redland-freebsd.patch.1 \
 	external/redland/redland/redland-msvc.patch.1 \
 	$(if $(filter-out WNT,$(OS)),external/redland/redland/redland-bundled-soname.patch.1) \

external/redland/raptor/raptor-bundled-soname.patch.1

@@ -4,10 +4,10 @@ rhbz#809466 change soname of bundled redland libs
 +++ b/src/Makefile.in	2013-03-29 19:17:42.173916644 +0100
 @@ -507,7 +507,7 @@
  	$(am__append_21) $(am__append_22) $(am__append_23) \
- 	$(am__append_24) $(am__append_25) $(am__append_26) \
- 	$(am__append_27) $(am__append_28)
+ 	$(am__append_24) $(am__append_25) $(am__append_26)
+ libraptor2_la_LIBADD = $(am__append_29) @LTLIBOBJS@
 -libraptor2_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ \
 +libraptor2_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -release lo \
  @RAPTOR_LDFLAGS@ $(MEM_LIBS)
  
- libraptor2_la_LIBADD = @LTLIBOBJS@
+ EXTRA_DIST = \

external/redland/raptor/raptor-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 20:05:02.140892243 +0100
 @@ -507,7 +507,7 @@
  	$(am__append_21) $(am__append_22) $(am__append_23) \
- 	$(am__append_24) $(am__append_25) $(am__append_26) \
- 	$(am__append_27) $(am__append_28)
+ 	$(am__append_24) $(am__append_25) $(am__append_26)
+ libraptor2_la_LIBADD = $(am__append_29) @LTLIBOBJS@
 -libraptor2_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ \
 +libraptor2_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -no-undefined \
  @RAPTOR_LDFLAGS@ $(MEM_LIBS)
  
- libraptor2_la_LIBADD = @LTLIBOBJS@
+ EXTRA_DIST = \

external/redland/raptor/raptor-msvc.patch.1

+--- raptor/src/raptor2.h.in.orig	2016-08-26 23:45:34.543400074 +0200
++++ raptor/src/raptor2.h.in	2016-08-26 23:45:40.479399614 +0200
+@@ -2176,6 +2176,7 @@
+ void* raptor_avltree_iterator_get(raptor_avltree_iterator* iterator);
+ 
+ /* utility methods */
++RAPTOR_API
+ void raptor_sort_r(void *base, size_t nel, size_t width, raptor_data_compare_arg_handler compar, void *user_data);
+ 
+ 

external/redland/raptor/raptor2.h

@@ -53,14 +53,14 @@ extern "C" {
  *
  * Format: major * 10000 + minor * 100 + release
  */
-#define RAPTOR_VERSION 20009
+#define RAPTOR_VERSION 20015
 
 /**
  * RAPTOR_VERSION_STRING:
  *
  * Raptor library version string
  */
-#define RAPTOR_VERSION_STRING "2.0.9"
+#define RAPTOR_VERSION_STRING "2.0.15"
 
 /**
  * RAPTOR_VERSION_MAJOR:
@@ -81,7 +81,7 @@ extern "C" {
  *
  * Raptor library release
  */
-#define RAPTOR_VERSION_RELEASE 9
+#define RAPTOR_VERSION_RELEASE 15
 
 /**
  * RAPTOR_API:
@@ -928,12 +928,28 @@ typedef enum {
 } raptor_world_flag;
 
 
+/**
+ * raptor_data_compare_arg_handler:
+ * @data1: first object
+ * @data2: second object
+ * @user_data: user data argument
+ *
+ * Function to compare two data objects with a user data argument
+ *
+ * Designed to be used with raptor_sort_r() and compatible functions
+ * such as raptor_sequence_sort_r() which uses it.
+ *
+ * Return value: compare value <0 if @data1 is before @data2, =0 if equal, >0 if @data1 is after @data2
+ */
+typedef int (*raptor_data_compare_arg_handler)(const void *data1, const void *data2, void *user_data);
+
+
 /**
  * raptor_data_compare_handler:
  * @data1: first data object
  * @data2: second data object
  *
- * Function to compare two data objects - signature like strcmp() and function passed to qsort()
+ * Function to compare two data objects - signature like strcmp() and function pssed to qsort()
  *
  * Designed to be passed into generic data structure constructors
  * like raptor_new_avltree().
@@ -1052,6 +1068,10 @@ int raptor_world_is_serializer_name(raptor_world* world, const char *name);
 
 /* Syntax descriptions */
 RAPTOR_API
+int raptor_world_get_parsers_count(raptor_world* world);
+RAPTOR_API
+int raptor_world_get_serializers_count(raptor_world* world);
+RAPTOR_API
 const raptor_syntax_description* raptor_world_get_parser_description(raptor_world* world, unsigned int counter);
 RAPTOR_API
 const raptor_syntax_description* raptor_world_get_serializer_description(raptor_world* world, unsigned int counter);
@@ -1078,6 +1098,8 @@ raptor_term* raptor_new_term_from_blank(raptor_world* world, const unsigned char
 RAPTOR_API
 raptor_term* raptor_new_term_from_counted_blank(raptor_world* world, const unsigned char* blank, size_t length);
 RAPTOR_API
+raptor_term* raptor_new_term_from_counted_string(raptor_world* world, unsigned char* string, size_t length);
+RAPTOR_API
 raptor_term* raptor_term_copy(raptor_term* term);
 RAPTOR_API
 int raptor_term_compare(const raptor_term *t1, const raptor_term *t2);
@@ -1091,6 +1113,8 @@ unsigned char* raptor_term_to_counted_string(raptor_term *term, size_t* len_p);
 RAPTOR_API
 unsigned char* raptor_term_to_string(raptor_term *term);
 RAPTOR_API
+int raptor_term_escaped_write(const raptor_term *term, unsigned int flags, raptor_iostream* iostr);
+RAPTOR_API RAPTOR_DEPRECATED
 int raptor_term_ntriples_write(const raptor_term *term, raptor_iostream* iostr);
 RAPTOR_API
 int raptor_uri_turtle_write(raptor_world *world, raptor_iostream* iostr, raptor_uri* uri, raptor_namespace_stack *nstack, raptor_uri *base_uri);
@@ -1309,6 +1333,8 @@ RAPTOR_API
 raptor_world* raptor_uri_get_world(raptor_uri *uri);
 RAPTOR_API
 int raptor_uri_file_exists(raptor_uri* uri);
+RAPTOR_API
+int raptor_uri_escaped_write(raptor_uri* uri, raptor_uri* base_uri, unsigned int flags, raptor_iostream *iostr);
 
 /* XML utility functions */
 RAPTOR_API
@@ -1339,6 +1365,8 @@ size_t raptor_uri_resolve_uri_reference(const unsigned char *base_uri, const uns
 
 /* URI String utility functions */
 RAPTOR_API
+unsigned char* raptor_uri_counted_filename_to_uri_string(const char *filename, size_t filename_len);
+RAPTOR_API
 unsigned char* raptor_uri_filename_to_uri_string(const char *filename);
 RAPTOR_API
 int raptor_uri_filename_exists(const unsigned char* path);
@@ -1352,6 +1380,8 @@ RAPTOR_API
 int raptor_stringbuffer_append_uri_escaped_counted_string(raptor_stringbuffer* sb, const char* string, size_t length, int space_is_plus);
 RAPTOR_API
 char* raptor_uri_uri_string_to_counted_filename_fragment(const unsigned char *uri_string, size_t* len_p, unsigned char **fragment_p, size_t* fragment_len_p);
+RAPTOR_API
+int raptor_uri_uri_string_is_absolute(const unsigned char* uri_string);
 
 
 /**
@@ -1461,6 +1491,8 @@ int raptor_qname_write(raptor_qname *qname, raptor_iostream* iostr);
 /* QName String utility functions */
 RAPTOR_API
 raptor_uri* raptor_qname_string_to_uri(raptor_namespace_stack *nstack,  const unsigned char *name, size_t name_len);
+RAPTOR_API
+unsigned char* raptor_qname_format_as_xml(const raptor_qname *qname, size_t *length_p);
 
 /* XML Namespaces Stack class */
 RAPTOR_API
@@ -1552,6 +1584,8 @@ void* raptor_sequence_delete_at(raptor_sequence* seq, int idx);
 RAPTOR_API
 void raptor_sequence_sort(raptor_sequence* seq, raptor_data_compare_handler compare);
 RAPTOR_API
+void raptor_sequence_sort_r(raptor_sequence* seq, raptor_data_compare_arg_handler compare, void* user_data);
+RAPTOR_API
 int raptor_sequence_swap(raptor_sequence* seq, int i, int j);
 RAPTOR_API
 int raptor_sequence_reverse(raptor_sequence* seq, int start_index, int length);
@@ -1774,15 +1808,64 @@ RAPTOR_API
 int raptor_iostream_read_eof(raptor_iostream *iostr);
 
 /* I/O Stream utility functions */
+
+/**
+ * raptor_escaped_write_bitflags:
+ * @RAPTOR_ESCAPED_WRITE_BITFLAG_BS_ESCAPES_BF   : Allow \b \f,
+ * @RAPTOR_ESCAPED_WRITE_BITFLAG_BS_ESCAPES_TNRU : ALlow \t \n \r \u
+ * @RAPTOR_ESCAPED_WRITE_BITFLAG_UTF8            : Allow UTF-8 for printable U *
+ * @RAPTOR_ESCAPED_WRITE_BITFLAG_SPARQL_URI_ESCAPES: Must escape #x00-#x20<>\"{}|^` in URIs
+ * @RAPTOR_ESCAPED_WRITE_NTRIPLES_LITERAL: N-Triples literal
+ * @RAPTOR_ESCAPED_WRITE_NTRIPLES_URI: N-Triples URI
+ * @RAPTOR_ESCAPED_WRITE_SPARQL_LITERAL: SPARQL literal: allows raw UTF8 for printable literals
+ * @RAPTOR_ESCAPED_WRITE_SPARQL_LONG_LITERAL: SPARQL long literal: no BS-escapes allowed
+ * @RAPTOR_ESCAPED_WRITE_SPARQL_URI: SPARQL uri: have to escape certain characters
+ * @RAPTOR_ESCAPED_WRITE_TURTLE_URI: Turtle 2013 URIs (like SPARQL)
+ * @RAPTOR_ESCAPED_WRITE_TURTLE_LITERAL: Turtle 2013 literals (like SPARQL)
+ * @RAPTOR_ESCAPED_WRITE_TURTLE_LONG_LITERAL: Turtle 2013 long literals (like SPARQL)
+ * @RAPTOR_ESCAPED_WRITE_JSON_LITERAL: JSON literals: \b \f \t \r \n and \u \U
+ *
+ * Bit flags for raptor_string_escaped_write() and friends.
+ */
+typedef enum {
+  RAPTOR_ESCAPED_WRITE_BITFLAG_BS_ESCAPES_BF      = 1,
+  RAPTOR_ESCAPED_WRITE_BITFLAG_BS_ESCAPES_TNRU    = 2,
+  RAPTOR_ESCAPED_WRITE_BITFLAG_UTF8               = 4,
+  RAPTOR_ESCAPED_WRITE_BITFLAG_SPARQL_URI_ESCAPES = 8,
+
+  /* N-Triples - favour writing \u, \U over UTF8 */
+  RAPTOR_ESCAPED_WRITE_NTRIPLES_LITERAL = RAPTOR_ESCAPED_WRITE_BITFLAG_BS_ESCAPES_TNRU | RAPTOR_ESCAPED_WRITE_BITFLAG_BS_ESCAPES_BF,
+  RAPTOR_ESCAPED_WRITE_NTRIPLES_URI     = RAPTOR_ESCAPED_WRITE_BITFLAG_SPARQL_URI_ESCAPES,
+
+  /* SPARQL literal: allows raw UTF8 for printable literals */
+  RAPTOR_ESCAPED_WRITE_SPARQL_LITERAL = RAPTOR_ESCAPED_WRITE_BITFLAG_UTF8,
+
+  /* SPARQL long literal: no BS-escapes allowed */
+  RAPTOR_ESCAPED_WRITE_SPARQL_LONG_LITERAL = RAPTOR_ESCAPED_WRITE_BITFLAG_UTF8,
+
+  /* SPARQL uri: have to escape certain characters */
+  RAPTOR_ESCAPED_WRITE_SPARQL_URI     = RAPTOR_ESCAPED_WRITE_BITFLAG_UTF8 | RAPTOR_ESCAPED_WRITE_BITFLAG_SPARQL_URI_ESCAPES,
+
+  /* Turtle (2013) escapes are like SPARQL */
+  RAPTOR_ESCAPED_WRITE_TURTLE_URI     = RAPTOR_ESCAPED_WRITE_SPARQL_URI,
+  RAPTOR_ESCAPED_WRITE_TURTLE_LITERAL = RAPTOR_ESCAPED_WRITE_SPARQL_LITERAL,
+  RAPTOR_ESCAPED_WRITE_TURTLE_LONG_LITERAL = RAPTOR_ESCAPED_WRITE_SPARQL_LONG_LITERAL,
+
+  /* JSON literals: \b \f \t \r \n and \u \U */
+  RAPTOR_ESCAPED_WRITE_JSON_LITERAL = RAPTOR_ESCAPED_WRITE_BITFLAG_BS_ESCAPES_TNRU | RAPTOR_ESCAPED_WRITE_BITFLAG_BS_ESCAPES_BF
+} raptor_escaped_write_bitflags;
+
+
 RAPTOR_API
 int raptor_string_ntriples_write(const unsigned char *string, size_t len, const char delim, raptor_iostream *iostr);
 RAPTOR_API
 int raptor_bnodeid_ntriples_write(const unsigned char *bnodeid, size_t len, raptor_iostream *iostr);
-RAPTOR_API
-int raptor_string_python_write(const unsigned char *string, size_t len, const char delim, int flags, raptor_iostream *iostr);
+RAPTOR_API RAPTOR_DEPRECATED
+int raptor_string_python_write(const unsigned char *string, size_t len, const char delim, unsigned int mode, raptor_iostream *iostr);
 RAPTOR_API
 int raptor_statement_ntriples_write(const raptor_statement *statement, raptor_iostream* iostr, int write_graph_term);
-
+RAPTOR_API
+int raptor_string_escaped_write(const unsigned char *string, size_t len, const char delim, unsigned int flags, raptor_iostream *iostr);
 
 
 /* Parser and Serializer options */
@@ -2092,6 +2175,10 @@ int raptor_avltree_iterator_next(raptor_avltree_iterator* iterator);
 RAPTOR_API
 void* raptor_avltree_iterator_get(raptor_avltree_iterator* iterator);
 
+/* utility methods */
+RAPTOR_API
+void raptor_sort_r(void *base, size_t nel, size_t width, raptor_data_compare_arg_handler compar, void *user_data);
+
 
 #ifdef __cplusplus
 }

external/redland/raptor/raptor_config.h

@@ -72,6 +72,15 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
+/* Define to 1 if you have the `qsort_r' function. */
+#undef HAVE_QSORT_R
+
+/* Define to 1 if you have the `qsort_s' function. */
+/* note: MSVC has qsort_s but the sort_r.h code uses advanced features like
+ * "inline" that MSVC 2013 doesn't understand; fortunately there's another
+ * level of fallback... */
+#undef HAVE_QSORT_S
+
 /* Raptor raptor_parse_date available */
 #undef HAVE_RAPTOR_PARSE_DATE
 
@@ -129,6 +138,9 @@
 /* Define to 1 if you have the `vsnprintf' function. */
 #define HAVE_VSNPRINTF 1
 
+/* Flex version as a decimal */
+#define FLEX_VERSION_DECIMAL 20539
+
 /* Define to 1 if you have the `xmlCtxtUseOptions' function. */
 #define HAVE_XMLCTXTUSEOPTIONS 1
 
@@ -141,6 +153,9 @@
 /* Define to 1 if you have the <yajl/yajl_parse.h> header file. */
 #undef HAVE_YAJL_YAJL_PARSE_H
 
+/* Is __FUNCTION__ available */
+#define HAVE___FUNCTION__ 1
+
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
 #undef LT_OBJDIR
@@ -263,7 +278,7 @@
 #undef RAPTOR_SERIALIZER_TURTLE
 
 /* Release version as a decimal */
-#define RAPTOR_VERSION_DECIMAL 20009
+#define RAPTOR_VERSION_DECIMAL 20015
 
 /* Major version number */
 #define RAPTOR_VERSION_MAJOR 2
@@ -272,7 +287,7 @@
 #define RAPTOR_VERSION_MINOR 0
 
 /* Release version number */
-#define RAPTOR_VERSION_RELEASE 9
+#define RAPTOR_VERSION_RELEASE 15
 
 /* Have libcurl WWW library */
 #undef RAPTOR_WWW_LIBCURL
@@ -299,7 +314,7 @@
 #undef TIME_WITH_SYS_TIME
 
 /* Version number of package */
-#define VERSION "2.0.9"
+#define VERSION "2.0.15"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */

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)

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)

external/redland/rasqal/rasqal-msvc.patch.1

-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);

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 = \

external/redland/redland/librdf.h

@@ -100,14 +100,14 @@ extern "C" {
  *
  * Format: major * 10000 + minor * 100 + release
  */
-#define LIBRDF_VERSION 10016
+#define LIBRDF_VERSION 10017
 
 /**
  * LIBRDF_VERSION_STRING:
  *
  * Redland librdf library version string
  */
-#define LIBRDF_VERSION_STRING "1.0.16"
+#define LIBRDF_VERSION_STRING "1.0.17"
 
 /**
  * LIBRDF_VERSION_MAJOR:
@@ -128,7 +128,7 @@ extern "C" {
  *
  * Redland librdf library release
  */
-#define LIBRDF_VERSION_RELEASE 16
+#define LIBRDF_VERSION_RELEASE 17
 
 
 

external/redland/redland/redland-msvc.patch.1

 --- 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,8 +43,11 @@
- #define HAVE_STRICMP 1
- 
+@@ -43,7 +43,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
@@ -99,25 +96,6 @@
  
  /* Define to 1 if you have the <stdint.h> header file. */
  #define HAVE_STDINT_H 1
-@@ -246,7 +252,7 @@
- #define SIZEOF_UNSIGNED_LONG_LONG 8
- 
- /* SQLite API version */
--#define REDLAND_SQLITE_API 3
-+// #define REDLAND_SQLITE_API 3
- 
- /* Define to 1 if you have the ANSI C header files. */
- #define STDC_HEADERS 1
-@@ -254,6 +260,9 @@
- /* Building file storage */
- #define STORAGE_FILE 1
- 
-+#define STORAGE_HASHES 1
-+#define STORAGE_MEMORY 1
-+
- /* Building MySQL storage */
- /* #define STORAGE_MYSQL 1 */
- 
 @@ -261,7 +270,7 @@
  /*#undef STORAGE_POSTGRESQL*/
  
@@ -127,12 +105,3 @@
  
  /* Building 3store storage */
  /*#undef STORAGE_TSTORE*/
-@@ -273,7 +282,7 @@
- #define VERSION "1.0.16"
- 
- /* Use POSIX threads */
--#define WITH_THREADS
-+#undef WITH_THREADS
- 
- /* Define to 1 if your processor stores words with the most significant byte
-    first (like Motorola and SPARC, unlike Intel and VAX). */

external/redland/redland/redland-query-rasqal-avoid-assert.patch.1

-avoid an assert inside rasqal_query_results_next_triple
-
-Happens on the "CONSTRUCT" query in the unordf test.
-
---- redland/src/rdf_query_rasqal.c	2013-04-14 17:32:08.442000000 +0200
-+++ redland/src/rdf_query_rasqal.c	2013-04-14 17:31:57.834000000 +0200
-@@ -1096,7 +1096,9 @@
-     scontext->statement=NULL;
-   }
- 
--  scontext->finished=rasqal_query_results_next_triple(scontext->qcontext->results);
-+  scontext->finished = !scontext->qcontext->results;
-+  if(!scontext->finished)
-+    scontext->finished=rasqal_query_results_next_triple(scontext->qcontext->results);
-   if(!scontext->finished)
-     librdf_query_rasqal_query_results_update_statement(scontext);
-