[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - external/redland

[Stephan Bergmann]

 external/redland/raptor/xml2-config.patch |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit f98c7d908b5528f5ffa7fb91d1aee7bb9b029407
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Feb 2 14:11:58 2017 +0100

    Adapt the external/redland/raptor/xml2-config.patch to raptor2-2.0.15
    
    The Yocto-based GNOME 3.20 SDK used to build the LO Flatpak has a broken
    xml2-config.  I cannot understand why the previous workaround worked fine with
    raptor2-2.0.9 in LO 5.2 and fails with raptor2-2.0.15 since LO 5.3, but this
    updated workaround keeps raptor's configure happy.
    
    Change-Id: Ibfb2cb8a718f744e1bb4045082520fb186d6062b
    (cherry picked from commit 1462b2784fa3e95499808b2ef706e4787a01aaae)
    Reviewed-on: https://gerrit.libreoffice.org/33831
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/external/redland/raptor/xml2-config.patch b/external/redland/raptor/xml2-config.patch
index 61520a8..2550ace 100644
--- a/external/redland/raptor/xml2-config.patch
+++ b/external/redland/raptor/xml2-config.patch
@@ -12,3 +12,11 @@
    fi
  fi
  
+@@ -14481,6 +14481,7 @@
+ 
+     LIBXML_VERSION=`$PKG_CONFIG libxml-2.0 --modversion`
+     libxml_source="pkg-config"
++    XML_CONFIG="$PKG_CONFIG libxml-2.0"
+ 
+ fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml via pkg-config" >&5