You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by tr...@apache.org on 2016/08/26 07:13:15 UTC
svn commit: r1757789 [1/2] - in /openoffice/trunk/main: ./ redland/
redland/prj/ redland/raptor/ redland/rasqal/ redland/redland/
scp2/source/ooo/
Author: truckman
Date: Fri Aug 26 07:13:14 2016
New Revision: 1757789
URL: http://svn.apache.org/viewvc?rev=1757789&view=rev
Log:
Upgrade bundled raptor from raptor-1.4.18 to raptor2-2.0.15 to get the
fix for CVE-2012-0037. It is not know whether this vulnerability
affects OpenOffice.
Also upgrade rasqal from version 0.9.16 to version 0.9.33 and redland
from version 1.0.8 to version 1.0.17 since all three packages are
closely related parts of the OpenOffice redland module for handling RDF.
OpenDocument version 1.2 documents contain an RDF metadata blob for
things like bookmarks and OLE objects.
Added:
openoffice/trunk/main/redland/raptor/raptor2-2.0.15.patch.dmake
- copied, changed from r1757788, openoffice/trunk/main/redland/raptor/raptor-1.4.18.patch.dmake
openoffice/trunk/main/redland/raptor/raptor2-2.0.15.patch.win32
- copied, changed from r1757788, openoffice/trunk/main/redland/raptor/raptor-1.4.18.patch.win32
openoffice/trunk/main/redland/rasqal/rasqal-0.9.33.patch.dmake
- copied, changed from r1757788, openoffice/trunk/main/redland/rasqal/rasqal-0.9.16.patch.dmake
openoffice/trunk/main/redland/rasqal/rasqal-0.9.33.patch.ooo_build
- copied, changed from r1757788, openoffice/trunk/main/redland/rasqal/rasqal-0.9.16.patch.ooo_build
openoffice/trunk/main/redland/rasqal/rasqal-0.9.33.patch.win32
- copied, changed from r1757788, openoffice/trunk/main/redland/rasqal/rasqal-0.9.16.patch.win32
openoffice/trunk/main/redland/redland/redland-1.0.17.patch.autotools
- copied, changed from r1757788, openoffice/trunk/main/redland/redland/redland-1.0.8.patch.autotools
openoffice/trunk/main/redland/redland/redland-1.0.17.patch.dmake
- copied, changed from r1757788, openoffice/trunk/main/redland/redland/redland-1.0.8.patch.dmake
openoffice/trunk/main/redland/redland/redland-1.0.17.patch.ooo_build
- copied, changed from r1757788, openoffice/trunk/main/redland/redland/redland-1.0.8.patch.ooo_build
openoffice/trunk/main/redland/redland/redland-1.0.17.patch.win32
- copied, changed from r1757788, openoffice/trunk/main/redland/redland/redland-1.0.8.patch.win32
Removed:
openoffice/trunk/main/redland/raptor/raptor-1.4.18.patch.autotools
openoffice/trunk/main/redland/raptor/raptor-1.4.18.patch.dmake
openoffice/trunk/main/redland/raptor/raptor-1.4.18.patch.fixes
openoffice/trunk/main/redland/raptor/raptor-1.4.18.patch.ooo_build
openoffice/trunk/main/redland/raptor/raptor-1.4.18.patch.win32
openoffice/trunk/main/redland/rasqal/rasqal-0.9.16.patch.autotools
openoffice/trunk/main/redland/rasqal/rasqal-0.9.16.patch.dmake
openoffice/trunk/main/redland/rasqal/rasqal-0.9.16.patch.ooo_build
openoffice/trunk/main/redland/rasqal/rasqal-0.9.16.patch.win32
openoffice/trunk/main/redland/redland/redland-1.0.8.patch.autotools
openoffice/trunk/main/redland/redland/redland-1.0.8.patch.dmake
openoffice/trunk/main/redland/redland/redland-1.0.8.patch.ooo_build
openoffice/trunk/main/redland/redland/redland-1.0.8.patch.win32
Modified:
openoffice/trunk/main/external_deps.lst
openoffice/trunk/main/redland/prj/d.lst
openoffice/trunk/main/redland/raptor/makefile.mk
openoffice/trunk/main/redland/rasqal/makefile.mk
openoffice/trunk/main/redland/redland/makefile.mk
openoffice/trunk/main/redland/redlandversion.mk
openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
Modified: openoffice/trunk/main/external_deps.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1757789&r1=1757788&r2=1757789&view=diff
==============================================================================
--- openoffice/trunk/main/external_deps.lst (original)
+++ openoffice/trunk/main/external_deps.lst Fri Aug 26 07:13:14 2016
@@ -89,21 +89,21 @@ if (ENABLE_NSS_MODULE!=NO && SYSTEM_NSS!
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_REDLAND != YES)
- MD5 = 284e768eeda0e2898b0d5bf7e26a016e
- name = raptor-1.4.18.tar.gz
- URL1 = http://download.librdf.org/source/raptor-1.4.18.tar.gz
+ MD5 = a39f6c07ddb20d7dd2ff1f95fa21e2cd
+ name = raptor2-2.0.15.tar.gz
+ URL1 = http://download.librdf.org/source/raptor2-2.0.15.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_REDLAND != YES)
- MD5 = ca66e26082cab8bb817185a116db809b
- name = redland-1.0.8.tar.gz
- URL1 = http://download.librdf.org/source/redland-1.0.8.tar.gz
+ MD5 = e5be03eda13ef68aabab6e42aa67715e
+ name = redland-1.0.17.tar.gz
+ URL1 = http://download.librdf.org/source/redland-1.0.17.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_REDLAND != YES)
- MD5 = fca8706f2c4619e2fa3f8f42f8fc1e9d
- name = rasqal-0.9.16.tar.gz
- URL1 = http://download.librdf.org/source/rasqal-0.9.16.tar.gz
+ MD5 = 1f5def51ca0026cd192958ef07228b52
+ name = rasqal-0.9.33.tar.gz
+ URL1 = http://download.librdf.org/source/rasqal-0.9.33.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (GUI!=UNX || SYSTEM_ZLIB!=YES)
Modified: openoffice/trunk/main/redland/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/redland/prj/d.lst?rev=1757789&r1=1757788&r2=1757789&view=diff
==============================================================================
--- openoffice/trunk/main/redland/prj/d.lst (original)
+++ openoffice/trunk/main/redland/prj/d.lst Fri Aug 26 07:13:14 2016
@@ -1,13 +1,13 @@
mkdir: %_DEST%\inc%_EXT%\external
..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\*.h
-..\%__SRC%\lib\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so.1
-symlink: %_DEST%\lib%_EXT%\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so
-..\%__SRC%\lib\libraptor.1.dylib %_DEST%\lib%_EXT%\libraptor.1.dylib
-symlink: %_DEST%\lib%_EXT%\libraptor.1.dylib %_DEST%\lib%_EXT%\libraptor.dylib
-..\%__SRC%\lib\librasqal.so.1 %_DEST%\lib%_EXT%\librasqal.so.1
-symlink: %_DEST%\lib%_EXT%\librasqal.so.1 %_DEST%\lib%_EXT%\librasqal.so
-..\%__SRC%\lib\librasqal.1.dylib %_DEST%\lib%_EXT%\librasqal.1.dylib
-symlink: %_DEST%\lib%_EXT%\librasqal.1.dylib %_DEST%\lib%_EXT%\librasqal.dylib
+..\%__SRC%\lib\libraptor2.so.0 %_DEST%\lib%_EXT%\libraptor2.so.0
+symlink: %_DEST%\lib%_EXT%\libraptor2.so.0 %_DEST%\lib%_EXT%\libraptor2.so
+..\%__SRC%\lib\libraptor2.0.dylib %_DEST%\lib%_EXT%\libraptor2.0.dylib
+symlink: %_DEST%\lib%_EXT%\libraptor2.0.dylib %_DEST%\lib%_EXT%\libraptor2.dylib
+..\%__SRC%\lib\librasqal.so.3 %_DEST%\lib%_EXT%\librasqal.so.3
+symlink: %_DEST%\lib%_EXT%\librasqal.so.3 %_DEST%\lib%_EXT%\librasqal.so
+..\%__SRC%\lib\librasqal.3.dylib %_DEST%\lib%_EXT%\librasqal.3.dylib
+symlink: %_DEST%\lib%_EXT%\librasqal.3.dylib %_DEST%\lib%_EXT%\librasqal.dylib
..\%__SRC%\lib\librdf.so.0 %_DEST%\lib%_EXT%\librdf.so.0
symlink: %_DEST%\lib%_EXT%\librdf.so.0 %_DEST%\lib%_EXT%\librdf.so
..\%__SRC%\lib\librdf.0.dylib %_DEST%\lib%_EXT%\librdf.0.dylib
Modified: openoffice/trunk/main/redland/raptor/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/redland/raptor/makefile.mk?rev=1757789&r1=1757788&r2=1757789&view=diff
==============================================================================
--- openoffice/trunk/main/redland/raptor/makefile.mk (original)
+++ openoffice/trunk/main/redland/raptor/makefile.mk Fri Aug 26 07:13:14 2016
@@ -40,19 +40,15 @@ all:
.INCLUDE : ../redlandversion.mk
-RAPTORVERSION=$(RAPTOR_MAJOR).4.18
+RAPTORVERSION=2.0.15
-TARFILE_NAME=raptor-$(RAPTORVERSION)
-TARFILE_MD5=284e768eeda0e2898b0d5bf7e26a016e
+TARFILE_NAME=raptor2-$(RAPTORVERSION)
+TARFILE_MD5=a39f6c07ddb20d7dd2ff1f95fa21e2cd
ADDITIONAL_FILES=src/makefile.mk src/raptor_config.h
OOO_PATCH_FILES= \
- $(TARFILE_NAME).patch.autotools \
- $(TARFILE_NAME).patch.ooo_build \
$(TARFILE_NAME).patch.dmake \
- $(TARFILE_NAME).patch.win32 \
- $(TARFILE_NAME).patch.fixes
PATCH_FILES=$(OOO_PATCH_FILES)
@@ -77,12 +73,16 @@ raptor_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure
# do not enable grddl parser (#i93768#)
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(raptor_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(raptor_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)"
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" --prefix=$(PWD)/$(OUT) --includedir=(PWD)$/$(INCCOM) --libdir=$(PWD)$/$(LB) --CC="$(raptor_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(raptor_LIBS)" OBJDUMP="$(WRAPCMD) 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
+OOO_PATCH_FILES+=$(TARFILE_NAME).patch.win32
+CONFIGURE_ACTION= ${PERL} -p -e '$$prefix="'$(PWD)/$(OUT)'"; $$libdir="'$(PWD)/$(LB)'"; $$incdir="'$(PWD)/$(INCCOM)'"; $$ldflags="-L$(SOLARLIBDIR) -lxml2 -lm";' -e 's/\@prefix\@/$$prefix/; s/\@exec_prefix\@/\$${prefix}/; s/\@libdir\@/$$libdir/; s/\@includedir\@/$$incdir/; s/\@PACKAGE\@/raptor2/; s/\@VERSION\@/2.0.15/; s/\@PKG_CONFIG_REQUIRES\@//; s/\@RAPTOR_LDFLAGS\@/$$ldflags/;' < raptor2.pc.in > raptor2.pc && \
+ ${PERL} -p -e 's/\@RAPTOR_VERSION_DECIMAL\@/20015/;s/\@VERSION\@/2.0.15/;s/\@RAPTOR_VERSION_MAJOR\@/2/;s/\@RAPTOR_VERSION_MINOR\@/0/;s/\@RAPTOR_VERSION_RELEASE\@/15/' < src/raptor2.h.in > src/raptor2.h && \
+ $(COPY) src/raptor_config.h.in src/raptor_config.h
BUILD_ACTION=dmake
BUILD_DIR=$(CONFIGURE_DIR)$/src
.ENDIF
@@ -124,7 +124,11 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake vari
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure
# do not enable grddl parser (#i93768#)
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --with-www=xml --prefix=$(PDW)/$(OUT) --includedir=$(PWD)/$(INCCOM) --libdir=$(PWD)/$(LB)
+.IF "$(SYSTEM_LIBXML)" == "NO"
+CONFIGURE_FLAGS+=--with-xml2-config=${SOLARVERSION}/${INPATH}/bin/xml2-config \
+ --with-xslt-config=${SOLARVERSION}/${INPATH}/bin/xslt-config
+.ENDIF
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
@@ -133,24 +137,21 @@ BUILD_DIR=$(CONFIGURE_DIR)
.ENDIF
-OUT2INC+=src/raptor.h
+OUT2INC+=src/raptor.h src/raptor2.h src/raptor_config.h
.IF "$(OS)"=="MACOSX"
-OUT2LIB+=src$/.libs$/libraptor.$(RAPTOR_MAJOR).dylib src$/.libs$/libraptor.dylib
-OUT2BIN+=src/raptor-config
+OUT2LIB+=src$/.libs$/libraptor2.$(RAPTOR_MAJOR).dylib src$/.libs$/libraptor.dylib
.ELIF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
OUT2LIB+=src$/.libs$/*.a
OUT2BIN+=src$/.libs$/*.dll
-OUT2BIN+=src/raptor-config
.ELSE
# if we use dmake, this is done automagically
.ENDIF
.ELIF "$(GUI)"=="OS2"
# if we use dmake, this is done automagically
.ELSE
-OUT2LIB+=src$/.libs$/libraptor.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so
-OUT2BIN+=src/raptor-config
+OUT2LIB+=src$/.libs$/libraptor2.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor2.so
.ENDIF
# --- Targets ------------------------------------------------------
Copied: openoffice/trunk/main/redland/raptor/raptor2-2.0.15.patch.dmake (from r1757788, openoffice/trunk/main/redland/raptor/raptor-1.4.18.patch.dmake)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/redland/raptor/raptor2-2.0.15.patch.dmake?p2=openoffice/trunk/main/redland/raptor/raptor2-2.0.15.patch.dmake&p1=openoffice/trunk/main/redland/raptor/raptor-1.4.18.patch.dmake&r1=1757788&r2=1757789&rev=1757789&view=diff
==============================================================================
--- openoffice/trunk/main/redland/raptor/raptor-1.4.18.patch.dmake (original)
+++ openoffice/trunk/main/redland/raptor/raptor2-2.0.15.patch.dmake Fri Aug 26 07:13:14 2016
@@ -1,6 +1,7 @@
---- misc/raptor-1.4.18/src/makefile.mk Thu Nov 6 15:25:51 2008
-+++ misc/build/raptor-1.4.18/src/makefile.mk Thu Nov 6 15:33:14 2008
-@@ -1,1 +1,116 @@
+--- misc/raptor2-2.0.15/src/makefile.mk Thu Nov 6 15:25:51 2008
++++ misc/build/raptor2-2.0.15/src/makefile.mk 2016-08-22 16:00:54.772429000 -0700
++++ misc/build/raptor2-2.0.15/src/makefile.mk 2016-08-22 19:12:56.321912000 -0700
+@@ -1 +1,131 @@
-dummy
+#**************************************************************
+#
@@ -38,25 +39,28 @@
+
+.INCLUDE : settings.mk
+
-+CDEFS+=-DRAPTOR_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS
++CDEFS+=-DRAPTOR_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS -DHAVE_CONFIG_H
+
+# --- Files --------------------------------------------------------
+
+SLOFILES = \
-+ $(SLO)$/n3_lexer.obj \
-+ $(SLO)$/n3_parser.obj \
+ $(SLO)$/ntriples_parse.obj \
+ $(SLO)$/parsedate.obj \
-+ $(SLO)$/raptor_feature.obj \
++ $(SLO)$/raptor_abbrev.obj \
++ $(SLO)$/raptor_avltree.obj \
++ $(SLO)$/raptor_concepts.obj \
++ $(SLO)$/raptor_escaped.obj \
+ $(SLO)$/raptor_general.obj \
+ $(SLO)$/raptor_guess.obj \
-+ $(SLO)$/raptor_identifier.obj \
+ $(SLO)$/raptor_iostream.obj \
++ $(SLO)$/raptor_json_writer.obj \
+ $(SLO)$/raptor_libxml.obj \
+ $(SLO)$/raptor_locator.obj \
++ $(SLO)$/raptor_log.obj \
++ $(SLO)$/raptor_memstr.obj \
+ $(SLO)$/raptor_namespace.obj \
-+ $(SLO)$/raptor_nfc.obj \
-+ $(SLO)$/raptor_nfc_data.obj \
++ $(SLO)$/raptor_ntriples.obj \
++ $(SLO)$/raptor_option.obj \
+ $(SLO)$/raptor_parse.obj \
+ $(SLO)$/raptor_qname.obj \
+ $(SLO)$/raptor_rdfxml.obj \
@@ -66,31 +70,43 @@
+ $(SLO)$/raptor_sax2.obj \
+ $(SLO)$/raptor_sequence.obj \
+ $(SLO)$/raptor_serialize.obj \
++ $(SLO)$/raptor_serialize_dot.obj \
++ $(SLO)$/raptor_serialize_html.obj \
++ $(SLO)$/raptor_serialize_json.obj \
+ $(SLO)$/raptor_serialize_ntriples.obj \
+ $(SLO)$/raptor_serialize_rdfxml.obj \
+ $(SLO)$/raptor_serialize_rdfxmla.obj \
-+ $(SLO)$/raptor_serialize_simple.obj \
++ $(SLO)$/raptor_serialize_rss.obj \
++ $(SLO)$/raptor_serialize_turtle.obj \
+ $(SLO)$/raptor_set.obj \
++ $(SLO)$/raptor_statement.obj \
+ $(SLO)$/raptor_stringbuffer.obj \
++ $(SLO)$/raptor_syntax_description.obj \
++ $(SLO)$/raptor_term.obj \
++ $(SLO)$/raptor_turtle_writer.obj \
++ $(SLO)$/raptor_unicode.obj \
+ $(SLO)$/raptor_uri.obj \
-+ $(SLO)$/raptor_utf8.obj \
-+ $(SLO)$/raptor_win32.obj \
+ $(SLO)$/raptor_www.obj \
++ $(SLO)$/raptor_www_curl.obj \
++ $(SLO)$/raptor_www_libfetch.obj \
+ $(SLO)$/raptor_www_libxml.obj \
+ $(SLO)$/raptor_xml.obj \
+ $(SLO)$/raptor_xml_writer.obj \
-+ $(SLO)$/raptor_xsd.obj \
-+ $(SLO)$/raptor_strcasecmp.obj \
++ $(SLO)$/snprintf.obj \
++ $(SLO)$/sort_r.obj \
++ $(SLO)$/strcasecmp.obj \
+ $(SLO)$/turtle_common.obj \
+ $(SLO)$/turtle_lexer.obj \
-+ $(SLO)$/turtle_parser.obj \
-+ $(SLO)$/raptor_abbrev.obj \
-+ $(SLO)$/raptor_avltree.obj \
-+ $(SLO)$/raptor_statement.obj \
-+ $(SLO)$/raptor_turtle_writer.obj \
++ $(SLO)$/turtle_parser.obj
+
+# $(SLO)$/raptor_grddl.obj \
-+# $(SLO)$/raptor_serialize_rss.obj \
++# $(SLO)$/raptor_json.obj \
++# $(SLO)$/raptor_librdfa.obj \
++# $(SLO)$/raptor_permute_test.obj \
++# $(SLO)$/raptor_www_test.obj \
++# $(SLO)$/raptor_nfc_icu.obj \
++# $(SLO)$/raptor_nfc_test.obj \
++# $(SLO)$/raptor_win32.obj \
+
+
+SHL1DEPN= makefile.mk
@@ -118,4 +134,3 @@
+
+$(MISC)$/raptor_strcasecmp.c : strcasecmp.c
+ $(COPY) $< $@
-+
Copied: openoffice/trunk/main/redland/raptor/raptor2-2.0.15.patch.win32 (from r1757788, openoffice/trunk/main/redland/raptor/raptor-1.4.18.patch.win32)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/redland/raptor/raptor2-2.0.15.patch.win32?p2=openoffice/trunk/main/redland/raptor/raptor2-2.0.15.patch.win32&p1=openoffice/trunk/main/redland/raptor/raptor-1.4.18.patch.win32&r1=1757788&r2=1757789&rev=1757789&view=diff
==============================================================================
--- openoffice/trunk/main/redland/raptor/raptor-1.4.18.patch.win32 (original)
+++ openoffice/trunk/main/redland/raptor/raptor2-2.0.15.patch.win32 Fri Aug 26 07:13:14 2016
@@ -1,78 +1,487 @@
---- misc/raptor-1.4.18/src/win32_raptor_config.h Wed Apr 2 06:50:14 2008
-+++ misc/build/raptor-1.4.18/src/win32_raptor_config.h Wed Feb 18 13:21:23 2009
-@@ -38,6 +38,8 @@
-
- #define HAVE_STDLIB_H 1
+diff -ur misc/raptor2-2.0.15/src/raptor_config.h.in misc/build/raptor2-2.0.15/src/raptor_config.h.in
+--- misc/raptor2-2.0.15/src/raptor_config.h.in 2014-11-01 23:04:51.000000000 -0700
++++ misc/build/raptor2-2.0.15/src/raptor_config.h.in 2016-08-22 19:14:14.557872000 -0700
+@@ -1,317 +1,318 @@
++/* src/raptor_config.h. Generated from raptor_config.h.in by configure. */
+ /* src/raptor_config.h.in. Generated from configure.ac by autoheader. */
+
+ /* Define if building universal (internal helper macro) */
+-#undef AC_APPLE_UNIVERSAL_BUILD
++/* #undef AC_APPLE_UNIVERSAL_BUILD */
+
+ /* have to check C99 vsnprintf at runtime because cross compiling */
+-#undef CHECK_VSNPRINTF_RUNTIME
++/* #undef CHECK_VSNPRINTF_RUNTIME */
+
+ /* Flex version as a decimal */
+-#undef FLEX_VERSION_DECIMAL
++#define FLEX_VERSION_DECIMAL 00000
+
+ /* vsnprintf has C99 compatible return value */
+-#undef HAVE_C99_VSNPRINTF
++/* #undef HAVE_C99_VSNPRINTF */
+
+ /* Have curl/curl.h */
+-#undef HAVE_CURL_CURL_H
++/* #undef HAVE_CURL_CURL_H */
+
+ /* Define to 1 if you have the <dlfcn.h> header file. */
+-#undef HAVE_DLFCN_H
++/* #undef HAVE_DLFCN_H 1 */
+ /* Define to 1 if you have the <errno.h> header file. */
+-#undef HAVE_ERRNO_H
+#define HAVE_ERRNO_H 1
-+
- #if 0
- /* For using expat on win32 */
- #define RAPTOR_XML_EXPAT 1
-@@ -47,8 +49,17 @@
- /* For using libxml2 on win32 */
- #define RAPTOR_XML_LIBXML
- #define HAVE_LIBXML_XMLREADER_H
+
+ /* Define to 1 if you have the <fcntl.h> header file. */
+-#undef HAVE_FCNTL_H
++#define HAVE_FCNTL_H 1
+
+ /* Define to 1 if you have the <fetch.h> header file. */
+-#undef HAVE_FETCH_H
++/* #undef HAVE_FETCH_H */
+
+ /* Define to 1 if you have the `getopt' function. */
+-#undef HAVE_GETOPT
++#define HAVE_GETOPT 1
+
+ /* Define to 1 if you have the <getopt.h> header file. */
+-#undef HAVE_GETOPT_H
++#define HAVE_GETOPT_H 1
+
+ /* Define to 1 if you have the `getopt_long' function. */
+-#undef HAVE_GETOPT_LONG
++#define HAVE_GETOPT_LONG 1
+
+ /* Define to 1 if you have the `gettimeofday' function. */
+-#undef HAVE_GETTIMEOFDAY
++/* #undef HAVE_GETTIMEOFDAY */
+
+ /* INN parsedate function present */
+-#undef HAVE_INN_PARSEDATE
++/* #undef HAVE_INN_PARSEDATE */
+
+ /* Define to 1 if you have the <inttypes.h> header file. */
+-#undef HAVE_INTTYPES_H
++#define HAVE_INTTYPES_H 1
+
+ /* Define to 1 if you have the `isascii' function. */
+-#undef HAVE_ISASCII
++#define HAVE_ISASCII 1
+
+ /* Define to 1 if you have the <libxml/hash.h> header file. */
+-#undef HAVE_LIBXML_HASH_H
+#define HAVE_LIBXML_HASH_H 1
+
+ /* Define to 1 if you have the <libxml/HTMLparser.h> header file. */
+-#undef HAVE_LIBXML_HTMLPARSER_H
+#define HAVE_LIBXML_HTMLPARSER_H 1
+
+ /* Define to 1 if you have the <libxml/nanohttp.h> header file. */
+-#undef HAVE_LIBXML_NANOHTTP_H
+#define HAVE_LIBXML_NANOHTTP_H 1
+
+ /* Define to 1 if you have the <libxml/parser.h> header file. */
+-#undef HAVE_LIBXML_PARSER_H
+#define HAVE_LIBXML_PARSER_H 1
+
+ /* Define to 1 if you have the <libxml/SAX2.h> header file. */
+-#undef HAVE_LIBXML_SAX2_H
++#define HAVE_LIBXML_SAX2_H 1
+
+ /* Define to 1 if you have the <libxslt/xslt.h> header file. */
+-#undef HAVE_LIBXSLT_XSLT_H
+#define HAVE_LIBXSLT_XSLT_H 1
-+
-+#define RAPTOR_LIBXML_HTML_PARSE_NONET 1
-+#define RAPTOR_LIBXML_XML_PARSE_NONET 1
-+
+
+ /* Define to 1 if you have the <limits.h> header file. */
+-#undef HAVE_LIMITS_H
++#define HAVE_LIMITS_H 1
+
+ /* Define to 1 if you have the <math.h> header file. */
+-#undef HAVE_MATH_H
++#define HAVE_MATH_H 1
+
+ /* Define to 1 if you have the <memory.h> header file. */
+-#undef HAVE_MEMORY_H
++#define HAVE_MEMORY_H 1
+
+ /* Define to 1 if you have the `qsort_r' function. */
+-#undef HAVE_QSORT_R
++/* #undef HAVE_QSORT_R */
+
+ /* Define to 1 if you have the `qsort_s' function. */
+-#undef HAVE_QSORT_S
++/* #undef HAVE_QSORT_S */
+
+ /* Raptor raptor_parse_date available */
+-#undef HAVE_RAPTOR_PARSE_DATE
++#define HAVE_RAPTOR_PARSE_DATE 1
+
+ /* Define to 1 if you have the `setjmp' function. */
+-#undef HAVE_SETJMP
++#define HAVE_SETJMP 1
+
+ /* Define to 1 if you have the <setjmp.h> header file. */
+-#undef HAVE_SETJMP_H
++#define HAVE_SETJMP_H 1
+
+ /* Define to 1 if you have the `stat' function. */
+-#undef HAVE_STAT
++#define HAVE_STAT 1
+
+ /* Define to 1 if you have the <stddef.h> header file. */
+-#undef HAVE_STDDEF_H
++#define HAVE_STDDEF_H 1
+
+ /* Define to 1 if you have the <stdint.h> header file. */
+-#undef HAVE_STDINT_H
++/* #undef HAVE_STDINT_H */
+
+ /* Define to 1 if you have the <stdlib.h> header file. */
+-#undef HAVE_STDLIB_H
++#define HAVE_STDLIB_H 1
+
+ /* Define to 1 if you have the `strcasecmp' function. */
+-#undef HAVE_STRCASECMP
++/* #undef HAVE_STRCASECMP */
+
+ /* Define to 1 if you have the `stricmp' function. */
+-#undef HAVE_STRICMP
++/* #undef HAVE_STRICMP */
+
+ /* Define to 1 if you have the <strings.h> header file. */
+-#undef HAVE_STRINGS_H
++/* #undef HAVE_STRINGS_H */
+
+ /* Define to 1 if you have the <string.h> header file. */
+-#undef HAVE_STRING_H
++#define HAVE_STRING_H 1
+
+ /* Define to 1 if you have the `strtok_r' function. */
+-#undef HAVE_STRTOK_R
++#define HAVE_STRTOK_R 1
+
+ /* Define to 1 if you have the <sys/param.h> header file. */
+-#undef HAVE_SYS_PARAM_H
++#define HAVE_SYS_PARAM_H 1
+
+ /* Define to 1 if you have the <sys/stat.h> header file. */
+-#undef HAVE_SYS_STAT_H
++#define HAVE_SYS_STAT_H 1
+
+ /* Define to 1 if you have the <sys/time.h> header file. */
+-#undef HAVE_SYS_TIME_H
++/* #undef HAVE_SYS_TIME_H */
+
+ /* Define to 1 if you have the <sys/types.h> header file. */
+-#undef HAVE_SYS_TYPES_H
++#define HAVE_SYS_TYPES_H 1
+
+ /* Define to 1 if you have the <unistd.h> header file. */
+-#undef HAVE_UNISTD_H
++#define HAVE_UNISTD_H 1
+
+ /* Define to 1 if you have the `vasprintf' function. */
+-#undef HAVE_VASPRINTF
++/* #undef HAVE_VASPRINTF */
+
+ /* Define to 1 if you have the `vsnprintf' function. */
+-#undef HAVE_VSNPRINTF
++#define HAVE_VSNPRINTF 1
+
+ /* Define to 1 if you have the `xmlCtxtUseOptions' function. */
+-#undef HAVE_XMLCTXTUSEOPTIONS
++#define HAVE_XMLCTXTUSEOPTIONS 1
+
+ /* Define to 1 if you have the `xmlSAX2InternalSubset' function. */
+-#undef HAVE_XMLSAX2INTERNALSUBSET
++#define HAVE_XMLSAX2INTERNALSUBSET 1
+
+ /* YAJL has API version 2 */
+-#undef HAVE_YAJL2
++/* #undef HAVE_YAJL2 */
+
+ /* Define to 1 if you have the <yajl/yajl_parse.h> header file. */
+-#undef HAVE_YAJL_YAJL_PARSE_H
++/* #undef HAVE_YAJL_YAJL_PARSE_H */
+
+ /* Is __FUNCTION__ available */
+-#undef HAVE___FUNCTION__
++#define HAVE___FUNCTION__ 1
+
+ /* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+-#undef LT_OBJDIR
++#define LT_OBJDIR ".libs/"
+
+ /* Define to 1 if maintainer mode is enabled. */
+-#undef MAINTAINER_MODE
++/* #undef MAINTAINER_MODE */
+
+ /* need 'extern int optind' declaration? */
+-#undef NEED_OPTIND_DECLARATION
++/* #undef NEED_OPTIND_DECLARATION */
+
+ /* Define to 1 if your C compiler doesn't accept -c and -o together. */
+-#undef NO_MINUS_C_MINUS_O
++/* #undef NO_MINUS_C_MINUS_O */
+
+ /* Name of package */
+-#undef PACKAGE
++#define PACKAGE "raptor2"
+
+ /* Define to the address where bug reports for this package should be sent. */
+-#undef PACKAGE_BUGREPORT
++#define PACKAGE_BUGREPORT "http://bugs.librdf.org/"
+
+ /* Define to the full name of this package. */
+-#undef PACKAGE_NAME
++#define PACKAGE_NAME "Raptor RDF Parser and Serializer library"
+
+ /* Define to the full name and version of this package. */
+-#undef PACKAGE_STRING
++#define PACKAGE_STRING "Raptor RDF Parser and Serializer library 2.0.15"
+
+ /* Define to the one symbol short name of this package. */
+-#undef PACKAGE_TARNAME
++#define PACKAGE_TARNAME "raptor2"
+
+ /* Define to the home page for this package. */
+-#undef PACKAGE_URL
++#define PACKAGE_URL ""
+
+ /* Define to the version of this package. */
+-#undef PACKAGE_VERSION
++#define PACKAGE_VERSION "2.0.15"
+
+ /* Define to 1 if debug messages are enabled. */
+-#undef RAPTOR_DEBUG
++/* #undef RAPTOR_DEBUG */
+
+ /* Use ICU for Unicode NFC check */
+-#undef RAPTOR_ICU_NFC
++/* #undef RAPTOR_ICU_NFC */
+
/* does libxml struct xmlEntity have a field etype */
--/*#define RAPTOR_LIBXML_ENTITY_ETYPE*/
-+#define RAPTOR_LIBXML_ENTITY_ETYPE
+-#undef RAPTOR_LIBXML_ENTITY_ETYPE
++#define RAPTOR_LIBXML_ENTITY_ETYPE 1
/* does libxml struct xmlEntity have a field name_length */
- /*#define RAPTOR_LIBXML_ENTITY_NAME_LENGTH*/
-@@ -60,16 +71,17 @@
- #define HAVE_XMLSAX2INTERNALSUBSET 1
+-#undef RAPTOR_LIBXML_ENTITY_NAME_LENGTH
++/* #undef RAPTOR_LIBXML_ENTITY_NAME_LENGTH */
+
+ /* does libxml have HTML_PARSE_NONET */
+-#undef RAPTOR_LIBXML_HTML_PARSE_NONET
++#define RAPTOR_LIBXML_HTML_PARSE_NONET 1
/* does libxml xmlSAXHandler have externalSubset field */
--/*#define RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET*/
+-#undef RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET
+#define RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET 1
/* does libxml xmlSAXHandler have initialized field */
--/*#define RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED*/
+-#undef RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED
+#define RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED 1
- #endif
- #define HAVE_STRICMP 1
+ /* does libxml have XML_PARSE_NONET */
+-#undef RAPTOR_LIBXML_XML_PARSE_NONET
++#define RAPTOR_LIBXML_XML_PARSE_NONET 1
+
+ /* Minimum supported package version */
+-#undef RAPTOR_MIN_VERSION_DECIMAL
++#define RAPTOR_MIN_VERSION_DECIMAL 20000
+
+ /* Building GRDDL parser */
+-#undef RAPTOR_PARSER_GRDDL
++/* #undef RAPTOR_PARSER_GRDDL */
+
+ /* Building guess parser */
+-#undef RAPTOR_PARSER_GUESS
++#define RAPTOR_PARSER_GUESS 1
+
+ /* Building JSON parser */
+-#undef RAPTOR_PARSER_JSON
++/* #undef RAPTOR_PARSER_JSON */
+
+ /* Building N-Quads parser */
+-#undef RAPTOR_PARSER_NQUADS
++/* #undef RAPTOR_PARSER_NQUADS */
+
+ /* Building N-Triples parser */
+-#undef RAPTOR_PARSER_NTRIPLES
++#define RAPTOR_PARSER_NTRIPLES 1
+
+ /* Building RDFA parser */
+-#undef RAPTOR_PARSER_RDFA
++/* #undef RAPTOR_PARSER_RDFA */
+
+ /* Building RDF/XML parser */
+-#undef RAPTOR_PARSER_RDFXML
++#define RAPTOR_PARSER_RDFXML 1
+
+ /* Building RSS Tag Soup parser */
+-#undef RAPTOR_PARSER_RSS
++#define RAPTOR_PARSER_RSS 1
+
+ /* Building TRiG parser */
+-#undef RAPTOR_PARSER_TRIG
++#define RAPTOR_PARSER_TRIG 1
+
+ /* Building Turtle parser */
+-#undef RAPTOR_PARSER_TURTLE
++#define RAPTOR_PARSER_TURTLE 1
+
+ /* Building Atom 1.0 serializer */
+-#undef RAPTOR_SERIALIZER_ATOM
++#define RAPTOR_SERIALIZER_ATOM 1
+
+ /* Building GraphViz DOT serializer */
+-#undef RAPTOR_SERIALIZER_DOT
++#define RAPTOR_SERIALIZER_DOT 1
+
+ /* Building HTML Table serializer */
+-#undef RAPTOR_SERIALIZER_HTML
++#define RAPTOR_SERIALIZER_HTML 1
+
+ /* Building JSON serializer */
+-#undef RAPTOR_SERIALIZER_JSON
++#define RAPTOR_SERIALIZER_JSON 1
+
+ /* Building N-Quads serializer */
+-#undef RAPTOR_SERIALIZER_NQUADS
++#define RAPTOR_SERIALIZER_NQUADS 1
+
+ /* Building N-Triples serializer */
+-#undef RAPTOR_SERIALIZER_NTRIPLES
++#define RAPTOR_SERIALIZER_NTRIPLES 1
+
+ /* Building RDF/XML serializer */
+-#undef RAPTOR_SERIALIZER_RDFXML
++#define RAPTOR_SERIALIZER_RDFXML 1
+
+ /* Building RDF/XML-abbreviated serializer */
+-#undef RAPTOR_SERIALIZER_RDFXML_ABBREV
++#define RAPTOR_SERIALIZER_RDFXML_ABBREV 1
+
+ /* Building RSS 1.0 serializer */
+-#undef RAPTOR_SERIALIZER_RSS_1_0
++#define RAPTOR_SERIALIZER_RSS_1_0 1
+
+ /* Building Turtle serializer */
+-#undef RAPTOR_SERIALIZER_TURTLE
++#define RAPTOR_SERIALIZER_TURTLE 1
+
+ /* Release version as a decimal */
+-#undef RAPTOR_VERSION_DECIMAL
++#define RAPTOR_VERSION_DECIMAL 20015
+
+ /* Major version number */
+-#undef RAPTOR_VERSION_MAJOR
++#define RAPTOR_VERSION_MAJOR 2
+
+ /* Minor version number */
+-#undef RAPTOR_VERSION_MINOR
++#define RAPTOR_VERSION_MINOR 0
+
+ /* Release version number */
+-#undef RAPTOR_VERSION_RELEASE
++#define RAPTOR_VERSION_RELEASE 15
+
+ /* Have libcurl WWW library */
+-#undef RAPTOR_WWW_LIBCURL
++/* #undef RAPTOR_WWW_LIBCURL */
+
+ /* Have libfetch WWW library */
+-#undef RAPTOR_WWW_LIBFETCH
++/* #undef RAPTOR_WWW_LIBFETCH */
- /* 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
-@@ -113,19 +125,23 @@
+ /* Have libxml available as a WWW library */
+-#undef RAPTOR_WWW_LIBXML
++#define RAPTOR_WWW_LIBXML 1
+
+ /* No WWW library */
+-#undef RAPTOR_WWW_NONE
++/* #undef RAPTOR_WWW_NONE */
+
+ /* Check XML 1.1 Names */
+-#undef RAPTOR_XML_1_1
++/* #undef RAPTOR_XML_1_1 */
+
+ /* Use libxml XML parser */
+-#undef RAPTOR_XML_LIBXML
++#define RAPTOR_XML_LIBXML 1
+
+ /* Define to 1 if you have the ANSI C header files. */
+-#undef STDC_HEADERS
++#define STDC_HEADERS 1
+
+ /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+-#undef TIME_WITH_SYS_TIME
++/* #undef TIME_WITH_SYS_TIME */
+
+ /* Version number of package */
+-#undef VERSION
++#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). */
+@@ -321,13 +322,13 @@
+ # endif
+ #else
+ # ifndef WORDS_BIGENDIAN
+-# undef WORDS_BIGENDIAN
++/* # undef WORDS_BIGENDIAN */
+ # endif
#endif
- #define RAPTOR_PARSER_GUESS 1
--#define RAPTOR_PARSER_GRDDL 1
-+/* #define RAPTOR_PARSER_GRDDL 1 disabled: (#i93768#) */
-+#ifndef __MINGW32__ /* conflicts with normal configure result */
- #define RAPTOR_PARSER_N3 1
-+#endif
- #define RAPTOR_PARSER_TURTLE 1
- #define RAPTOR_PARSER_NTRIPLES 1
- #define RAPTOR_PARSER_RDFXML 1
-
-+/* does not build on wntmsci12 due to gettimeofday
- #define RAPTOR_SERIALIZER_ATOM 1
--#define RAPTOR_SERIALIZER_RSS_1_0 1
-+#define RAPTOR_SERIALIZER_RSS_1_0 1 */
- #define RAPTOR_SERIALIZER_RDFXML 1
- #define RAPTOR_SERIALIZER_RDFXML_ABBREV 1
- #define RAPTOR_SERIALIZER_NTRIPLES 1
+ /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
+ `char[]'. */
+-#undef YYTEXT_POINTER
++#define YYTEXT_POINTER 1
+
+ /* Enable large inode numbers on Mac OS X 10.5. */
+ #ifndef _DARWIN_USE_64_BIT_INODE
+@@ -335,16 +336,20 @@
+ #endif
--#define RAPTOR_WWW_LIBCURL 1
-+//#define RAPTOR_WWW_LIBCURL 1
-+#define RAPTOR_WWW_LIBXML 1
+ /* Number of bits in a file offset, on hosts where this is settable. */
+-#undef _FILE_OFFSET_BITS
++/* #undef _FILE_OFFSET_BITS */
+
+ /* Define for large files, on AIX-style hosts. */
+-#undef _LARGE_FILES
++/* #undef _LARGE_FILES */
+
+ /* Define to empty if `const' does not conform to ANSI C. */
+-#undef const
++/* #undef const */
+
+ /* Define to `__inline__' or `__inline' if that's what the C compiler
+ calls it, or to nothing if 'inline' is not supported under any name. */
+ #ifndef __cplusplus
+-#undef inline
++/* #undef inline */
+ #endif
++
++# define S_ISTYPE(mode, mask) (((mode) & _S_IFMT) == (mask))
++# define S_ISDIR(mode) S_ISTYPE((mode), _S_IFDIR)
++# define S_ISREG(mode) S_ISTYPE((mode), _S_IFREG)
+--- misc/raptor2-2.0.15/src/sort_r.c 2014-06-30 10:09:40.000000000 -0700
++++ misc/build/raptor2-2.0.15/src/sort_r.c 2016-08-23 11:02:51.651428000 -0700
+@@ -60,6 +60,7 @@
+ * data2, @user_data) and returns <0, 0, or >0 for object comparison.
+ *
+ */
++RAPTOR_EXTERN_C
+ void
+ raptor_sort_r(void *base, size_t nel, size_t width,
+ raptor_data_compare_arg_handler compar, void *user_data)
+--- misc/raptor2-2.0.15/src/raptor2.h.in 2014-11-01 21:44:04.000000000 -0700
++++ misc/build/raptor2-2.0.15/src/raptor2.h.in 2016-08-23 11:46:20.581017000 -0700
+@@ -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);
- #include <windows.h>
Modified: openoffice/trunk/main/redland/rasqal/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/redland/rasqal/makefile.mk?rev=1757789&r1=1757788&r2=1757789&view=diff
==============================================================================
--- openoffice/trunk/main/redland/rasqal/makefile.mk (original)
+++ openoffice/trunk/main/redland/rasqal/makefile.mk Fri Aug 26 07:13:14 2016
@@ -40,18 +40,16 @@ all:
.INCLUDE : ../redlandversion.mk
-RASQALVERSION=0.9.16
+RASQALVERSION=0.9.33
TARFILE_NAME=rasqal-$(RASQALVERSION)
-TARFILE_MD5=fca8706f2c4619e2fa3f8f42f8fc1e9d
+TARFILE_MD5=1f5def51ca0026cd192958ef07228b52
-ADDITIONAL_FILES=src/makefile.mk src/rasqal_config.h
+ADDITIONAL_FILES=src/makefile.mk
OOO_PATCH_FILES= \
- $(TARFILE_NAME).patch.autotools \
$(TARFILE_NAME).patch.ooo_build \
$(TARFILE_NAME).patch.dmake \
- $(TARFILE_NAME).patch.win32
PATCH_FILES=$(OOO_PATCH_FILES)
@@ -80,6 +78,12 @@ BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
.ELSE
# there is no wntmsci build environment in the tarball; we use custom dmakefile
+OOO_PATCH_FILES+= $(TARFILE_NAME).patch.win32
+CONFIGURE_ACTION= ${PERL} -p -e '$$prefix="'$(PWD)/$(OUT)'"; $$libdir="'$(PWD)/$(LB)'"; $$incdir="'$(PWD)/$(INCCOM)'"; $$ldflags="-L$(SOLARLIBDIR) -lraptor2 -lm";' -e 's/\@prefix\@/$$prefix/; s/\@exec_prefix\@/\$${prefix}/; s/\@libdir\@/$$libdir/; s/\@includedir\@/$$incdir/; s/\@PACKAGE\@/rasqal/; s/\@VERSION\@/0.9.33/; s/\@PKG_CONFIG_REQUIRES\@/raptor2 >= 2.0.7/; s/\@RAPTOR_LDFLAGS\@/$$ldflags/;' < rasqal.pc.in > rasqal.pc && \
+ ${PERL} -p -e 's/\@RASQAL_VERSION_DECIMAL\@/933/;s/\@VERSION\@/0.9.33/;s/\@RASQAL_VERSION_MAJOR\@/0/;s/\@RASQAL_VERSION_MINOR\@/9/;s/\@RASQAL_VERSION_RELEASE\@/33/;s/\@HAVE_SYS_TIME_H\@/0/;s/\@HAVE_TIME_H\@/1/;s/\@RAPTOR_VERSION_DEC\@/2.0.15/' < src/rasqal.h.in > src/rasqal.h && \
+ $(COPY) src/rasqal_config.h.in src/rasqal_config.h && \
+ $(COPY) src/snprintf.c src/rasqal_snprintf.c && \
+ $(COPY) libsv/sv.c src/sv.c
BUILD_ACTION=dmake
BUILD_DIR=$(CONFIGURE_DIR)$/src
.ENDIF
@@ -118,8 +122,11 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake vari
.EXPORT: XSLTLIB
CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-CONFIGURE_FLAGS=--disable-static --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
+CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" RASQAL_CFLAGS=-I${PWD}$/..$/${INPATH}/inc RASQAL_LIBS="-L${PWD}/..$/${INPATH}/lib -lrasqual" RAPTOR2_CFLAGS=-I${PWD}$/..$/${INPATH}/inc RAPTOR2_LIBS="-L${PWD}/..$/${INPATH}/lib -lraptor2" PKG_CONFIG_PATH="../raptor2-2.0.15:../rasqal-0.9.33"
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-regex-library=posix --with-decimal=none
+.IF "$(SYSTEM_LIBXML)" == "NO"
+CONFIGURE_FLAGS+=--with-xml2-config=${SOLARVERSION}/${INPATH}/bin/xml2-config
+.ENDIF
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
Copied: openoffice/trunk/main/redland/rasqal/rasqal-0.9.33.patch.dmake (from r1757788, openoffice/trunk/main/redland/rasqal/rasqal-0.9.16.patch.dmake)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/redland/rasqal/rasqal-0.9.33.patch.dmake?p2=openoffice/trunk/main/redland/rasqal/rasqal-0.9.33.patch.dmake&p1=openoffice/trunk/main/redland/rasqal/rasqal-0.9.16.patch.dmake&r1=1757788&r2=1757789&rev=1757789&view=diff
==============================================================================
--- openoffice/trunk/main/redland/rasqal/rasqal-0.9.16.patch.dmake (original)
+++ openoffice/trunk/main/redland/rasqal/rasqal-0.9.33.patch.dmake Fri Aug 26 07:13:14 2016
@@ -1,6 +1,7 @@
---- 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,96 @@
+diff -ur misc/rasqal-0.9.33/src/makefile.mk misc/build/rasqal-0.9.33/src/makefile.mk
+--- misc/rasqal-0.9.33/src/makefile.mk 2016-08-23 00:04:52.311517000 -0700
++++ misc/build/rasqal-0.9.33/src/makefile.mk 2016-08-23 00:04:28.509749000 -0700
+@@ -1 +1,148 @@
-dummy
+#**************************************************************
+#
@@ -37,35 +38,87 @@
+
+.INCLUDE : settings.mk
+
-+CDEFS+=-DRASQAL_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS -D_MT
++CDEFS+=-DRASQAL_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS -D_MT -DHAVE_CONFIG_H -I../libsv -I$(PRJ)$/$(INPATH)$/inc -DSV_CONFIG
+
+# --- Files --------------------------------------------------------
+
+SLOFILES = \
++ $(SLO)$/rasqal_algebra.obj \
++ $(SLO)$/rasqal_bindings.obj \
++ $(SLO)$/rasqal_data_graph.obj \
++ $(SLO)$/rasqal_dataset.obj \
+ $(SLO)$/rasqal_datetime.obj \
+ $(SLO)$/rasqal_decimal.obj \
++ $(SLO)$/rasqal_digest.obj \
++ $(SLO)$/rasqal_digest_md5.obj \
++ $(SLO)$/rasqal_digest_sha1.obj \
++ $(SLO)$/rasqal_double.obj \
+ $(SLO)$/rasqal_engine.obj \
++ $(SLO)$/rasqal_engine_algebra.obj \
++ $(SLO)$/rasqal_engine_sort.obj \
+ $(SLO)$/rasqal_expr.obj \
++ $(SLO)$/rasqal_expr_datetimes.obj \
++ $(SLO)$/rasqal_expr_evaluate.obj \
++ $(SLO)$/rasqal_expr_numerics.obj \
++ $(SLO)$/rasqal_expr_strings.obj \
+ $(SLO)$/rasqal_feature.obj \
++ $(SLO)$/rasqal_format_html.obj \
++ $(SLO)$/rasqal_format_json.obj \
++ $(SLO)$/rasqal_format_rdf.obj \
++ $(SLO)$/rasqal_format_sparql_xml.obj \
++ $(SLO)$/rasqal_format_sv.obj \
++ $(SLO)$/rasqal_format_table.obj \
++ $(SLO)$/rasqal_formula.obj \
+ $(SLO)$/rasqal_general.obj \
+ $(SLO)$/rasqal_graph_pattern.obj \
++ $(SLO)$/rasqal_iostream.obj \
+ $(SLO)$/rasqal_literal.obj \
+ $(SLO)$/rasqal_map.obj \
-+ $(SLO)$/rasqal_query_results.obj \
++ $(SLO)$/rasqal_ntriples.obj \
++ $(SLO)$/rasqal_prefix.obj \
++ $(SLO)$/rasqal_projection.obj \
+ $(SLO)$/rasqal_query.obj \
++ $(SLO)$/rasqal_query_results.obj \
++ $(SLO)$/rasqal_query_transform.obj \
++ $(SLO)$/rasqal_query_write.obj \
++ $(SLO)$/rasqal_random.obj \
+ $(SLO)$/rasqal_raptor.obj \
++ $(SLO)$/rasqal_regex.obj \
+ $(SLO)$/rasqal_result_formats.obj \
++ $(SLO)$/rasqal_results_compare.obj \
++ $(SLO)$/rasqal_row.obj \
++ $(SLO)$/rasqal_row_compatible.obj \
+ $(SLO)$/rasqal_rowsource.obj \
-+ $(SLO)$/rasqal_sparql_xml.obj \
++ $(SLO)$/rasqal_rowsource_aggregation.obj \
++ $(SLO)$/rasqal_rowsource_assignment.obj \
++ $(SLO)$/rasqal_rowsource_bindings.obj \
++ $(SLO)$/rasqal_rowsource_distinct.obj \
++ $(SLO)$/rasqal_rowsource_empty.obj \
++ $(SLO)$/rasqal_rowsource_filter.obj \
++ $(SLO)$/rasqal_rowsource_graph.obj \
++ $(SLO)$/rasqal_rowsource_groupby.obj \
++ $(SLO)$/rasqal_rowsource_having.obj \
++ $(SLO)$/rasqal_rowsource_join.obj \
++ $(SLO)$/rasqal_rowsource_project.obj \
++ $(SLO)$/rasqal_rowsource_rowsequence.obj \
++ $(SLO)$/rasqal_rowsource_service.obj \
++ $(SLO)$/rasqal_rowsource_slice.obj \
++ $(SLO)$/rasqal_rowsource_sort.obj \
++ $(SLO)$/rasqal_rowsource_triples.obj \
++ $(SLO)$/rasqal_rowsource_union.obj \
++ $(SLO)$/rasqal_service.obj \
++ $(SLO)$/rasqal_solution_modifier.obj \
++ $(SLO)$/rasqal_triple.obj \
++ $(SLO)$/rasqal_triples_source.obj \
++ $(SLO)$/rasqal_update.obj \
++ $(SLO)$/rasqal_variable.obj \
+ $(SLO)$/rasqal_xsd_datatypes.obj \
-+ $(SLO)$/rdql_lexer.obj \
-+ $(SLO)$/rdql_parser.obj \
++ $(SLO)$/rasqal_snprintf.obj \
+ $(SLO)$/sparql_lexer.obj \
+ $(SLO)$/sparql_parser.obj \
-+ $(SLO)$/strcasecmp.obj \
-+
-+
-+# $(SLO)$/rasqal_redland.obj \
++ $(SLO)$/sv.obj \
++ $(SLO)$/gettimeofday.obj \
++ $(SLO)$/timegm.obj \
+
+SHL1DEPN= makefile.mk
+SHL1OBJS= $(SLOFILES)
Copied: openoffice/trunk/main/redland/rasqal/rasqal-0.9.33.patch.ooo_build (from r1757788, openoffice/trunk/main/redland/rasqal/rasqal-0.9.16.patch.ooo_build)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/redland/rasqal/rasqal-0.9.33.patch.ooo_build?p2=openoffice/trunk/main/redland/rasqal/rasqal-0.9.33.patch.ooo_build&p1=openoffice/trunk/main/redland/rasqal/rasqal-0.9.16.patch.ooo_build&r1=1757788&r2=1757789&rev=1757789&view=diff
==============================================================================
--- openoffice/trunk/main/redland/rasqal/rasqal-0.9.16.patch.ooo_build (original)
+++ openoffice/trunk/main/redland/rasqal/rasqal-0.9.33.patch.ooo_build Fri Aug 26 07:13:14 2016
@@ -1,56 +1,14 @@
---- 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 @@
- #
- #
+--- misc/rasqal-0.9.33/Makefile.am 2014-03-27 21:54:42.000000000 -0700
++++ misc/build/rasqal-0.9.33/Makefile.am 2016-08-20 21:20:09.715947000 -0700
+@@ -31,9 +31,9 @@
+ if GETOPT
+ SUBDIRS += getopt
+ endif
+-SUBDIRS += src utils tests docs data win32 scripts
++SUBDIRS += src tests docs data win32 scripts
--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}
+-DIST_SUBDIRS=libsv libmtwist getopt src utils tests docs data win32 scripts
++DIST_SUBDIRS=libsv libmtwist getopt src tests docs data win32 scripts
-+#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@
---- misc/rasqal-0.9.16/Makefile.am 2010-02-12 08:43:21.000000000 +0000
-+++ misc/build/rasqal-0.9.16/Makefile.am 2010-02-12 08:43:56.000000000 +0000
-@@ -22,7 +22,7 @@
-
- noinst_SCRIPTS = rasqal-src-config
-
--SUBDIRS=src utils tests docs data win32
-+SUBDIRS=src tests docs data win32
-
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = rasqal.pc
---- misc/rasqal-0.9.16/Makefile.in 2010-02-12 08:43:19.000000000 +0000
-+++ misc/build/rasqal-0.9.16/Makefile.in 2010-02-12 08:44:03.000000000 +0000
-@@ -242,7 +242,7 @@
- with_raptor = @with_raptor@
- with_redland = @with_redland@
- noinst_SCRIPTS = rasqal-src-config
--SUBDIRS = src utils tests docs data win32
-+SUBDIRS = src tests docs data win32
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = rasqal.pc
- EXTRA_DIST = ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \
Copied: openoffice/trunk/main/redland/rasqal/rasqal-0.9.33.patch.win32 (from r1757788, openoffice/trunk/main/redland/rasqal/rasqal-0.9.16.patch.win32)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/redland/rasqal/rasqal-0.9.33.patch.win32?p2=openoffice/trunk/main/redland/rasqal/rasqal-0.9.33.patch.win32&p1=openoffice/trunk/main/redland/rasqal/rasqal-0.9.16.patch.win32&r1=1757788&r2=1757789&rev=1757789&view=diff
==============================================================================
--- openoffice/trunk/main/redland/rasqal/rasqal-0.9.16.patch.win32 (original)
+++ openoffice/trunk/main/redland/rasqal/rasqal-0.9.33.patch.win32 Fri Aug 26 07:13:14 2016
@@ -1,43 +1,398 @@
---- 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 @@
+diff -ur misc/rasqal-0.9.33/src/rasqal_config.h.in misc/build/rasqal-0.9.33/src/rasqal_config.h.in
+--- misc/rasqal-0.9.33/src/rasqal_config.h.in 2014-11-23 14:11:50.000000000 -0800
++++ misc/build/rasqal-0.9.33/src/rasqal_config.h.in 2016-08-23 00:00:45.440707000 -0700
+@@ -1,272 +1,273 @@
++/* src/rasqal_config.h. Generated from rasqal_config.h.in by configure. */
+ /* src/rasqal_config.h.in. Generated from configure.ac by autoheader. */
- #define HAVE_STDLIB_H 1
+ /* Define if building universal (internal helper macro) */
+-#undef AC_APPLE_UNIVERSAL_BUILD
++/* #undef AC_APPLE_UNIVERSAL_BUILD */
+ /* Flex version as a decimal */
+-#undef FLEX_VERSION_DECIMAL
++#define FLEX_VERSION_DECIMAL 00000
+
+ /* Define to 1 if you have the <dlfcn.h> header file. */
+-#undef HAVE_DLFCN_H
++/* #define HAVE_DLFCN_H */
+
+ /* Define to 1 if you have the <errno.h> header file. */
+-#undef HAVE_ERRNO_H
+#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>
+ /* Define to 1 if you have the <float.h> header file. */
+-#undef HAVE_FLOAT_H
++#define HAVE_FLOAT_H 1
-+// 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 */
+ /* Define to 1 if you have the <gcrypt.h> header file. */
+-#undef HAVE_GCRYPT_H
++/* #undef HAVE_GCRYPT_H */
- /* Use PCRE regex library */
--#define RASQAL_REGEX_PCRE 1
-+//#define RASQAL_REGEX_PCRE 1
+ /* Define to 1 if you have the `getopt' function. */
+-#undef HAVE_GETOPT
++#define HAVE_GETOPT 1
+
+ /* Define to 1 if you have the <getopt.h> header file. */
+-#undef HAVE_GETOPT_H
++#define HAVE_GETOPT_H 1
+
+ /* Define to 1 if you have the `getopt_long' function. */
+-#undef HAVE_GETOPT_LONG
++#define HAVE_GETOPT_LONG 1
+
+ /* Define to 1 if you have the `gettimeofday' function. */
+-#undef HAVE_GETTIMEOFDAY
++/* #undef HAVE_GETTIMEOFDAY */
+
+ /* Define to 1 if you have the <gmp.h> header file. */
+-#undef HAVE_GMP_H
++/* #undef HAVE_GMP_H */
+
+ /* Have gmp_version constant */
+-#undef HAVE_GMP_VERSION
++/* #undef HAVE_GMP_VERSION */
+
+ /* Define to 1 if you have the `gmtime_r' function. */
+-#undef HAVE_GMTIME_R
++/* #undef HAVE_GMTIME_R */
+
+ /* Define to 1 if you have the `initstate' function. */
+-#undef HAVE_INITSTATE
++#define HAVE_INITSTATE 1
+ /* Define to 1 if you have the `initstate_r' function. */
+-#undef HAVE_INITSTATE_R
++/* #undef HAVE_INITSTATE_R */
+
+ /* Define to 1 if you have the <inttypes.h> header file. */
+-#undef HAVE_INTTYPES_H
++#define HAVE_INTTYPES_H 1
+
+ /* Define to 1 if you have the <libxml/schemasInternals.h> header file. */
+-#undef HAVE_LIBXML_SCHEMASINTERNALS_H
+#define HAVE_LIBXML_SCHEMASINTERNALS_H 1
+
+ /* Define to 1 if you have the <libxml/xmlschemastypes.h> header file. */
+-#undef HAVE_LIBXML_XMLSCHEMASTYPES_H
+#define HAVE_LIBXML_XMLSCHEMASTYPES_H 1
+
+ /* Define to 1 if you have the <libxml/xmlschemas.h> header file. */
+-#undef HAVE_LIBXML_XMLSCHEMAS_H
+#define HAVE_LIBXML_XMLSCHEMAS_H 1
-+
+
+ /* Define to 1 if you have the <limits.h> header file. */
+-#undef HAVE_LIMITS_H
++#define HAVE_LIMITS_H 1
+
+ /* Define to 1 if you have the <math.h> header file. */
+-#undef HAVE_MATH_H
++#define HAVE_MATH_H 1
+
+ /* Define to 1 if you have the <memory.h> header file. */
+-#undef HAVE_MEMORY_H
++#define HAVE_MEMORY_H 1
+
+ /* Define to 1 if you have the <mhash.h> header file. */
+-#undef HAVE_MHASH_H
++/* #undef HAVE_MHASH_H */
+
+ /* Define to 1 if you have the <mpfr.h> header file. */
+-#undef HAVE_MPFR_H
++/* #undef HAVE_MPFR_H */
+
+ /* Define to 1 if you have the `rand' function. */
+-#undef HAVE_RAND
++#define HAVE_RAND 1
+
+ /* Define to 1 if you have the `random' function. */
+-#undef HAVE_RANDOM
++#define HAVE_RANDOM 1
+
+ /* Define to 1 if you have the `random_r' function. */
+-#undef HAVE_RANDOM_R
++/* #undef HAVE_RANDOM_R */
+
+ /* Define to 1 if you have the `rand_r' function. */
+-#undef HAVE_RAND_R
++#define HAVE_RAND_R 1
+
+ /* Define to 1 if you have the <regex.h> header file. */
+-#undef HAVE_REGEX_H
++/* #undef HAVE_REGEX_H */
+
+ /* have PCRE regex - Perl Compatible Regular Expressions */
+-#undef HAVE_REGEX_PCRE
++/* #undef HAVE_REGEX_PCRE */
+
+ /* have POSIX regex library */
+-#undef HAVE_REGEX_POSIX
++/* #undef HAVE_REGEX_POSIX */
+
+ /* Define to 1 if you have the `srand' function. */
+-#undef HAVE_SRAND
++#define HAVE_SRAND 1
+
+ /* Define to 1 if you have the <stddef.h> header file. */
+-#undef HAVE_STDDEF_H
++#define HAVE_STDDEF_H 1
+
+ /* Define to 1 if you have the <stdint.h> header file. */
+-#undef HAVE_STDINT_H
++/* #undef HAVE_STDINT_H */
+
+ /* Define to 1 if you have the <stdlib.h> header file. */
+-#undef HAVE_STDLIB_H
++#define HAVE_STDLIB_H 1
+
+ /* Define to 1 if you have the `strcasecmp' function. */
+-#undef HAVE_STRCASECMP
++/* #undef HAVE_STRCASECMP */
+
+ /* Define to 1 if you have the `stricmp' function. */
+-#undef HAVE_STRICMP
++#define HAVE_STRICMP 1
+
+ /* Define to 1 if you have the <strings.h> header file. */
+-#undef HAVE_STRINGS_H
++/* #undef HAVE_STRINGS_H */
+
+ /* Define to 1 if you have the <string.h> header file. */
+-#undef HAVE_STRING_H
++#define HAVE_STRING_H 1
+
+ /* Define to 1 if you have the <sys/stat.h> header file. */
+-#undef HAVE_SYS_STAT_H
++#define HAVE_SYS_STAT_H 1
+
+ /* Define to 1 if you have the <sys/time.h> header file. */
+-#undef HAVE_SYS_TIME_H
++/* #undef HAVE_SYS_TIME_H */
+
+ /* Define to 1 if you have the <sys/types.h> header file. */
+-#undef HAVE_SYS_TYPES_H
++#define HAVE_SYS_TYPES_H 1
+
+ /* Define to 1 if you have the `timegm' function. */
+-#undef HAVE_TIMEGM
++/* #undef HAVE_TIMEGM */
+
+ /* Define to 1 if you have the <time.h> header file. */
+-#undef HAVE_TIME_H
++#define HAVE_TIME_H 1
+
+ /* struct tm has tm_gmtoff field */
+-#undef HAVE_TM_GMTOFF
++/* #undef HAVE_TM_GMTOFF */
+
+ /* Define to 1 if you have the <unistd.h> header file. */
+-#undef HAVE_UNISTD_H
++#define HAVE_UNISTD_H 1
+
+ /* Define to 1 if you have the <uuid/uuid.h> header file. */
+-#undef HAVE_UUID_UUID_H
++/* #undef HAVE_UUID_UUID_H */
+
+ /* Define to 1 if you have the `vsnprintf' function. */
+-#undef HAVE_VSNPRINTF
++#define HAVE_VSNPRINTF 1
+
+ /* Is __FUNCTION__ available */
+-#undef HAVE___FUNCTION__
++#define HAVE___FUNCTION__ 1
+
+ /* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+-#undef LT_OBJDIR
++#define LT_OBJDIR ".libs/"
+
+ /* need 'extern int optind' declaration? */
+-#undef NEED_OPTIND_DECLARATION
++/* #undef NEED_OPTIND_DECLARATION */
+
+ /* Define to 1 if your C compiler doesn't accept -c and -o together. */
+-#undef NO_MINUS_C_MINUS_O
++/* #undef NO_MINUS_C_MINUS_O */
+
+ /* Name of package */
+-#undef PACKAGE
++#define PACKAGE "rasqal"
+
+ /* Define to the address where bug reports for this package should be sent. */
+-#undef PACKAGE_BUGREPORT
++#define PACKAGE_BUGREPORT "http://bugs.librdf.org/"
+
+ /* Define to the full name of this package. */
+-#undef PACKAGE_NAME
++#define PACKAGE_NAME "Rasqal RDF Query Library"
+
+ /* Define to the full name and version of this package. */
+-#undef PACKAGE_STRING
++#define PACKAGE_STRING "Rasqal RDF Query Library 0.9.33"
+
+ /* Define to the one symbol short name of this package. */
+-#undef PACKAGE_TARNAME
++#define PACKAGE_TARNAME "rasqal"
+
+ /* Define to the home page for this package. */
+-#undef PACKAGE_URL
++#define PACKAGE_URL ""
+
+ /* Define to the version of this package. */
+-#undef PACKAGE_VERSION
++#define PACKAGE_VERSION "0.9.33"
+
+ /* Use GMP gmp_randseed_ui() and mpz_urandomm() */
+-#undef RANDOM_ALGO_GMP_RAND
++/* #undef RANDOM_ALGO_GMP_RAND */
+
+ /* Use internal Mersenne Twister */
+-#undef RANDOM_ALGO_MTWIST
++/* #undef RANDOM_ALGO_MTWIST */
+
+ /* Use POSIX srand() and rand() */
+-#undef RANDOM_ALGO_RAND
++#define RANDOM_ALGO_RAND 1
+
+ /* Use BSD initstate() and random() */
+-#undef RANDOM_ALGO_RANDOM
++/* #undef RANDOM_ALGO_RANDOM */
+
+ /* Use glibc initstate_r() and random_r() */
+-#undef RANDOM_ALGO_RANDOM_R
++/* #undef RANDOM_ALGO_RANDOM_R */
+
+ /* Use POSIX rand_r() */
+-#undef RANDOM_ALGO_RAND_R
++/* #undef RANDOM_ALGO_RAND_R */
+
+ /* Decimal from GNU MP library */
+-#undef RASQAL_DECIMAL_GMP
++/* #undef RASQAL_DECIMAL_GMP */
+
+ /* Decimal from MPFR library */
+-#undef RASQAL_DECIMAL_MPFR
++/* #undef RASQAL_DECIMAL_MPFR */
+
+ /* Decimal without a library */
+-#undef RASQAL_DECIMAL_NONE
+#define RASQAL_DECIMAL_NONE 1
-+
- #ifdef _DEBUG
- #define RASQAL_DEBUG 1
+
+ /* Use gcrypt library for message digests */
+-#undef RASQAL_DIGEST_GCRYPT
++/* #undef RASQAL_DIGEST_GCRYPT */
+
+ /* Use internal routines for message digests */
+-#undef RASQAL_DIGEST_INTERNAL
++#define RASQAL_DIGEST_INTERNAL 1
+
+ /* Use mhash library for message digests */
+-#undef RASQAL_DIGEST_MHASH
++/* #undef RASQAL_DIGEST_MHASH */
+
+ /* Use no message digest library */
+-#undef RASQAL_DIGEST_NONE
++/* #undef RASQAL_DIGEST_NONE */
+
+ /* Building LAQRS query */
+-#undef RASQAL_QUERY_LAQRS
++#define RASQAL_QUERY_LAQRS 1
+
+ /* Building SPARQL query */
+-#undef RASQAL_QUERY_SPARQL
++#define RASQAL_QUERY_SPARQL 1
+
+ /* Use no regex library */
+-#undef RASQAL_REGEX_NONE
++/* #undef RASQAL_REGEX_NONE */
+
+ /* Use PCRE regex library */
+-#undef RASQAL_REGEX_PCRE
++/* #undef RASQAL_REGEX_PCRE */
+
+ /* Use POSIX regex library */
+-#undef RASQAL_REGEX_POSIX
++/* #undef RASQAL_REGEX_POSIX */
+
+ /* Use internal routines for UUID */
+-#undef RASQAL_UUID_INTERNAL
++#define RASQAL_UUID_INTERNAL 1
+
+ /* Use UUID in libc library for UUID */
+-#undef RASQAL_UUID_LIBC
++/* #undef RASQAL_UUID_LIBC */
+
+ /* Use libuuid library for UUID */
+-#undef RASQAL_UUID_LIBUUID
++/* #undef RASQAL_UUID_LIBUUID */
+
+ /* Use no UUID library */
+-#undef RASQAL_UUID_NONE
++/* #undef RASQAL_UUID_NONE */
+
+ /* Use OSSP library for UUID */
+-#undef RASQAL_UUID_OSSP
++/* #undef RASQAL_UUID_OSSP */
+
+ /* Release version as a decimal */
+-#undef RASQAL_VERSION_DECIMAL
++#define RASQAL_VERSION_DECIMAL 933
+
+ /* Major version number */
+-#undef RASQAL_VERSION_MAJOR
++#define RASQAL_VERSION_MAJOR 0
+
+ /* Minor version number */
+-#undef RASQAL_VERSION_MINOR
++#define RASQAL_VERSION_MINOR 9
+
+ /* Release version number */
+-#undef RASQAL_VERSION_RELEASE
++#define RASQAL_VERSION_RELEASE 33
+
+ /* Define to 1 if you have the ANSI C header files. */
+-#undef STDC_HEADERS
++#define STDC_HEADERS 1
+
+ /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+-#undef TIME_WITH_SYS_TIME
++/* #undef TIME_WITH_SYS_TIME */
+
+ /* Version number of package */
+-#undef VERSION
++#define VERSION "0.9.33"
+
+ /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+ significant byte first (like Motorola and SPARC, unlike Intel). */
+@@ -276,13 +277,13 @@
+ # endif
+ #else
+ # ifndef WORDS_BIGENDIAN
+-# undef WORDS_BIGENDIAN
++/* # undef WORDS_BIGENDIAN */
+ # endif
#endif
+
+ /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
+ `char[]'. */
+-#undef YYTEXT_POINTER
++#define YYTEXT_POINTER 1
+
+ /* Define to empty if `const' does not conform to ANSI C. */
+-#undef const
++/* #undef const */
+Only in misc/build/rasqal-0.9.33/src: rasqal_config.h.in.orig
+diff -ur misc/rasqal-0.9.33/src/rasqal_ntriples.c misc/build/rasqal-0.9.33/src/rasqal_ntriples.c
+--- misc/rasqal-0.9.33/src/rasqal_ntriples.c 2013-12-12 14:42:49.000000000 -0800
++++ misc/build/rasqal-0.9.33/src/rasqal_ntriples.c 2016-08-23 00:19:55.840632000 -0700
+@@ -25,6 +25,10 @@
+ #include <rasqal_config.h>
+ #endif
+
++#ifdef WIN32
++#include <win32_rasqal_config.h>
++#endif
++
+ #include <stdio.h>
+ #include <string.h>
+ #include <ctype.h>
Modified: openoffice/trunk/main/redland/redland/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/redland/redland/makefile.mk?rev=1757789&r1=1757788&r2=1757789&view=diff
==============================================================================
--- openoffice/trunk/main/redland/redland/makefile.mk (original)
+++ openoffice/trunk/main/redland/redland/makefile.mk Fri Aug 26 07:13:14 2016
@@ -40,18 +40,17 @@ all:
.INCLUDE : ../redlandversion.mk
-REDLANDVERSION=1.0.8
+REDLANDVERSION=1.0.17
TARFILE_NAME=redland-$(REDLANDVERSION)
-TARFILE_MD5=ca66e26082cab8bb817185a116db809b
+TARFILE_MD5=e5be03eda13ef68aabab6e42aa67715e
-ADDITIONAL_FILES=librdf/makefile.mk librdf/rdf_config.h
+ADDITIONAL_FILES=src/makefile.mk src/rdf_config.h
OOO_PATCH_FILES= \
$(TARFILE_NAME).patch.autotools \
$(TARFILE_NAME).patch.dmake \
$(TARFILE_NAME).patch.ooo_build \
- $(TARFILE_NAME).patch.win32
PATCH_FILES=$(OOO_PATCH_FILES) \
@@ -80,8 +79,11 @@ BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
.ELSE
# there is no wntmsci build environment in the tarball; we use custom dmakefile
+OOO_PATCH_FILES+= $(TARFILE_NAME).patch.win32
+CONFIGURE_ACTION= \
+ $(COPY) src/rdf_config.h.in src/rdf_config.h
BUILD_ACTION=dmake
-BUILD_DIR=$(CONFIGURE_DIR)$/librdf
+BUILD_DIR=$(CONFIGURE_DIR)$/src
.ENDIF
.ELSE # "WNT"
@@ -122,8 +124,9 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake vari
.EXPORT: XSLTLIB
CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
+#CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" RAPTOR2_CFLAGS=-I${PWD}$/..$/${INPATH}/inc RAPTOR2_LIBS="-L${PWD}/..$/${INPATH}/lib -lraptor2" PKG_CONFIG_PATH="../raptor2-2.0.15:../rasqal-0.9.33"
+CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" PKG_CONFIG_PATH="../raptor2-2.0.15:../rasqal-0.9.33"
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore -without-iodbc --without-unixodbc --without-datadirect --without-virtuoso --with-regex-library=posix --with-decimal=none --with-www=xml --disable-ltdl-install --disable-modular --without-included-ltdl --disable-ltdl-convenience
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
@@ -132,21 +135,40 @@ BUILD_DIR=$(CONFIGURE_DIR)
.ENDIF
-OUT2INC+=librdf$/*.h
+OUT2INC+=src$/librdf.h src$/redland.h \
+ src$/rdf_concepts.h \
+ src$/rdf_digest.h \
+ src$/rdf_hash.h \
+ src$/rdf_init.h \
+ src$/rdf_iterator.h \
+ src$/rdf_list.h \
+ src$/rdf_log.h \
+ src$/rdf_model.h \
+ src$/rdf_node.h \
+ src$/rdf_parser.h \
+ src$/rdf_query.h \
+ src$/rdf_raptor.h \
+ src$/rdf_serializer.h \
+ src$/rdf_statement.h \
+ src$/rdf_storage.h \
+ src$/rdf_storage_module.h \
+ src$/rdf_stream.h \
+ src$/rdf_uri.h \
+ src$/rdf_utf8.h \
.IF "$(OS)"=="MACOSX"
-OUT2LIB+=librdf$/.libs$/librdf.$(REDLAND_MAJOR).dylib
+OUT2LIB+=src$/.libs$/librdf.$(REDLAND_MAJOR).dylib
.ELIF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
-OUT2LIB+=librdf$/.libs$/*.a
-OUT2BIN+=librdf$/.libs$/*.dll
+OUT2LIB+=src$/.libs$/*.a
+OUT2BIN+=src$/.libs$/*.dll
.ELSE
# if we use dmake, this is done automagically
.ENDIF
.ELIF "$(OS)"=="OS2"
# if we use dmake, this is done automagically
.ELSE
-OUT2LIB+=librdf$/.libs$/librdf.so.$(REDLAND_MAJOR)
+OUT2LIB+=src$/.libs$/librdf.so.$(REDLAND_MAJOR)
.ENDIF
# --- Targets ------------------------------------------------------
Copied: openoffice/trunk/main/redland/redland/redland-1.0.17.patch.autotools (from r1757788, openoffice/trunk/main/redland/redland/redland-1.0.8.patch.autotools)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/redland/redland/redland-1.0.17.patch.autotools?p2=openoffice/trunk/main/redland/redland/redland-1.0.17.patch.autotools&p1=openoffice/trunk/main/redland/redland/redland-1.0.8.patch.autotools&r1=1757788&r2=1757789&rev=1757789&view=diff
==============================================================================
--- openoffice/trunk/main/redland/redland/redland-1.0.8.patch.autotools (original)
+++ openoffice/trunk/main/redland/redland/redland-1.0.17.patch.autotools Fri Aug 26 07:13:14 2016
@@ -1,6 +1,7 @@
---- misc/redland-1.0.8/configure Fri Jul 4 18:00:39 2008
-+++ misc/build/redland-1.0.8/configure Fri Sep 4 12:55:52 2015
-@@ -4671,7 +4671,7 @@
+diff -ur misc/redland-1.0.17/configure misc/build/redland-1.0.17/configure
+--- misc/redland-1.0.17/configure 2013-12-28 08:26:53.000000000 -0800
++++ misc/build/redland-1.0.17/configure 2016-08-20 23:29:33.101405000 -0700
+@@ -6613,7 +6613,7 @@
cygwin*)
# func_win32_libid is a shell function defined in ltmain.sh
@@ -9,221 +10,12 @@
lt_cv_file_magic_cmd='func_win32_libid'
;;
-@@ -4680,7 +4680,7 @@
- # func_win32_libid shell function, so use a weaker test based on 'objdump',
+@@ -6623,7 +6623,7 @@
# unless we find 'file', for example because we are cross-compiling.
- if ( file / ) >/dev/null 2>&1; then
+ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-@@ -8279,7 +8279,7 @@
- hardcode_shlibpath_var=no
- ;;
-
-- freebsd1*)
-+ freebsd1.*)
- ld_shlibs=no
- ;;
-
-@@ -8295,7 +8295,7 @@
- ;;
-
- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-- freebsd2*)
-+ freebsd2.*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct=yes
- hardcode_minus_L=yes
-@@ -8928,7 +8928,7 @@
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
--freebsd1*)
-+freebsd1.*)
- dynamic_linker=no
- ;;
-
-@@ -8939,7 +8939,7 @@
- objformat=`/usr/bin/objformat`
- else
- case $host_os in
-- freebsd[123]*) objformat=aout ;;
-+ freebsd[123].*) objformat=aout ;;
- *) objformat=elf ;;
- esac
- fi
-@@ -8957,7 +8957,7 @@
- esac
- shlibpath_var=LD_LIBRARY_PATH
- case $host_os in
-- freebsd2*)
-+ freebsd2.*)
- shlibpath_overrides_runpath=yes
- ;;
- freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -11367,7 +11367,7 @@
- ;;
- esac
- ;;
-- freebsd[12]*)
-+ freebsd[12].*)
- # C++ shared libraries reported to be fairly broken before switch to ELF
- ld_shlibs_CXX=no
- ;;
-@@ -12906,7 +12906,7 @@
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
--freebsd1*)
-+freebsd1.*)
- dynamic_linker=no
- ;;
-
-@@ -12917,7 +12917,7 @@
- objformat=`/usr/bin/objformat`
- else
- case $host_os in
-- freebsd[123]*) objformat=aout ;;
-+ freebsd[123].*) objformat=aout ;;
- *) objformat=elf ;;
- esac
- fi
-@@ -12935,7 +12935,7 @@
- esac
- shlibpath_var=LD_LIBRARY_PATH
- case $host_os in
-- freebsd2*)
-+ freebsd2.*)
- shlibpath_overrides_runpath=yes
- ;;
- freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -14943,7 +14943,7 @@
- hardcode_shlibpath_var_F77=no
- ;;
-
-- freebsd1*)
-+ freebsd1.*)
- ld_shlibs_F77=no
- ;;
-
-@@ -14959,7 +14959,7 @@
- ;;
-
- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-- freebsd2*)
-+ freebsd2.*)
- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct_F77=yes
- hardcode_minus_L_F77=yes
-@@ -15540,7 +15540,7 @@
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
--freebsd1*)
-+freebsd1.*)
- dynamic_linker=no
- ;;
-
-@@ -15551,7 +15551,7 @@
- objformat=`/usr/bin/objformat`
- else
- case $host_os in
-- freebsd[123]*) objformat=aout ;;
-+ freebsd[123].*) objformat=aout ;;
- *) objformat=elf ;;
- esac
- fi
-@@ -15569,7 +15569,7 @@
- esac
- shlibpath_var=LD_LIBRARY_PATH
- case $host_os in
-- freebsd2*)
-+ freebsd2.*)
- shlibpath_overrides_runpath=yes
- ;;
- freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -17577,7 +17577,7 @@
- hardcode_shlibpath_var_GCJ=no
- ;;
-
-- freebsd1*)
-+ freebsd1.*)
- ld_shlibs_GCJ=no
- ;;
-
-@@ -17593,7 +17593,7 @@
- ;;
-
- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-- freebsd2*)
-+ freebsd2.*)
- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct_GCJ=yes
- hardcode_minus_L_GCJ=yes
-@@ -18174,7 +18174,7 @@
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
--freebsd1*)
-+freebsd1.*)
- dynamic_linker=no
- ;;
-
-@@ -18185,7 +18185,7 @@
- objformat=`/usr/bin/objformat`
- else
- case $host_os in
-- freebsd[123]*) objformat=aout ;;
-+ freebsd[123].*) objformat=aout ;;
- *) objformat=elf ;;
- esac
- fi
-@@ -18203,7 +18203,7 @@
- esac
- shlibpath_var=LD_LIBRARY_PATH
- case $host_os in
-- freebsd2*)
-+ freebsd2.*)
- shlibpath_overrides_runpath=yes
- ;;
- freebsd3.[01]* | freebsdelf3.[01]*)
---- misc/redland-1.0.8/ltmain.sh Tue Apr 29 23:33:55 2008
-+++ misc/build/redland-1.0.8/ltmain.sh Wed Feb 18 13:28:39 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"
- ;;
-
- irix | nonstopux)
+ # Keep this pattern in sync with the one in func_win32_libid.
Copied: openoffice/trunk/main/redland/redland/redland-1.0.17.patch.dmake (from r1757788, openoffice/trunk/main/redland/redland/redland-1.0.8.patch.dmake)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/redland/redland/redland-1.0.17.patch.dmake?p2=openoffice/trunk/main/redland/redland/redland-1.0.17.patch.dmake&p1=openoffice/trunk/main/redland/redland/redland-1.0.8.patch.dmake&r1=1757788&r2=1757789&rev=1757789&view=diff
==============================================================================
--- openoffice/trunk/main/redland/redland/redland-1.0.8.patch.dmake (original)
+++ openoffice/trunk/main/redland/redland/redland-1.0.17.patch.dmake Fri Aug 26 07:13:14 2016
@@ -1,6 +1,6 @@
---- misc/redland-1.0.8/librdf/makefile.mk Mon Jun 16 19:32:46 2008
-+++ misc/build/redland-1.0.8/librdf/makefile.mk Mon Jun 16 19:26:20 2008
-@@ -1,1 +1,115 @@
+--- misc/redland-1.0.17/src/makefile.mk 2016-08-23 14:55:21.874698000 -0700
++++ misc/build/redland-1.0.17/src/makefile.mk 2016-08-25 15:05:47.091064000 -0700
+@@ -1 +1,118 @@
-dummy
+#**************************************************************
+#
@@ -37,7 +37,7 @@
+
+.INCLUDE : settings.mk
+
-+CDEFS+=-DLIBRDF_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS
++CDEFS+=-DRAPTOR_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS -DHAVE_CONFIG_H -DLIBRDF_INTERNAL -I$(PRJ)$/$(INPATH)$/inc
+
+# --- Files --------------------------------------------------------
+
@@ -45,7 +45,6 @@
+ $(SLO)$/rdf_concepts.obj \
+ $(SLO)$/rdf_digest.obj \
+ $(SLO)$/rdf_digest_md5.obj \
-+ $(SLO)$/rdf_digest_openssl.obj \
+ $(SLO)$/rdf_digest_sha1.obj \
+ $(SLO)$/rdf_files.obj \
+ $(SLO)$/rdf_hash.obj \
@@ -59,28 +58,35 @@
+ $(SLO)$/rdf_model.obj \
+ $(SLO)$/rdf_model_storage.obj \
+ $(SLO)$/rdf_node.obj \
++ $(SLO)$/rdf_node_common.obj \
+ $(SLO)$/rdf_parser.obj \
+ $(SLO)$/rdf_parser_raptor.obj \
+ $(SLO)$/rdf_query.obj \
+ $(SLO)$/rdf_query_rasqal.obj \
+ $(SLO)$/rdf_query_results.obj \
-+ $(SLO)$/rdf_query_triples.obj \
++ $(SLO)$/rdf_raptor.obj \
+ $(SLO)$/rdf_serializer.obj \
+ $(SLO)$/rdf_serializer_raptor.obj \
+ $(SLO)$/rdf_statement.obj \
++ $(SLO)$/rdf_statement_common.obj \
+ $(SLO)$/rdf_storage.obj \
+ $(SLO)$/rdf_storage_file.obj \
-+ $(SLO)$/rdf_storage_list.obj \
+ $(SLO)$/rdf_storage_hashes.obj \
++ $(SLO)$/rdf_storage_list.obj \
++ $(SLO)$/rdf_storage_trees.obj \
+ $(SLO)$/rdf_stream.obj \
+ $(SLO)$/rdf_uri.obj \
+ $(SLO)$/rdf_utf8.obj \
+
-+
+# $(SLO)$/rdf_hash_bdb.obj \
++# $(SLO)$/rdf_query_virtuoso.obj \
+# $(SLO)$/rdf_storage_mysql.obj \
++# $(SLO)$/rdf_storage_postgresql.obj \
++# $(SLO)$/rdf_storage_sql.obj \
++# $(SLO)$/rdf_storage_sql_test.obj \
+# $(SLO)$/rdf_storage_sqlite.obj \
-+
++# $(SLO)$/rdf_storage_tstore.obj \
++# $(SLO)$/rdf_storage_virtuoso.obj \
+
+SHL1DEPN= makefile.mk
+SHL1OBJS= $(SLOFILES)
@@ -92,7 +98,7 @@
+
+#SHL1VERSIONMAP=../service/exports.map
+.IF "$(GUI)"=="OS2"
-+SHL1VERSIONMAP=$(PRJ)/redland/redland2.map
++SHL1VERSIONMAP=$(PRJ)/raptor/raptor2.map
+.ENDIF
+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+DEF1NAME=$(SHL1TARGET)
@@ -104,15 +110,12 @@
+ $(PRJ)$/$(INPATH)$/lib$/rasqal.lib
+.ELSE
+SHL1STDLIBS= \
-+ $(OPENSSLLIB) \
++ $(LIBXML2LIB) \
++ $(XSLTLIB) \
+ $(PRJ)$/$(INPATH)$/lib$/libraptor.lib \
+ $(PRJ)$/$(INPATH)$/lib$/librasqal.lib
+.ENDIF
+
-+
-+#$(LIBXML2LIB) \
-+# $(XSLTLIB) \
-+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : target.mk
Copied: openoffice/trunk/main/redland/redland/redland-1.0.17.patch.ooo_build (from r1757788, openoffice/trunk/main/redland/redland/redland-1.0.8.patch.ooo_build)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/redland/redland/redland-1.0.17.patch.ooo_build?p2=openoffice/trunk/main/redland/redland/redland-1.0.17.patch.ooo_build&p1=openoffice/trunk/main/redland/redland/redland-1.0.8.patch.ooo_build&r1=1757788&r2=1757789&rev=1757789&view=diff
==============================================================================
--- openoffice/trunk/main/redland/redland/redland-1.0.8.patch.ooo_build (original)
+++ openoffice/trunk/main/redland/redland/redland-1.0.17.patch.ooo_build Fri Aug 26 07:13:14 2016
@@ -1,22 +1,32 @@
---- misc/redland-1.0.8/Makefile.am 2010-02-12 08:47:40.000000000 +0000
-+++ misc/build/redland-1.0.8/Makefile.am 2010-02-12 08:47:51.000000000 +0000
-@@ -48,7 +48,7 @@
- # to ensure that the raptor and rasqal subdirectories are called
- # as CONFIG_SUBDIR directories.
- #
--SUBDIRS=@LOCAL_SUBDIRS@ librdf examples utils demos docs data
-+SUBDIRS=@LOCAL_SUBDIRS@ librdf examples demos docs data
-
- EXTRA_DIST=ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \
- ChangeLog.5 ChangeLog.6 ChangeLog.7 \
---- misc/redland-1.0.8/Makefile.in 2010-02-12 08:47:39.000000000 +0000
-+++ misc/build/redland-1.0.8/Makefile.in 2010-02-12 08:47:55.000000000 +0000
-@@ -283,7 +283,7 @@
- # to ensure that the raptor and rasqal subdirectories are called
- # as CONFIG_SUBDIR directories.
- #
--SUBDIRS = @LOCAL_SUBDIRS@ librdf examples utils demos docs data
-+SUBDIRS = @LOCAL_SUBDIRS@ librdf examples demos docs data
- EXTRA_DIST = ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \
- ChangeLog.5 ChangeLog.6 ChangeLog.7 \
- README NEWS LICENSE.txt TODO \
+diff -ur misc/redland-1.0.17/Makefile.am misc/build/redland-1.0.17/Makefile.am
+--- misc/redland-1.0.17/Makefile.am 2012-06-27 12:58:16.000000000 -0700
++++ misc/build/redland-1.0.17/Makefile.am 2016-08-20 23:32:23.298025000 -0700
+@@ -34,7 +34,7 @@
+ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
+
+ # Subdirectories to build/install/distribute etc.
+-SUBDIRS=$(subdirs) src examples utils demos docs data scripts
++SUBDIRS=$(subdirs) src examples demos docs data scripts
+
+ EXTRA_DIST=\
+ ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \
+diff -ur misc/redland-1.0.17/configure misc/build/redland-1.0.17/configure
+--- misc/redland-1.0.17/configure 2013-12-28 08:26:53.000000000 -0800
++++ misc/build/redland-1.0.17/configure 2016-08-22 10:18:20.693404000 -0700
+@@ -13852,6 +13852,7 @@
+ with_ltdl_lib=no
+ fi
+
++with_included_ltdl=no
+ case ,$with_included_ltdl,$with_ltdl_include,$with_ltdl_lib, in
+ ,yes,no,no,)
+ case $enable_ltdl_convenience in
+@@ -13934,7 +13935,7 @@
+
+
+
+- subdirs="$subdirs libltdl"
++# subdirs="$subdirs libltdl"
+
+
+