[gentoo-commits] gentoo-x86 commit in dev-libs/libxml2/files: libxml2-2.9.2-revert-missing-initialization.patch libxml2-2.9.2-icu-pkgconfig.patch

[Pacho Ramos (pacho)]

pacho       14/10/18 08:23:48

  Added:                libxml2-2.9.2-revert-missing-initialization.patch
                        libxml2-2.9.2-icu-pkgconfig.patch
  Log:
  Version bump
  
  (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 
A188FBD4)

Revision  Changes    Path
1.1                  
dev-libs/libxml2/files/libxml2-2.9.2-revert-missing-initialization.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/files/libxml2-2.9.2-revert-missing-initialization.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/files/libxml2-2.9.2-revert-missing-initialization.patch?rev=1.1&content-type=text/plain

Index: libxml2-2.9.2-revert-missing-initialization.patch
===================================================================
>From f65128f38289d77ff322d63aef2858cc0a819c34 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veill...@redhat.com>
Date: Fri, 17 Oct 2014 17:13:41 +0800
Subject: Revert "Missing initialization for the catalog module"

This reverts commit 054c716ea1bf001544127a4ab4f4346d1b9947e7.
As this break xmlcatalog command
https://bugzilla.redhat.com/show_bug.cgi?id=1153753

diff --git a/parser.c b/parser.c
index 1d93967..67c9dfd 100644
--- a/parser.c
+++ b/parser.c
@@ -14830,9 +14830,6 @@ xmlInitParser(void) {
 #ifdef LIBXML_XPATH_ENABLED
        xmlXPathInit();
 #endif
-#ifdef LIBXML_CATALOG_ENABLED
-        xmlInitializeCatalog();
-#endif
        xmlParserInitialized = 1;
 #ifdef LIBXML_THREAD_ENABLED
     }
-- 
cgit v0.10.1




1.1                  dev-libs/libxml2/files/libxml2-2.9.2-icu-pkgconfig.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/files/libxml2-2.9.2-icu-pkgconfig.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/files/libxml2-2.9.2-icu-pkgconfig.patch?rev=1.1&content-type=text/plain

Index: libxml2-2.9.2-icu-pkgconfig.patch
===================================================================
diff --git a/configure.in b/configure.in
index 7374564..13c8d4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1444,19 +1444,11 @@ XML_LIBTOOLLIBS="libxml2.la"
 AC_SUBST(WITH_ICONV)
 
 WITH_ICU=0
-ICU_LIBS=""
 if test "$with_icu" != "yes" ; then
     echo Disabling ICU support
 else
-    ICU_CONFIG=icu-config
-    if ${ICU_CONFIG} --cflags >/dev/null 2>&1
-    then
-        ICU_LIBS=`${ICU_CONFIG} --ldflags`
-        WITH_ICU=1
-        echo Enabling ICU support
-    else
-        AC_MSG_ERROR([libicu config program icu-config not found])
-    fi
+    PKG_CHECK_MODULES(ICU, icu-i18n)
+    WITH_ICU=1
 fi
 AC_SUBST(WITH_ICU)
 AC_SUBST(ICU_LIBS)