udpate to latest upstream version

2 files changed, 49 insertions, 57 deletions

diff --git a/package/libxml2/patches/patch-configure_in b/package/libxml2/patches/patch-configure_ac
index 6432ced20..2e7ab8f77 100644
--- a/package/libxml2/patches/patch-configure_in
+++ b/package/libxml2/patches/patch-configure_ac
@@ -1,44 +1,23 @@
---- libxml2-2.9.1.orig/configure.in	2013-04-19 09:25:20.000000000 +0200
-+++ libxml2-2.9.1/configure.in	2013-11-23 23:02:06.000000000 +0100
-@@ -748,80 +748,16 @@ PYTHON_SITE_PACKAGES=
- PYTHON_TESTS=
- pythondir=
- if test "$with_python" != "no" ; then
--    if test -x "$with_python/bin/python"
--    then
--        echo Found python in $with_python/bin/python
--        PYTHON="$with_python/bin/python"
--    else
--        if test -x "$with_python/python.exe"
--        then
--            echo Found python in $with_python/python.exe
--            PYTHON="$with_python/python.exe"
--        else
--            if test -x "$with_python"
--            then
--                echo Found python in $with_python
--                PYTHON="$with_python"
--            else
--                if test -x "$PYTHON"
--                then
--                    echo Found python in environment PYTHON=$PYTHON
--                    with_python=`$PYTHON -c "import sys; print(sys.exec_prefix)"`
--                else
+--- libxml2-2.9.2.orig/configure.ac	2014-10-15 23:06:15.000000000 -0500
++++ libxml2-2.9.2/configure.ac	2015-02-10 14:34:59.318899232 -0600
+@@ -837,62 +837,13 @@ if test "$with_python" != "no" ; then
+                     echo Found python in environment PYTHON=$PYTHON
+                     with_python=`$PYTHON -c "import sys; print(sys.exec_prefix)"`
+                 else
 -                    AC_PATH_PROG(PYTHON, python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5)
 -		fi
 -	    fi
 -	fi
 -    fi
-+    AC_PATH_PROG(PYTHON, python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5)
-     if test "$PYTHON" != ""
-     then
-         PYTHON_VERSION=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_version())"`
+-    if test "$PYTHON" != ""
+-    then
+-        PYTHON_VERSION=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_version())"`
 -	PYTHON_INCLUDES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_inc())"`
 -# does not work as it produce a /usr/lib/python path instead of/usr/lib64/python
 -#
 -#	PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib())"`
- 	echo Found Python version $PYTHON_VERSION
-     fi
+-	echo Found Python version $PYTHON_VERSION
+-    fi
 -    if test "$PYTHON_VERSION" != "" -a "$PYTHON_INCLUDES" = ""
 -    then
 -	if test -r $with_python/include/python$PYTHON_VERSION/Python.h
@@ -59,9 +38,14 @@
 -	            else
 -		        echo could not find python$PYTHON_VERSION/Python.h or $with_python/include/Python.h
 -		    fi
--		fi
--	    fi
--	fi
++                    AC_PATH_PROG(PYTHON, python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5)
+ 		fi
+ 	    fi
+ 	fi
+     fi
+-    if test "$with_python_install_dir" != ""
+-    then
+-	PYTHON_SITE_PACKAGES="$with_python_install_dir"
 -    fi
 -    if test "$PYTHON_VERSION" != "" -a "$PYTHON_SITE_PACKAGES" = ""
 -    then
@@ -77,11 +61,36 @@
 -	    fi
 -	fi
 -    fi
--    pythondir='$(PYTHON_SITE_PACKAGES)'
 +    PYTHON_INCLUDES=`python$PYTHON_VERSION-config --includes`
-     PYTHON_LIBS=`python$PYTHON_VERSION-config --ldflags`
 +    PYTHON_SITE_PACKAGES=${prefix}/lib/python$PYTHON_VERSION/site-packages
-+    pythondir='$(PYTHON_SITE_PACKAGES)'
+     pythondir='$(PYTHON_SITE_PACKAGES)'
+     PYTHON_LIBS=`python$PYTHON_VERSION-config --ldflags`
  else
-     PYTHON=
- fi
+@@ -1065,26 +1016,7 @@ else
+ 	   THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_BEOS_THREADS"
+        ;;
+        *linux*)
+-           if test "${GCC}" = "yes" ; then
+-	       GCC_VERSION=`${CC} --version | head -1 | awk '{print $3}'`
+-	       GCC_MAJOR=`echo ${GCC_VERSION} | sed 's+\..*++'`
+-	       GCC_MEDIUM=`echo ${GCC_VERSION} | sed 's+[[0-9]]*\.++' | sed 's+\..*++'`
+-	       if test "${THREAD_LIBS}" = "-lpthread" ; then
+-	           if expr ${GCC_MEDIUM} \> 2 \& ${GCC_MAJOR} = 3 > /dev/null
+-		   then
+-		       THREAD_LIBS=""
+-		       BASE_THREAD_LIBS="-lpthread"
+-		   else
+-		   if expr ${GCC_MAJOR} \> 3 > /dev/null
+-		   then
+-		       THREAD_LIBS=""
+-		       BASE_THREAD_LIBS="-lpthread"
+-		   else
+-		       echo old GCC disabling weak symbols for pthread
+-		   fi
+-		   fi
+-	       fi
+-	   fi
++	   THREAD_LIBS="-lpthread"
+        ;;
+     esac
+     if test "$WITH_THREADS" = "1" ; then
diff --git a/package/libxml2/patches/patch-python_Makefile_am b/package/libxml2/patches/patch-python_Makefile_am
deleted file mode 100644
index 82061eee3..000000000
--- a/package/libxml2/patches/patch-python_Makefile_am
+++ /dev/null
@@ -1,17 +0,0 @@
---- libxml2-2.9.1.orig/python/Makefile.am	2013-04-19 08:56:45.000000000 +0200
-+++ libxml2-2.9.1/python/Makefile.am	2013-11-24 09:18:44.000000000 +0100
-@@ -19,12 +19,12 @@ if WITH_PYTHON
- AM_CPPFLAGS = \
- 	-I$(top_builddir)/include \
- 	-I$(top_srcdir)/include	\
--	-I$(PYTHON_INCLUDES)
-+	$(PYTHON_INCLUDES)
- 
- python_LTLIBRARIES = libxml2mod.la
- 
- libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h libxml2-py.c types.c
--libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version \
-+libxml2mod_la_LDFLAGS = $(LDFLAGS) $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version \
-         $(top_builddir)/libxml2.la $(CYGWIN_EXTRA_PYTHON_LIBADD) $(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS)
- 
- BUILT_SOURCES = libxml2-export.c libxml2-py.h libxml2-py.c