summaryrefslogtreecommitdiff
path: root/redland/rasqal
diff options
context:
space:
mode:
Diffstat (limited to 'redland/rasqal')
-rw-r--r--redland/rasqal/makefile.mk191
-rw-r--r--redland/rasqal/rasqal-0.9.16.aix.patch (renamed from redland/rasqal/rasqal-aix.patch)0
-rw-r--r--redland/rasqal/rasqal-0.9.16.autotools.patch (renamed from redland/rasqal/rasqal-0.9.16.patch.autotools)0
-rw-r--r--redland/rasqal/rasqal-0.9.16.bundled-soname.patch (renamed from redland/rasqal/rasqal-0.9.16.patch.bundled-soname)0
-rw-r--r--redland/rasqal/rasqal-0.9.16.legal.patch (renamed from redland/rasqal/rasqal-0.9.16.patch.legal)0
-rw-r--r--redland/rasqal/rasqal-0.9.16.mingw.patch (renamed from redland/rasqal/rasqal-0.9.16.patch.mingw)0
-rw-r--r--redland/rasqal/rasqal-0.9.16.no-soname.patch (renamed from redland/rasqal/rasqal-0.9.16.patch.no-soname)0
-rw-r--r--redland/rasqal/rasqal-0.9.16.ooo_build.patch (renamed from redland/rasqal/rasqal-0.9.16.patch.ooo_build)0
-rw-r--r--redland/rasqal/rasqal-0.9.16.patch.dmake98
-rw-r--r--redland/rasqal/rasqal-0.9.16.win32.patch (renamed from redland/rasqal/rasqal-0.9.16.patch.win32)0
-rw-r--r--redland/rasqal/rasqal.def186
-rw-r--r--redland/rasqal/rasqal2.map194
12 files changed, 186 insertions, 483 deletions
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
deleted file mode 100644
index 6fa126061f8b..000000000000
--- a/redland/rasqal/makefile.mk
+++ /dev/null
@@ -1,191 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=redland
-TARGET=so_rasqal
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(SYSTEM_REDLAND)" == "YES"
-all:
- @echo "An already available installation of Redland RDF should exist on your system."
- @echo "Therefore the version provided here does not need to be built in addition."
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-.INCLUDE : ../redlandversion.mk
-
-RASQALVERSION=0.9.16
-
-TARFILE_NAME=rasqal-$(RASQALVERSION)
-TARFILE_MD5=fca8706f2c4619e2fa3f8f42f8fc1e9d
-
-ADDITIONAL_FILES=src/makefile.mk src/rasqal_config.h
-
-OOO_PATCH_FILES= \
- $(TARFILE_NAME).patch.legal \
- $(TARFILE_NAME).patch.autotools \
- $(TARFILE_NAME).patch.ooo_build \
- $(TARFILE_NAME).patch.dmake \
- $(TARFILE_NAME).patch.win32 \
- rasqal-aix.patch
-
-.IF "$(OS)" != "WNT"
-OOO_PATCH_FILES+= \
- $(TARFILE_NAME).patch.bundled-soname
-.ENDIF
-
-PATCH_FILES=$(OOO_PATCH_FILES)
-
-.IF "$(OS)"=="ANDROID"
-PATCH_FILES+=$(TARFILE_NAME).patch.no-soname
-.ENDIF
-
-.IF "$(OS)"=="WNT"
-.IF "$(COM)"=="GCC"
-OOO_PATCH_FILES+=$(TARFILE_NAME).patch.mingw
-rasqal_CC=$(CC) -mthreads
-.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
-rasqal_CC+=-shared-libgcc
-.ENDIF
-rasqal_LIBS=
-
-rasqal_LDFLAGS=-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols
-.IF "$(ILIB)"!=""
-rasqal_LDFLAGS+= -L$(ILIB:s/;/ -L/)
-.ENDIF
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-CONFIGURE_FLAGS=--disable-static --enable-shared --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --with-decimal=none --with-www=xml --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) lt_cv_cc_dll_switch="-shared" CC="$(rasqal_CC)" CPPFLAGS="$(INCLUDE)" LDFLAGS="$(rasqal_LDFLAGS)" LIBS="$(rasqal_LIBS)" OBJDUMP="$(WRAPCMD) $(HOST_PLATFORM)-objdump" LIBXML2LIB="$(LIBXML2LIB)" XSLTLIB="$(XSLTLIB)"
-BUILD_ACTION=$(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)
-.ELSE
-# there is no wntmsci build environment in the tarball; we use custom dmakefile
-BUILD_ACTION=dmake
-BUILD_DIR=$(CONFIGURE_DIR)$/src
-.ENDIF
-.ELSE # "WNT"
-
-.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-LDFLAGS:=-Wl,-z,origin -Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec
-.ENDIF # "$(OS)$(COM)"=="LINUXGCC"
-.IF "$(OS)$(COM)"=="SOLARISC52"
-LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
-.ENDIF # "$(OS)$(COM)"=="SOLARISC52"
-
-.IF "$(DISABLE_DYNLOADING)"=="TRUE"
-CFLAGS=-fvisibility=hidden
-.ENDIF
-
-.IF "$(COM)"=="C52" && "$(CPU)"=="U"
-CFLAGS+=-m64
-.EXPORT: CFLAGS
-.ENDIF
-
-# NB: SOLARDIR before SYSBASE, because linux SYSBASE contains obsolete libcrypto
-CPPFLAGS+:=-I$(SOLARINCDIR)$/external
-LDFLAGS+:=-L$(SOLARLIBDIR)
-
-.IF "$(OS)"=="AIX"
-LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO)
-.ENDIF
-
-.IF "$(SYSBASE)"!=""
-CPPFLAGS+:=-I$(SYSBASE)$/usr$/include
-.IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX"
-LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl
-.ENDIF
-.ENDIF # "$(SYSBASE)"!=""
-
-.IF "$(OS)"=="MACOSX" && "$(SYSTEM_LIBXML)" != "YES"
-LDFLAGS+:=-Wl,-dylib_file,@loader_path/../ure-link/lib/libxml2.2.dylib:$(SOLARLIBDIR)/libxml2.2.dylib
-.ENDIF
-
-CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS)
-LDFLAGS+:=$(EXTRA_LINKFLAGS)
-XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
-
-.EXPORT: CPPFLAGS
-.EXPORT: LDFLAGS
-.EXPORT: LIBXML2LIB
-.EXPORT: XSLTLIB
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-.IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
-CONFIGURE_FLAGS=--disable-shared
-.ELSE
-CONFIGURE_FLAGS=--disable-static
-.ENDIF
-CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
-.IF "$(OS)" == "MACOSX"
-CONFIGURE_FLAGS += \
- --prefix=/@.__________________________________________________$(EXTRPATH)
-.END
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ENDIF
-BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)
-.ENDIF
-
-
-OUT2INC+=src$/rasqal.h
-
-.IF "$(OS)"=="MACOSX"
-OUT2LIB+=src$/.libs$/librasqal-lo.$(RASQAL_MAJOR).dylib src$/.libs$/librasqal.dylib
-OUT2BIN+=src/rasqal-config
-.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
-OUT2LIB+=src$/.libs$/librasqal.a
-OUT2BIN+=src/rasqal-config
-.ELIF "$(OS)"=="WNT"
-.IF "$(COM)"=="GCC"
-OUT2LIB+=src$/.libs$/*.a
-OUT2BIN+=src$/.libs$/*.dll
-OUT2BIN+=src/rasqal-config
-.ELSE
-# if we use dmake, this is done automagically
-.ENDIF
-.ELSE
-OUT2LIB+=src$/.libs$/librasqal-lo.so.$(RASQAL_MAJOR) src$/.libs$/librasqal.so
-OUT2BIN+=src/rasqal-config
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
diff --git a/redland/rasqal/rasqal-aix.patch b/redland/rasqal/rasqal-0.9.16.aix.patch
index 86470d421f81..86470d421f81 100644
--- a/redland/rasqal/rasqal-aix.patch
+++ b/redland/rasqal/rasqal-0.9.16.aix.patch
diff --git a/redland/rasqal/rasqal-0.9.16.patch.autotools b/redland/rasqal/rasqal-0.9.16.autotools.patch
index a8e07a377733..a8e07a377733 100644
--- a/redland/rasqal/rasqal-0.9.16.patch.autotools
+++ b/redland/rasqal/rasqal-0.9.16.autotools.patch
diff --git a/redland/rasqal/rasqal-0.9.16.patch.bundled-soname b/redland/rasqal/rasqal-0.9.16.bundled-soname.patch
index 5e5bea4378a0..5e5bea4378a0 100644
--- a/redland/rasqal/rasqal-0.9.16.patch.bundled-soname
+++ b/redland/rasqal/rasqal-0.9.16.bundled-soname.patch
diff --git a/redland/rasqal/rasqal-0.9.16.patch.legal b/redland/rasqal/rasqal-0.9.16.legal.patch
index 59b125d6b64e..59b125d6b64e 100644
--- a/redland/rasqal/rasqal-0.9.16.patch.legal
+++ b/redland/rasqal/rasqal-0.9.16.legal.patch
diff --git a/redland/rasqal/rasqal-0.9.16.patch.mingw b/redland/rasqal/rasqal-0.9.16.mingw.patch
index 9c42a986b1d0..9c42a986b1d0 100644
--- a/redland/rasqal/rasqal-0.9.16.patch.mingw
+++ b/redland/rasqal/rasqal-0.9.16.mingw.patch
diff --git a/redland/rasqal/rasqal-0.9.16.patch.no-soname b/redland/rasqal/rasqal-0.9.16.no-soname.patch
index 08c54acfe5ab..08c54acfe5ab 100644
--- a/redland/rasqal/rasqal-0.9.16.patch.no-soname
+++ b/redland/rasqal/rasqal-0.9.16.no-soname.patch
diff --git a/redland/rasqal/rasqal-0.9.16.patch.ooo_build b/redland/rasqal/rasqal-0.9.16.ooo_build.patch
index 827147995e6f..827147995e6f 100644
--- a/redland/rasqal/rasqal-0.9.16.patch.ooo_build
+++ b/redland/rasqal/rasqal-0.9.16.ooo_build.patch
diff --git a/redland/rasqal/rasqal-0.9.16.patch.dmake b/redland/rasqal/rasqal-0.9.16.patch.dmake
deleted file mode 100644
index 6795eb95c43d..000000000000
--- a/redland/rasqal/rasqal-0.9.16.patch.dmake
+++ /dev/null
@@ -1,98 +0,0 @@
---- misc/rasqal-0.9.16/src/makefile.mk Thu Nov 6 15:56:45 2008
-+++ misc/build/rasqal-0.9.16/src/makefile.mk Thu Nov 6 15:55:09 2008
-@@ -1,1 +1,94 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2000, 2010 Oracle and/or its affiliates.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org. If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=redland
-+TARGET=rasqal
-+LIBTARGET=NO
-+UWINAPILIB=
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-+
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE : settings.mk
-+
-+CDEFS+=-DRASQAL_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS -D_MT
-+
-+# --- Files --------------------------------------------------------
-+
-+SLOFILES = \
-+ $(SLO)$/rasqal_datetime.obj \
-+ $(SLO)$/rasqal_decimal.obj \
-+ $(SLO)$/rasqal_engine.obj \
-+ $(SLO)$/rasqal_expr.obj \
-+ $(SLO)$/rasqal_feature.obj \
-+ $(SLO)$/rasqal_general.obj \
-+ $(SLO)$/rasqal_graph_pattern.obj \
-+ $(SLO)$/rasqal_literal.obj \
-+ $(SLO)$/rasqal_map.obj \
-+ $(SLO)$/rasqal_query_results.obj \
-+ $(SLO)$/rasqal_query.obj \
-+ $(SLO)$/rasqal_raptor.obj \
-+ $(SLO)$/rasqal_result_formats.obj \
-+ $(SLO)$/rasqal_rowsource.obj \
-+ $(SLO)$/rasqal_sparql_xml.obj \
-+ $(SLO)$/rasqal_xsd_datatypes.obj \
-+ $(SLO)$/rdql_lexer.obj \
-+ $(SLO)$/rdql_parser.obj \
-+ $(SLO)$/sparql_lexer.obj \
-+ $(SLO)$/sparql_parser.obj \
-+ $(SLO)$/strcasecmp.obj \
-+
-+
-+# $(SLO)$/rasqal_redland.obj \
-+
-+SHL1DEPN= makefile.mk
-+SHL1OBJS= $(SLOFILES)
-+SHL1USE_EXPORTS=name
-+
-+#SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-+SHL1TARGET= $(TARGET)
-+SHL1IMPLIB= lib$(TARGET)
-+
-+#SHL1VERSIONMAP=../service/exports.map
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+DEF1NAME=$(SHL1TARGET)
-+
-+SHL1STDLIBS= \
-+ $(PRJ)$/$(INPATH)$/lib$/libraptor.lib \
-+
-+
-+#$(LIBXML2LIB) \
-+# $(XSLTLIB) \
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE : target.mk
-+
diff --git a/redland/rasqal/rasqal-0.9.16.patch.win32 b/redland/rasqal/rasqal-0.9.16.win32.patch
index 51bad96e0e29..51bad96e0e29 100644
--- a/redland/rasqal/rasqal-0.9.16.patch.win32
+++ b/redland/rasqal/rasqal-0.9.16.win32.patch
diff --git a/redland/rasqal/rasqal.def b/redland/rasqal/rasqal.def
new file mode 100644
index 000000000000..2da34feb7b51
--- /dev/null
+++ b/redland/rasqal/rasqal.def
@@ -0,0 +1,186 @@
+LIBRARY RASQAL
+EXPORTS
+rasqal_xsd_decimal_set_string
+rasqal_xsd_decimal_print
+rasqal_xsd_decimal_as_counted_string
+rasqal_xsd_decimal_as_string
+rasqal_new_xsd_decimal
+rasqal_free_xsd_decimal
+rasqal_xsd_decimal_set_long
+rasqal_xsd_decimal_set_double
+rasqal_xsd_decimal_add
+rasqal_xsd_decimal_subtract
+rasqal_xsd_decimal_multiply
+rasqal_xsd_decimal_divide
+rasqal_xsd_decimal_negate
+rasqal_xsd_decimal_equals
+rasqal_xsd_decimal_compare
+rasqal_xsd_decimal_is_zero
+rasqal_xsd_decimal_get_double
+rasqal_set_triples_source_factory
+rasqal_new_variable
+rasqal_new_variable_typed
+rasqal_data_graph_print
+rasqal_prefix_print
+rasqal_new_data_graph
+rasqal_new_prefix
+rasqal_new_triple
+rasqal_new_triple_from_triple
+rasqal_new_0op_expression
+rasqal_new_1op_expression
+rasqal_new_2op_expression
+rasqal_new_3op_expression
+rasqal_new_string_op_expression
+rasqal_new_literal_expression
+rasqal_new_function_expression
+rasqal_new_cast_expression
+rasqal_free_variable
+rasqal_free_expression
+rasqal_free_data_graph
+rasqal_free_prefix
+rasqal_free_triple
+rasqal_expression_evaluate
+rasqal_variable_set_value
+rasqal_variable_print
+rasqal_expression_print
+rasqal_expression_print_op
+rasqal_triple_print
+rasqal_expression_visit
+rasqal_new_expression_from_expression
+rasqal_triple_get_origin
+rasqal_triple_set_origin
+rasqal_features_enumerate
+rasqal_feature_from_uri
+rasqal_get_feature_count
+rasqal_feature_value_type
+rasqal_version_decimal
+rasqal_version_release
+rasqal_version_minor
+rasqal_version_major
+rasqal_version_string
+rasqal_home_url_string
+rasqal_license_string
+rasqal_copyright_string
+rasqal_short_copyright_string
+rasqal_language_name_check
+rasqal_query_set_default_generate_bnodeid_parameters
+rasqal_free_memory
+rasqal_alloc_memory
+rasqal_calloc_memory
+rasqal_query_set_generate_bnodeid_handler
+rasqal_languages_enumerate
+rasqal_graph_pattern_add_constraint
+rasqal_graph_pattern_print
+rasqal_graph_pattern_add_sub_graph_pattern
+rasqal_graph_pattern_visit
+rasqal_graph_pattern_get_constraint
+rasqal_graph_pattern_get_triple
+rasqal_graph_pattern_get_sub_graph_pattern
+rasqal_graph_pattern_get_sub_graph_pattern_sequence
+rasqal_graph_pattern_get_index
+rasqal_graph_pattern_operator_as_string
+rasqal_graph_pattern_get_operator
+rasqal_graph_pattern_get_constraint_sequence
+rasqal_literal_compare
+rasqal_literal_equals
+rasqal_new_double_literal
+rasqal_new_integer_literal
+rasqal_new_float_literal
+rasqal_new_typed_literal
+rasqal_new_decimal_literal
+rasqal_new_decimal_literal_from_decimal
+rasqal_new_string_literal
+rasqal_new_uri_literal
+rasqal_new_boolean_literal
+rasqal_literal_as_node
+rasqal_free_literal
+rasqal_literal_print
+rasqal_literal_print_type
+rasqal_new_pattern_literal
+rasqal_new_simple_literal
+rasqal_new_variable_literal
+rasqal_literal_as_string
+rasqal_literal_as_string_flags
+rasqal_literal_value
+rasqal_literal_datatype
+rasqal_literal_as_variable
+rasqal_new_literal_from_literal
+rasqal_free_query_results
+rasqal_query_results_get_bindings
+rasqal_query_results_get_binding_value
+rasqal_query_results_get_binding_value_by_name
+rasqal_query_results_get_triple
+rasqal_query_results_next
+rasqal_query_results_next_triple
+rasqal_query_results_write
+rasqal_query_results_formatter_write
+rasqal_query_results_get_boolean
+rasqal_query_results_get_bindings_count
+rasqal_query_results_get_binding_name
+rasqal_query_results_finished
+rasqal_query_results_get_count
+rasqal_query_results_is_syntax
+rasqal_query_results_is_graph
+rasqal_query_results_is_boolean
+rasqal_query_results_is_bindings
+rasqal_new_query
+rasqal_free_query
+rasqal_query_set_feature_string
+rasqal_query_get_feature_string
+rasqal_query_add_data_graph
+rasqal_query_set_variable
+rasqal_query_add_prefix
+rasqal_query_add_variable
+rasqal_query_prepare
+rasqal_query_execute
+rasqal_query_print
+rasqal_query_graph_pattern_visit
+rasqal_query_write
+rasqal_query_get_graph_pattern_sequence
+rasqal_query_get_graph_pattern
+rasqal_query_get_data_graph
+rasqal_query_get_variable
+rasqal_query_has_variable
+rasqal_query_get_triple
+rasqal_query_get_prefix
+rasqal_query_get_construct_triple
+rasqal_query_get_order_condition
+rasqal_query_get_group_condition
+rasqal_query_escape_counted_string
+rasqal_query_iostream_write_escaped_counted_string
+rasqal_query_get_group_conditions_sequence
+rasqal_query_get_order_conditions_sequence
+rasqal_query_get_wildcard
+rasqal_query_get_verb
+rasqal_query_set_user_data
+rasqal_query_get_user_data
+rasqal_query_verb_as_string
+rasqal_query_get_construct_triples_sequence
+rasqal_query_get_query_graph_pattern
+rasqal_query_get_prefix_sequence
+rasqal_query_get_triple_sequence
+rasqal_query_get_all_variable_sequence
+rasqal_query_get_anonymous_variable_sequence
+rasqal_query_get_bound_variable_sequence
+rasqal_query_get_data_graph_sequence
+rasqal_query_set_offset
+rasqal_query_get_offset
+rasqal_query_set_limit
+rasqal_query_get_limit
+rasqal_query_set_explain
+rasqal_query_get_explain
+rasqal_query_set_distinct
+rasqal_query_get_distinct
+rasqal_query_get_feature
+rasqal_query_set_feature
+rasqal_query_set_warning_handler
+rasqal_query_set_error_handler
+rasqal_query_set_fatal_error_handler
+rasqal_query_get_label
+rasqal_query_get_name
+rasqal_query_results_formats_check
+rasqal_new_query_results_formatter
+rasqal_new_query_results_formatter_by_mime_type
+rasqal_query_results_formats_enumerate
+rasqal_free_query_results_formatter
+rasqal_query_results_formatter_get_mime_type
diff --git a/redland/rasqal/rasqal2.map b/redland/rasqal/rasqal2.map
deleted file mode 100644
index 622043ac984c..000000000000
--- a/redland/rasqal/rasqal2.map
+++ /dev/null
@@ -1,194 +0,0 @@
-UDK_3_0_0 {
-global:
-GetVersionInfo;
-rasqal_xsd_decimal_set_string;
-rasqal_xsd_decimal_print;
-rasqal_xsd_decimal_as_counted_string;
-rasqal_xsd_decimal_as_string;
-rasqal_new_xsd_decimal;
-rasqal_free_xsd_decimal;
-rasqal_xsd_decimal_set_long;
-rasqal_xsd_decimal_set_double;
-rasqal_xsd_decimal_add;
-rasqal_xsd_decimal_subtract;
-rasqal_xsd_decimal_multiply;
-rasqal_xsd_decimal_divide;
-rasqal_xsd_decimal_negate;
-rasqal_xsd_decimal_equals;
-rasqal_xsd_decimal_compare;
-rasqal_xsd_decimal_is_zero;
-rasqal_xsd_decimal_get_double;
-rasqal_set_triples_source_factory;
-rasqal_new_variable;
-rasqal_new_variable_typed;
-rasqal_data_graph_print;
-rasqal_prefix_print;
-rasqal_new_data_graph;
-rasqal_new_prefix;
-rasqal_new_triple;
-rasqal_new_triple_from_triple;
-rasqal_new_0op_expression;
-rasqal_new_1op_expression;
-rasqal_new_2op_expression;
-rasqal_new_3op_expression;
-rasqal_new_string_op_expression;
-rasqal_new_literal_expression;
-rasqal_new_function_expression;
-rasqal_new_cast_expression;
-rasqal_free_variable;
-rasqal_free_expression;
-rasqal_free_data_graph;
-rasqal_free_prefix;
-rasqal_free_triple;
-rasqal_expression_evaluate;
-rasqal_variable_set_value;
-rasqal_variable_print;
-rasqal_expression_print;
-rasqal_expression_print_op;
-rasqal_triple_print;
-rasqal_expression_foreach;
-rasqal_expression_visit;
-rasqal_new_expression_from_expression;
-rasqal_triple_get_origin;
-rasqal_triple_set_origin;
-rasqal_features_enumerate;
-rasqal_feature_from_uri;
-rasqal_get_feature_count;
-rasqal_feature_value_type;
-rasqal_version_decimal;
-rasqal_version_release;
-rasqal_version_minor;
-rasqal_version_major;
-rasqal_version_string;
-rasqal_home_url_string;
-rasqal_license_string;
-rasqal_copyright_string;
-rasqal_short_copyright_string;
-rasqal_init;
-rasqal_finish;
-rasqal_language_name_check;
-rasqal_query_set_default_generate_bnodeid_parameters;
-rasqal_free_memory;
-rasqal_alloc_memory;
-rasqal_calloc_memory;
-rasqal_query_set_generate_bnodeid_handler;
-rasqal_languages_enumerate;
-rasqal_graph_pattern_add_constraint;
-rasqal_graph_pattern_print;
-rasqal_graph_pattern_add_sub_graph_pattern;
-rasqal_graph_pattern_get_flags;
-rasqal_graph_pattern_visit;
-rasqal_graph_pattern_get_constraint;
-rasqal_graph_pattern_get_triple;
-rasqal_graph_pattern_get_sub_graph_pattern;
-rasqal_graph_pattern_get_sub_graph_pattern_sequence;
-rasqal_graph_pattern_get_index;
-rasqal_graph_pattern_operator_as_string;
-rasqal_graph_pattern_get_operator;
-rasqal_graph_pattern_get_constraint_sequence;
-rasqal_new_floating_literal;
-rasqal_literal_compare;
-rasqal_literal_equals;
-rasqal_new_double_literal;
-rasqal_new_integer_literal;
-rasqal_new_float_literal;
-rasqal_new_typed_literal;
-rasqal_new_decimal_literal;
-rasqal_new_decimal_literal_from_decimal;
-rasqal_new_string_literal;
-rasqal_new_uri_literal;
-rasqal_new_boolean_literal;
-rasqal_literal_as_node;
-rasqal_free_literal;
-rasqal_literal_print;
-rasqal_literal_print_type;
-rasqal_new_pattern_literal;
-rasqal_new_simple_literal;
-rasqal_new_variable_literal;
-rasqal_literal_as_string;
-rasqal_literal_as_string_flags;
-rasqal_literal_value;
-rasqal_literal_datatype;
-rasqal_literal_as_variable;
-rasqal_new_literal_from_literal;
-rasqal_free_query_results;
-rasqal_query_results_get_bindings;
-rasqal_query_results_get_binding_value;
-rasqal_query_results_get_binding_value_by_name;
-rasqal_query_results_get_triple;
-rasqal_query_results_next;
-rasqal_query_results_next_triple;
-rasqal_query_results_write;
-rasqal_query_results_formatter_write;
-rasqal_query_results_get_boolean;
-rasqal_query_results_get_bindings_count;
-rasqal_query_results_get_binding_name;
-rasqal_query_results_finished;
-rasqal_query_results_get_count;
-rasqal_query_results_is_syntax;
-rasqal_query_results_is_graph;
-rasqal_query_results_is_boolean;
-rasqal_query_results_is_bindings;
-rasqal_new_query;
-rasqal_free_query;
-rasqal_query_set_feature_string;
-rasqal_query_get_feature_string;
-rasqal_query_add_data_graph;
-rasqal_query_set_variable;
-rasqal_query_add_prefix;
-rasqal_query_add_variable;
-rasqal_query_prepare;
-rasqal_query_execute;
-rasqal_query_print;
-rasqal_query_graph_pattern_visit;
-rasqal_query_write;
-rasqal_query_get_graph_pattern_sequence;
-rasqal_query_get_graph_pattern;
-rasqal_query_get_data_graph;
-rasqal_query_get_variable;
-rasqal_query_has_variable;
-rasqal_query_get_triple;
-rasqal_query_get_prefix;
-rasqal_query_get_construct_triple;
-rasqal_query_get_order_condition;
-rasqal_query_get_group_condition;
-rasqal_query_escape_counted_string;
-rasqal_query_iostream_write_escaped_counted_string;
-rasqal_query_get_group_conditions_sequence;
-rasqal_query_get_order_conditions_sequence;
-rasqal_query_get_wildcard;
-rasqal_query_get_verb;
-rasqal_query_set_user_data;
-rasqal_query_get_user_data;
-rasqal_query_verb_as_string;
-rasqal_query_get_construct_triples_sequence;
-rasqal_query_get_query_graph_pattern;
-rasqal_query_get_prefix_sequence;
-rasqal_query_get_triple_sequence;
-rasqal_query_get_all_variable_sequence;
-rasqal_query_get_anonymous_variable_sequence;
-rasqal_query_get_bound_variable_sequence;
-rasqal_query_get_data_graph_sequence;
-rasqal_query_set_offset;
-rasqal_query_get_offset;
-rasqal_query_set_limit;
-rasqal_query_get_limit;
-rasqal_query_set_explain;
-rasqal_query_get_explain;
-rasqal_query_set_distinct;
-rasqal_query_get_distinct;
-rasqal_query_get_feature;
-rasqal_query_set_feature;
-rasqal_query_set_warning_handler;
-rasqal_query_set_error_handler;
-rasqal_query_set_fatal_error_handler;
-rasqal_query_get_label;
-rasqal_query_get_name;
-rasqal_query_results_formats_check;
-rasqal_new_query_results_formatter;
-rasqal_new_query_results_formatter_by_mime_type;
-rasqal_query_results_formats_enumerate;
-rasqal_query_results_formats_enumerate_full;
-rasqal_free_query_results_formatter;
-rasqal_query_results_formatter_get_mime_type;
-};