[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - redland/raptor

[Michael Stahl]

 redland/raptor/makefile.mk                  |    1 +
 redland/raptor/raptor-1.4.18-fdo64672.patch |   12 ++++++++++++
 2 files changed, 13 insertions(+)

New commits:
commit 9727a88b614350c832c151fbc670097850cdcc97
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jun 26 22:37:41 2013 +0200

    fdo#64672 prevent raptor from setting global libxml2 error handlers
    
    Fix the bundled ancient raptor which has no interface to disable this.
    
    Change-Id: Id2037fd94307b60a35d18a78a467a64b7686d318
    Reviewed-on: https://gerrit.libreoffice.org/4553
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 8244d0d..3e4da38 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -60,6 +60,7 @@ OOO_PATCH_FILES= \
     $(TARFILE_NAME).patch.fixes \
     $(TARFILE_NAME).patch.rindex \
     raptor-aix.patch \
+    $(TARFILE_NAME)-fdo64672.patch \
     $(TARFILE_NAME).entities.patch
 
 .IF "$(GUI)" == "UNX"
diff --git a/redland/raptor/raptor-1.4.18-fdo64672.patch b/redland/raptor/raptor-1.4.18-fdo64672.patch
new file mode 100644
index 0000000..1a4f8f1
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18-fdo64672.patch
@@ -0,0 +1,12 @@
+--- misc/raptor-1.4.18/src/raptor_sax2.c.old	2013-06-26 22:03:48.493875315 +0200
++++ misc/build/raptor-1.4.18/src/raptor_sax2.c	2013-06-26 22:03:09.494878340 +0200
+@@ -102,7 +102,8 @@
+   
+   sax2->error_handlers=error_handlers;
+ 
+-#ifdef RAPTOR_XML_LIBXML
++  // fdo#64672 disable setting globals
++#if 0
+   /* sets xmlGenericErrorContext and xmlStructuredError */
+   xmlSetStructuredErrorFunc(&sax2->error_handlers, 
+                             raptor_libxml_xmlStructuredErrorFunc);