[Libreoffice-commits] .: 2 commits - redland/raptor redland/rasqal redland/redland
Thorsten Behrens
thorsten at kemper.freedesktop.org
Tue Sep 27 08:44:51 PDT 2011
redland/raptor/makefile.mk | 1
redland/raptor/raptor-1.4.18.patch.rindex | 62 ++++++++++++++++++++++++++
redland/rasqal/makefile.mk | 2
redland/rasqal/rasqal-0.9.16.patch.autotools | 27 +++++++----
redland/redland/makefile.mk | 2
redland/redland/redland-1.0.8.patch.autotools | 11 ----
6 files changed, 83 insertions(+), 22 deletions(-)
New commits:
commit 201344f80572d839f9c5ff7ff6359f6555f93932
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Tue Sep 27 17:42:51 2011 +0200
Replace raptor rindex calls with strrchr
Seems android libc is missing that - replaced by non-deprecated
posix func.
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 3b6f696..d437a4d 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -57,6 +57,7 @@ OOO_PATCH_FILES= \
$(TARFILE_NAME).patch.ooo_build \
$(TARFILE_NAME).patch.dmake \
$(TARFILE_NAME).patch.win32 \
+ $(TARFILE_NAME).patch.rindex \
raptor-aix.patch
.IF "$(CROSS_COMPILING)"=="YES"
diff --git a/redland/raptor/raptor-1.4.18.patch.rindex b/redland/raptor/raptor-1.4.18.patch.rindex
new file mode 100644
index 0000000..d0c0652
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.patch.rindex
@@ -0,0 +1,62 @@
+--- misc/raptor-1.4.18/librdfa/curie.c 2008-06-14 07:33:37.000000000 +0200
++++ misc/build/raptor-1.4.18/librdfa/curie.c 2011-09-27 14:48:34.000000000 +0200
+@@ -122,7 +122,7 @@
+ {
+ // if we have a relative URI, chop off the name of the file
+ // and replace it with the relative pathname
+- char* end_index = rindex(context->base, '/');
++ char* end_index = strrchr(context->base, '/');
+
+ if(end_index != NULL)
+ {
+@@ -130,7 +130,7 @@
+ char* end_index2;
+
+ tmpstr = rdfa_replace_string(tmpstr, context->base);
+- end_index2= rindex(tmpstr, '/');
++ end_index2= strrchr(tmpstr, '/');
+ end_index2++;
+ *end_index2 = '\0';
+
+--- misc/raptor-1.4.18/librdfa/rdfa.c 2008-06-16 04:02:58.000000000 +0200
++++ misc/build/raptor-1.4.18/librdfa/rdfa.c 2011-09-27 15:03:12.000000000 +0200
+@@ -163,7 +163,7 @@
+ {
+ char* href_start = strstr(base_start, "href=");
+ char* uri_start = href_start + 6;
+- char* uri_end = index(uri_start, '"');
++ char* uri_end = strchr(uri_start, '"');
+
+ if((uri_start != NULL) && (uri_end != NULL))
+ {
+@@ -898,8 +898,8 @@
+ if(context->xml_literal != NULL)
+ {
+ // get the data between the first tag and the last tag
+- content_start = index(context->xml_literal, '>');
+- content_end = rindex(context->xml_literal, '<');
++ content_start = strchr(context->xml_literal, '>');
++ content_end = strrchr(context->xml_literal, '<');
+
+ if((content_start != NULL) && (content_end != NULL))
+ {
+--- misc/raptor-1.4.18/librdfa/triple.c 2008-06-14 07:33:37.000000000 +0200
++++ misc/build/raptor-1.4.18/librdfa/triple.c 2011-09-27 15:02:59.000000000 +0200
+@@ -437,7 +437,7 @@
+ current_object_literal = context->content;
+ type = RDF_TYPE_PLAIN_LITERAL;
+ }
+- else if(index(context->xml_literal, '<') == NULL)
++ else if(strchr(context->xml_literal, '<') == NULL)
+ {
+ current_object_literal = context->plain_literal;
+ type = RDF_TYPE_PLAIN_LITERAL;
+@@ -467,7 +467,7 @@
+ // [current element], i.e., not including the element itself, and
+ // giving it a datatype of rdf:XMLLiteral.
+ if((current_object_literal == NULL) &&
+- (index(context->xml_literal, '<') != NULL) &&
++ (strchr(context->xml_literal, '<') != NULL) &&
+ ((context->datatype == NULL) ||
+ (strcmp(context->datatype,
+ "http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral") == 0)))
commit e4486fe169054dde895e69a452aad94d3f3ca74a
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Tue Sep 27 17:40:43 2011 +0200
More Android config.sub fixing.
More parse fixing for android os string.
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index ce3a6cf..dbad2d2 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -144,7 +144,7 @@ OUT2INC+=src$/rasqal.h
.IF "$(OS)"=="MACOSX"
OUT2LIB+=src$/.libs$/librasqal.$(RASQAL_MAJOR).dylib src$/.libs$/librasqal.dylib
OUT2BIN+=src/rasqal-config
-.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
+.ELIF "$(OS)"=="IOS"
OUT2LIB+=src$/.libs$/librasqal.a
OUT2BIN+=src/rasqal-config
.ELIF "$(OS)"=="WNT"
diff --git a/redland/rasqal/rasqal-0.9.16.patch.autotools b/redland/rasqal/rasqal-0.9.16.patch.autotools
index 19b8792..a8e07a3 100644
--- a/redland/rasqal/rasqal-0.9.16.patch.autotools
+++ b/redland/rasqal/rasqal-0.9.16.patch.autotools
@@ -1,14 +1,23 @@
---- misc/rasqal-0.9.16/config.sub
-+++ misc/build/rasqal-0.9.16/config.sub
-@@ -1272,7 +1272,7 @@
- | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-+ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+--- misc/rasqal-0.9.16/config.sub 2008-06-28 19:57:26.000000000 +0200
++++ misc/build/rasqal-0.9.16/config.sub 2011-09-27 15:08:16.000000000 +0200
+@@ -120,7 +120,7 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
+ os=-$maybe_os
+@@ -1262,7 +1262,7 @@
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++ | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
--- 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 @@
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index 4bed69e..b38c45a 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -147,7 +147,7 @@ OUT2INC+=librdf$/*.h
.IF "$(OS)"=="MACOSX"
OUT2LIB+=librdf$/.libs$/librdf.$(REDLAND_MAJOR).dylib
-.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
+.ELIF "$(OS)"=="IOS"
OUT2LIB+=librdf$/.libs$/librdf.a
.ELIF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
diff --git a/redland/redland/redland-1.0.8.patch.autotools b/redland/redland/redland-1.0.8.patch.autotools
index 2bd2085..5b29d0b 100644
--- a/redland/redland/redland-1.0.8.patch.autotools
+++ b/redland/redland/redland-1.0.8.patch.autotools
@@ -1,14 +1,3 @@
---- misc/redland-1.0.8/config.sub
-+++ misc/build/redland-1.0.8/config.sub
-@@ -1272,7 +1272,7 @@
- | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-+ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* | -cegcc* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
--- misc/redland-1.0.8/configure Fri Jul 4 18:00:39 2008
+++ misc/build/redland-1.0.8/configure Wed Feb 18 13:27:43 2009
@@ -4671,7 +4671,7 @@
More information about the Libreoffice-commits
mailing list