summaryrefslogtreecommitdiff
path: root/redland/rasqal
diff options
context:
space:
mode:
Diffstat (limited to 'redland/rasqal')
-rw-r--r--redland/rasqal/makefile.mk26
-rw-r--r--redland/rasqal/rasqal-0.9.16.patch.autotools38
-rw-r--r--redland/rasqal/rasqal-0.9.16.patch.dmake102
-rw-r--r--redland/rasqal/rasqal-0.9.16.patch.legal18
-rw-r--r--redland/rasqal/rasqal-0.9.16.patch.ooo_build34
-rw-r--r--redland/rasqal/rasqal-0.9.16.patch.win3243
6 files changed, 252 insertions, 9 deletions
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index e739671eef13..99d67b501f96 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.2.2 $
#
# This file is part of OpenOffice.org.
#
@@ -48,18 +48,26 @@ all:
.INCLUDE : ../redlandversion.mk
-RASQALVERSION=0.9.15
+RASQALVERSION=0.9.16
TARFILE_NAME=rasqal-$(RASQALVERSION)
-PATCH_FILES=..$/$(TARFILE_NAME).patch
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 \
+
+
+PATCH_FILES=$(OOO_PATCH_FILES)
+
+
.IF "$(OS)"=="OS2"
-# there is no wntmsci build environment in the tarball; we use custom dmakefile
BUILD_ACTION=dmake
BUILD_DIR=$(CONFIGURE_DIR)$/src
-
.ELIF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
CONFIGURE_DIR=
@@ -100,11 +108,13 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl
CPPFLAGS+:=$(EXTRA_CFLAGS)
LDFLAGS+:=$(EXTRA_LINKFLAGS)
+XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
.EXPORT: CPPFLAGS
.EXPORT: LDFLAGS
.EXPORT: LIBXML2LIB
.EXPORT: ZLIB3RDLIB
+.EXPORT: XSLTLIB
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
@@ -120,7 +130,7 @@ BUILD_DIR=$(CONFIGURE_DIR)
OUT2INC+=src$/rasqal.h
.IF "$(OS)"=="MACOSX"
-OUT2LIB+=src$/.libs$/librasqal.0.dylib src$/.libs$/librasqal.dylib
+OUT2LIB+=src$/.libs$/librasqal.$(RASQAL_MAJOR).dylib src$/.libs$/librasqal.dylib
OUT2BIN+=src/rasqal-config
.ELIF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
@@ -130,12 +140,10 @@ OUT2BIN+=src/rasqal-config
.ELSE
# if we use dmake, this is done automagically
.ENDIF
-
.ELIF "$(OS)"=="OS2"
# if we use dmake, this is done automagically
-
.ELSE
-OUT2LIB+=src$/.libs$/librasqal.so.0 src$/.libs$/librasqal.so
+OUT2LIB+=src$/.libs$/librasqal.so.$(RASQAL_MAJOR) src$/.libs$/librasqal.so
OUT2BIN+=src/rasqal-config
.ENDIF
diff --git a/redland/rasqal/rasqal-0.9.16.patch.autotools b/redland/rasqal/rasqal-0.9.16.patch.autotools
new file mode 100644
index 000000000000..100499dd3ed8
--- /dev/null
+++ b/redland/rasqal/rasqal-0.9.16.patch.autotools
@@ -0,0 +1,38 @@
+--- misc/rasqal-0.9.16/ltmain.sh Tue Apr 29 23:33:55 2008
++++ misc/build/rasqal-0.9.16/ltmain.sh Wed Feb 18 13:25:00 2009
+@@ -1565,6 +1565,11 @@
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ absdir=`cd "$dir" && pwd`
++ case $host_os in
++ mingw*)
++ absdir=`cygpath -m $absdir`
++ ;;
++ esac
+ if test -z "$absdir"; then
+ $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+ absdir="$dir"
+@@ -3262,9 +3267,9 @@
+ revision="$number_revision"
+ ;;
+ freebsd-aout|freebsd-elf|sunos)
+- current="$number_major"
+- revision="$number_minor"
+- age="0"
++ current=`expr $number_major + $number_minor`
++ age="$number_minor"
++ revision="$number_revision"
+ ;;
+ irix|nonstopux)
+ current=`expr $number_major + $number_minor`
+@@ -3344,8 +3349,8 @@
+ ;;
+
+ freebsd-elf)
+- major=".$current"
+- versuffix=".$current";
++ major=.`expr $current - $age`
++ versuffix="$major.$age.$revision"
+ ;;
+
+ irix | nonstopux)
diff --git a/redland/rasqal/rasqal-0.9.16.patch.dmake b/redland/rasqal/rasqal-0.9.16.patch.dmake
new file mode 100644
index 000000000000..e6d3621efa5f
--- /dev/null
+++ b/redland/rasqal/rasqal-0.9.16.patch.dmake
@@ -0,0 +1,102 @@
+--- 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,98 @@
+-dummy
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# Copyright 2008 by Sun Microsystems, Inc.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile: rasqal-0.9.16.patch,v $
++#
++# $Revision: 1.1.2.1 $
++#
++# 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
++UWINAPIDLL=
++
++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.legal b/redland/rasqal/rasqal-0.9.16.patch.legal
new file mode 100644
index 000000000000..59b125d6b64e
--- /dev/null
+++ b/redland/rasqal/rasqal-0.9.16.patch.legal
@@ -0,0 +1,18 @@
+--- misc/rasqal-0.9.16/LICENSE.txt Fri Jun 27 04:24:52 2008
++++ misc/build/rasqal-0.9.16/LICENSE.txt Thu Nov 6 12:06:55 2008
+@@ -60,3 +60,15 @@
+
+ Copyright (C) 2003-2008 Dave Beckett
+ Copyright (C) 2003-2005 University of Bristol
++
++
++LGPL Disclaimer
++
++For the avoidance of doubt, except that if any license choice other
++than GPL or LGPL is available it will apply instead, Sun elects to
++use only the Lesser General Public License version 2.1 (LGPLv2) at
++this time for any software where a choice of LGPL license versions
++is made available with the language indicating that LGPLv2.1 or any
++later version may be used, or where a choice of which version of the
++LGPL is applied is otherwise unspecified.
++
diff --git a/redland/rasqal/rasqal-0.9.16.patch.ooo_build b/redland/rasqal/rasqal-0.9.16.patch.ooo_build
new file mode 100644
index 000000000000..eb4d24bb9c45
--- /dev/null
+++ b/redland/rasqal/rasqal-0.9.16.patch.ooo_build
@@ -0,0 +1,34 @@
+--- misc/rasqal-0.9.16/src/rasqal-config.in Sun Jun 22 07:07:12 2008
++++ misc/build/rasqal-0.9.16/src/rasqal-config.in Thu Nov 6 12:10:52 2008
+@@ -22,10 +22,19 @@
+ #
+ #
+
+-prefix=@prefix@
+-includes="-I@includedir@/@PACKAGE@"
++prefix=${SOLARVERSION}/${INPATH}
++exec_prefix=${SOLARVERSION}/${INPATH}
++#includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
++#libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
++# HACK: map to build directory
++includedir=../../../../inc
++libdir=../../../../lib
++includes=-I${includedir}
+
++#prefix=@prefix@
++#includes="-I@includedir@/@PACKAGE@"
+
++
+ usage()
+ {
+ cat<<EOF
+@@ -104,7 +113,8 @@
+ echo $includes
+ fi
+ if test "$echo_libs" = "yes"; then
+- echo -L@libdir@ -lrasqal
++# echo -L@libdir@ -lrasqal
++ echo -L${libdir} -lrasqal
+ fi
+ if test "$echo_libtool_libs" = "yes"; then
+ echo @libdir@/@RASQAL_LIBTOOLLIBS@
diff --git a/redland/rasqal/rasqal-0.9.16.patch.win32 b/redland/rasqal/rasqal-0.9.16.patch.win32
new file mode 100644
index 000000000000..51bad96e0e29
--- /dev/null
+++ b/redland/rasqal/rasqal-0.9.16.patch.win32
@@ -0,0 +1,43 @@
+--- misc/rasqal-0.9.16/src/win32_rasqal_config.h Fri Jun 27 04:02:09 2008
++++ misc/build/rasqal-0.9.16/src/win32_rasqal_config.h Thu Nov 6 12:07:06 2008
+@@ -37,10 +37,13 @@
+
+ #define HAVE_STDLIB_H 1
+
++#define HAVE_ERRNO_H 1
++
+ #define HAVE_STRICMP 1
+
+ /* MS names for these functions */
+-#define vsnprintf _vsnprintf
++// next line breaks build on wntmsci12
++//#define vsnprintf _vsnprintf
+ #define snprintf _snprintf
+ #define access _access
+ #define stricmp _stricmp
+@@ -85,6 +88,9 @@
+ #include <io.h>
+ #include <memory.h>
+
++// argh! stupid winnt.h...
++#undef DELETE
++
+ /* This is a SPARQL token define */
+ #ifdef OPTIONAL
+ #undef OPTIONAL
+@@ -116,8 +122,14 @@
+ /* #define RAPTOR_TRIPLES_SOURCE_REDLAND 1 */
+
+ /* 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
++
++#define RASQAL_DECIMAL_NONE 1
++
+ #ifdef _DEBUG
+ #define RASQAL_DEBUG 1
+ #endif
generated by cgit (git 2.34.1) at 2024-07-01 01:02:38 +0000