redland/rasqal-0.9.15.patch

   1 --- misc/rasqal-0.9.15/LICENSE.txt      Sun Apr 22 23:09:08 2007
   2 +++ misc/build/rasqal-0.9.15/LICENSE.txt        Mon Jun 16 15:55:45 2008
   3 @@ -61,3 +61,15 @@
   4
   5     Copyright (C) 2003-2007 Dave Beckett
   6     Copyright (C) 2003-2005 University of Bristol
   7 +
   8 +
   9 +LGPL Disclaimer
  10 +
  11 +For the avoidance of doubt, except that if any license choice other
  12 +than GPL or LGPL is available it will apply instead, Sun elects to
  13 +use only the Lesser General Public License version 2.1 (LGPLv2) at
  14 +this time for any software where a choice of LGPL license versions
  15 +is made available with the language indicating that LGPLv2.1 or any
  16 +later version may be used, or where a choice of which version of the
  17 +LGPL is applied is otherwise unspecified.
  18 +
  19 --- misc/rasqal-0.9.15/src/makefile.mk  Mon Jun 16 19:30:20 2008
  20 +++ misc/build/rasqal-0.9.15/src/makefile.mk    Mon Jun 16 19:25:48 2008
  21 @@ -1,1 +1,95 @@
  22 -dummy
  23 +#*************************************************************************
  24 +#
  25 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  26 +#
  27 +# Copyright 2008 by Sun Microsystems, Inc.
  28 +#
  29 +# OpenOffice.org - a multi-platform office productivity suite
  30 +#
  31 +# $RCSfile: rasqal-0.9.15.patch,v $
  32 +#
  33 +# $Revision: 1.2.6.2 $
  34 +#
  35 +# This file is part of OpenOffice.org.
  36 +#
  37 +# OpenOffice.org is free software: you can redistribute it and/or modify
  38 +# it under the terms of the GNU Lesser General Public License version 3
  39 +# only, as published by the Free Software Foundation.
  40 +#
  41 +# OpenOffice.org is distributed in the hope that it will be useful,
  42 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
  43 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  44 +# GNU Lesser General Public License version 3 for more details
  45 +# (a copy is included in the LICENSE file that accompanied this code).
  46 +#
  47 +# You should have received a copy of the GNU Lesser General Public License
  48 +# version 3 along with OpenOffice.org.  If not, see
  49 +# <http://www.openoffice.org/license.html>
  50 +# for a copy of the LGPLv3 License.
  51 +#
  52 +#*************************************************************************
  53 +
  54 +PRJ=..$/..$/..$/..$/..
  55 +
  56 +PRJNAME=redland
  57 +TARGET=rasqal
  58 +LIBTARGET=NO
  59 +
  60 +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
  61 +
  62 +
  63 +# --- Settings -----------------------------------------------------
  64 +
  65 +.INCLUDE :  settings.mk
  66 +
  67 +CDEFS+=-DRASQAL_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS -D_MT
  68 +
  69 +# --- Files --------------------------------------------------------
  70 +
  71 +SLOFILES =     \
  72 +   $(SLO)$/rasqal_datetime.obj \
  73 +   $(SLO)$/rasqal_decimal.obj \
  74 +   $(SLO)$/rasqal_engine.obj \
  75 +   $(SLO)$/rasqal_expr.obj \
  76 +   $(SLO)$/rasqal_feature.obj \
  77 +   $(SLO)$/rasqal_general.obj \
  78 +   $(SLO)$/rasqal_graph_pattern.obj \
  79 +   $(SLO)$/rasqal_literal.obj \
  80 +   $(SLO)$/rasqal_map.obj \
  81 +   $(SLO)$/rasqal_query_results.obj \
  82 +   $(SLO)$/rasqal_query.obj \
  83 +   $(SLO)$/rasqal_raptor.obj \
  84 +   $(SLO)$/rasqal_result_formats.obj \
  85 +   $(SLO)$/rasqal_xsd_datatypes.obj \
  86 +   $(SLO)$/rdql_lexer.obj \
  87 +   $(SLO)$/rdql_parser.obj \
  88 +   $(SLO)$/sparql_lexer.obj \
  89 +   $(SLO)$/sparql_parser.obj \
  90 +   $(SLO)$/strcasecmp.obj \
  91 +
  92 +
  93 +#   $(SLO)$/rasqal_redland.obj \
  94 +
  95 +SHL1DEPN=   makefile.mk
  96 +SHL1OBJS=   $(SLOFILES)
  97 +SHL1USE_EXPORTS=name
  98 +
  99 +#SHL1TARGET=   $(TARGET)$(DLLPOSTFIX)
 100 +SHL1TARGET=    $(TARGET)
 101 +SHL1IMPLIB= lib$(TARGET)
 102 +
 103 +#SHL1VERSIONMAP=../service/exports.map
 104 +SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 105 +DEF1NAME=$(SHL1TARGET)
 106 +
 107 +SHL1STDLIBS= \
 108 +    $(PRJ)$/$(INPATH)$/lib$/libraptor.lib \
 109 +
 110 +
 111 +#$(LIBXML2LIB) \
 112 +#    $(XSLTLIB) \
 113 +
 114 +# --- Targets ------------------------------------------------------
 115 +
 116 +.INCLUDE :  target.mk
 117 +
 118 --- misc/rasqal-0.9.15/src/rasqal-config.in     Sun Apr 22 22:58:51 2007
 119 +++ misc/build/rasqal-0.9.15/src/rasqal-config.in       Mon Jun 16 15:55:45 2008
 120 @@ -22,13 +22,22 @@
 121  #
 122  #
 123
 124 -prefix=@prefix@
 125 +prefix=${SOLARVERSION}/${INPATH}
 126 +exec_prefix=${SOLARVERSION}/${INPATH}
 127 +#includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
 128 +#libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
 129 +# HACK: map to build directory
 130 +includedir=../../../../inc
 131 +libdir=../../../../lib
 132 +includes=-I${includedir}
 133
 134 -if test "@includedir@" != /usr/include ; then
 135 -  includes="-I@includedir@"
 136 -else
 137 -  includes=
 138 -fi
 139 +#prefix=@prefix@
 140 +#
 141 +#if test "@includedir@" != /usr/include ; then
 142 +#  includes="-I@includedir@"
 143 +#else
 144 +#  includes=
 145 +#fi
 146
 147
 148  usage()
 149 @@ -109,7 +118,8 @@
 150    echo $includes
 151  fi
 152  if test "$echo_libs" = "yes"; then
 153 -  echo -L@libdir@ -lrasqal
 154 +#  echo -L@libdir@ -lrasqal
 155 +  echo -L${libdir} -lrasqal
 156  fi
 157  if test "$echo_libtool_libs" = "yes"; then
 158    echo @libdir@/@RASQAL_LIBTOOLLIBS@
 159 --- misc/rasqal-0.9.15/src/win32_rasqal_config.h        Mon Apr 23 09:18:27 2007
 160 +++ misc/build/rasqal-0.9.15/src/win32_rasqal_config.h  Mon Jun 16 15:55:45 2008
 161 @@ -39,10 +39,13 @@
 162
 163  #define HAVE_STDLIB_H 1
 164
 165 +#define HAVE_ERRNO_H 1
 166 +
 167  #define HAVE_STRICMP 1
 168
 169  /* MS names for these functions */
 170 -#define vsnprintf _vsnprintf
 171 +// next line breaks build on wntmsci12
 172 +//#define vsnprintf _vsnprintf
 173  #define snprintf _snprintf
 174  #define access _access
 175  #define stricmp _stricmp
 176 @@ -87,6 +90,9 @@
 177  #include <io.h>
 178  #include <memory.h>
 179
 180 +// argh! stupid winnt.h...
 181 +#undef DELETE
 182 +
 183  /* This is a SPARQL token define */
 184  #ifdef OPTIONAL
 185  #undef OPTIONAL
 186 @@ -118,8 +124,14 @@
 187  /* #define RAPTOR_TRIPLES_SOURCE_REDLAND 1 */
 188
 189  /* Use PCRE regex library */
 190 -#define RASQAL_REGEX_PCRE 1
 191 +//#define RASQAL_REGEX_PCRE 1
 192
 193 +#define HAVE_LIBXML_SCHEMASINTERNALS_H 1
 194 +#define HAVE_LIBXML_XMLSCHEMASTYPES_H 1
 195 +#define HAVE_LIBXML_XMLSCHEMAS_H 1
 196 +
 197 +#define RASQAL_DECIMAL_NONE 1
 198 +
 199  #ifdef _DEBUG
 200  #define RASQAL_DEBUG 1
 201  #endif
 202 --- misc/rasqal-0.9.15/ltmain.sh        2006-03-12 03:49:04.000000000 +0900
 203 +++ misc/build/rasqal-0.9.15/ltmain.sh  2008-07-06 14:30:56.975375000 +0900
 204 @@ -1518,6 +1518,11 @@
 205         [\\/]* | [A-Za-z]:[\\/]*) ;;
 206         *)
 207           absdir=`cd "$dir" && pwd`
 208 +         case $host_os in
 209 +           mingw*)
 210 +             absdir=`cygpath -m $absdir`
 211 +             ;;
 212 +           esac
 213           if test -z "$absdir"; then
 214             $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
 215             absdir="$dir"
 216 @@ -3195,9 +3200,9 @@
 217             revision="$number_revision"
 218             ;;
 219           freebsd-aout|freebsd-elf|sunos)
 220 -           current="$number_major"
 221 -           revision="$number_minor"
 222 -           age="0"
 223 +           current=`expr $number_major + $number_minor`
 224 +           age="$number_minor"
 225 +           revision="$number_revision"
 226             ;;
 227           irix|nonstopux)
 228             current=`expr $number_major + $number_minor - 1`
 229 @@ -3275,8 +3280,8 @@
 230           ;;
 231
 232         freebsd-elf)
 233 -         major=".$current"
 234 -         versuffix=".$current";
 235 +         major=.`expr $current - $age`
 236 +         versuffix="$major.$age.$revision"
 237           ;;
 238
 239         irix | nonstopux)