From 29c62c45a94fd0200b6232a2b35b3577aa067e27 Mon Sep 17 00:00:00 2001
From: Aron Xu <aron@debian.org>
Date: Fri, 21 Sep 2012 02:35:20 +0800
Subject: Add patches back.

---
 ...odify-xml2-config-and-pkgconfig-behaviour.patch | 90 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 91 insertions(+)
 create mode 100644 debian/patches/0001-modify-xml2-config-and-pkgconfig-behaviour.patch
 create mode 100644 debian/patches/series

(limited to 'debian')

diff --git a/debian/patches/0001-modify-xml2-config-and-pkgconfig-behaviour.patch b/debian/patches/0001-modify-xml2-config-and-pkgconfig-behaviour.patch
new file mode 100644
index 0000000..a7ecf7c
--- /dev/null
+++ b/debian/patches/0001-modify-xml2-config-and-pkgconfig-behaviour.patch
@@ -0,0 +1,90 @@
+From: Aron Xu <aron@debian.org>
+Date: Fri, 21 Sep 2012 00:19:41 +0800
+Subject: modify xml2-config and pkgconfig behaviour
+
+---
+ configure.in                 |    2 +-
+ libxml-2.0-uninstalled.pc.in |    3 ++-
+ xml2-config.1                |    2 ++
+ xml2-config.in               |   22 ++++++++++------------
+ 4 files changed, 15 insertions(+), 14 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 3d5f48b..836695c 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1376,7 +1376,7 @@ case "$host" in
+ 	*) M_LIBS="-lm"
+ 	;;
+ esac
+-XML_LIBS="-lxml2 $Z_LIBS $THREAD_LIBS $ICONV_LIBS $M_LIBS $LIBS"
++XML_LIBS="-lxml2"
+ XML_LIBTOOLLIBS="libxml2.la"
+ AC_SUBST(WITH_ICONV)
+ 
+diff --git a/libxml-2.0-uninstalled.pc.in b/libxml-2.0-uninstalled.pc.in
+index cab6834..af16ebc 100644
+--- a/libxml-2.0-uninstalled.pc.in
++++ b/libxml-2.0-uninstalled.pc.in
+@@ -8,5 +8,6 @@ Name: libXML
+ Version: @VERSION@
+ Description: libXML library version2.
+ Requires:
+-Libs: -L${libdir} -lxml2 @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
++Libs: -L${libdir} -lxml2
++Libs.private: @BASE_THREAD_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
+ Cflags: -I${includedir} @XML_INCLUDEDIR@ @XML_CFLAGS@
+diff --git a/xml2-config.1 b/xml2-config.1
+index 8cf9858..bfda630 100644
+--- a/xml2-config.1
++++ b/xml2-config.1
+@@ -13,6 +13,8 @@ linker flags that should be used to compile and link programs that use
+ .TP 8
+ .B  \-\-version
+ Print the currently installed version of \fIGNOME-XML\fP on the standard output.
++Add the \fB\-\-static\fP option to print the linker flags that are necessary
++to \fBstatically\fP link a \fIGNOME-XML\fP program.
+ .TP 8
+ .B  \-\-libs
+ Print the linker flags that are necessary to link a \fIGNOME-XML\fP program.
+diff --git a/xml2-config.in b/xml2-config.in
+index 1957486..123729f 100644
+--- a/xml2-config.in
++++ b/xml2-config.in
+@@ -15,6 +15,8 @@ Known values for OPTION are:
+   --prefix=DIR		change libxml prefix [default $prefix]
+   --exec-prefix=DIR	change libxml exec prefix [default $exec_prefix]
+   --libs		print library linking information
++                        add --static to print static library linking
++                        information
+   --cflags		print pre-processor and compiler flags
+   --modules		module support enabled
+   --help		display this help and exit
+@@ -82,18 +84,14 @@ while test $# -gt 0; do
+        	;;
+ 
+     --libs)
+-        if [ "`uname`" = "Linux" ]
+-	then
+-	    if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ]
+-	    then
+-		echo @XML_LIBS@ @MODULE_PLATFORM_LIBS@
+-	    else
+-		echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@
+-	    fi
+-	else
+-	    echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ @WIN32_EXTRA_LIBADD@
+-	fi
+-       	;;
++        LIBS="@XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@"
++        if [ "$2" = "--static" ]
++        then
++                shift
++                LIBS="${LIBS} @Z_LIBS@ @BASE_THREAD_LIBS@@THREAD_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@"
++        fi
++        echo ${LIBS}
++        ;;
+ 
+     *)
+ 	usage
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d300eac
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-modify-xml2-config-and-pkgconfig-behaviour.patch
-- 
cgit v1.2.3