[jhbuild] core-deps-3.4: fix symbol versioning in libxml2

[Javier JardÃn <jjardon src gnome org>]

commit 8e4e30c32d5cb311e9a5bdd0b3773499c12c2a2b
Author: Ryan Lortie <desrt desrt ca>
Date:   Wed Feb 15 10:33:17 2012 -0500

    core-deps-3.4: fix symbol versioning in libxml2
    
    The upstream release of libxml2 has a long-standing known bug with not
    versioning its symbols correctly.  All the distos carry a patch for it
    and this causes problems when system-installed libraries try to link
    against our copy (which lacks the version information).
    
    Start shipping the patch that everyone else is using.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=669437

 modulesets/gnome-suites-core-deps-3.4.modules |    4 +++-
 patches/libxml2-2.7.8-versioning.patch        |   24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.4.modules b/modulesets/gnome-suites-core-deps-3.4.modules
index 82caa93..9979cd5 100644
--- a/modulesets/gnome-suites-core-deps-3.4.modules
+++ b/modulesets/gnome-suites-core-deps-3.4.modules
@@ -991,7 +991,9 @@
     <branch module="libxml2/libxml2-2.7.8.tar.gz"
             repo="xmlsoft.org" version="2.7.8"
             hash="sha256:cda23bc9ebd26474ca8f3d67e7d1c4a1f1e7106364b690d822e009fdc3c417ec"
-            md5sum="8127a65e8c3b08856093099b52599c86" size="4881808"/>
+            md5sum="8127a65e8c3b08856093099b52599c86" size="4881808">
+      <patch file="libxml2-2.7.8-versioning.patch" strip="1"/>
+    </branch>
   </autotools>
 
   <autotools id="libxslt" check-target="false">
diff --git a/patches/libxml2-2.7.8-versioning.patch b/patches/libxml2-2.7.8-versioning.patch
new file mode 100644
index 0000000..a65e416
--- /dev/null
+++ b/patches/libxml2-2.7.8-versioning.patch
@@ -0,0 +1,24 @@
+diff -ru libxml2-2.7.8/configure libxml2-2.7.8+versioning/configure
+--- libxml2-2.7.8/configure	2010-11-04 13:28:14.000000000 -0400
++++ libxml2-2.7.8+versioning/configure	2012-02-15 09:21:41.959278546 -0500
+@@ -11414,7 +11427,7 @@
+   esac
+ fi
+ 
+- if test -z "$VERSION_SCRIPT_FLAGS"; then
++ if test -n "$VERSION_SCRIPT_FLAGS"; then
+   USE_VERSION_SCRIPT_TRUE=
+   USE_VERSION_SCRIPT_FALSE='#'
+ else
+diff -ru libxml2-2.7.8/configure.in libxml2-2.7.8+versioning/configure.in
+--- libxml2-2.7.8/configure.in	2010-11-04 13:01:19.000000000 -0400
++++ libxml2-2.7.8+versioning/configure.in	2012-02-15 09:21:31.711278392 -0500
+@@ -84,7 +84,7 @@
+   esac
+ fi
+ AC_SUBST(VERSION_SCRIPT_FLAGS)
+-AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -z "$VERSION_SCRIPT_FLAGS"])
++AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"])
+ 
+ dnl
+ dnl We process the AC_ARG_WITH first so that later we can modify