recipes: Update most dependencies and build-tools

* Remove/Update patches where applicable
* Tested on all linux/android variant, the build slaves will pick up
  the rest...

5 files changed, 59 insertions, 34 deletions

diff --git a/recipes/libxml2/0001-Enable-windows-cross-compilation.patch b/recipes/libxml2/0001-Enable-windows-cross-compilation.patch
index b352ad91..9bd33cac 100644
--- a/recipes/libxml2/0001-Enable-windows-cross-compilation.patch
+++ b/recipes/libxml2/0001-Enable-windows-cross-compilation.patch
@@ -1,18 +1,18 @@
-From 82255a43bbf84d5628a7147eaf9939585516c509 Mon Sep 17 00:00:00 2001
+From ff87370625a68b73d0e1351bc735ef510c26d051 Mon Sep 17 00:00:00 2001
 From: Andoni Morales Alastruey <ylatuya@gmail.com>
 Date: Fri, 9 Mar 2012 18:18:48 +0100
-Subject: [PATCH 1/3] Enable windows cross-compilation
+Subject: [PATCH 1/5] Enable windows cross-compilation
 
 ---
- configure.in       | 21 ++++++++++++++++++++-
+ configure.ac       | 21 ++++++++++++++++++++-
  python/Makefile.am |  1 +
  2 files changed, 21 insertions(+), 1 deletion(-)
 
-diff --git a/configure.in b/configure.in
-index d449b11..7f77b9b 100644
---- a/configure.in
-+++ b/configure.in
-@@ -742,6 +742,21 @@ dnl
+diff --git a/configure.ac b/configure.ac
+index 14ac0a8..c3985f2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -811,6 +811,21 @@ dnl
  dnl check for python
  dnl
  
@@ -34,7 +34,7 @@ index d449b11..7f77b9b 100644
  PYTHON_VERSION=
  PYTHON_INCLUDES=
  PYTHON_SITE_PACKAGES=
-@@ -832,6 +847,7 @@ then
+@@ -905,6 +920,7 @@ then
  else
      PYTHON_SUBDIR=
  fi
@@ -42,7 +42,7 @@ index d449b11..7f77b9b 100644
  AC_SUBST(pythondir)
  AC_SUBST(PYTHON_SUBDIR)
  AC_SUBST(PYTHON_LIBS)
-@@ -1492,6 +1508,7 @@ WIN32_EXTRA_LDFLAGS=
+@@ -1574,6 +1590,7 @@ WIN32_EXTRA_LDFLAGS=
  CYGWIN_EXTRA_LDFLAGS=
  CYGWIN_EXTRA_PYTHON_LIBADD=
  WIN32_EXTRA_PYTHON_LIBADD=
@@ -50,7 +50,7 @@ index d449b11..7f77b9b 100644
  case "$host" in
   *-*-mingw*)
   CPPFLAGS="$CPPFLAGS -DWIN32"
-@@ -1500,7 +1517,8 @@ case "$host" in
+@@ -1582,7 +1599,8 @@ case "$host" in
   AC_DEFINE([_WINSOCKAPI_],1,[Using the Win32 Socket implementation])
   if test "${PYTHON}" != ""
   then
@@ -60,7 +60,7 @@ index d449b11..7f77b9b 100644
   fi
   ;;
   *-*-cygwin*)
-@@ -1514,6 +1532,7 @@ esac
+@@ -1596,6 +1614,7 @@ esac
  AC_SUBST(WIN32_EXTRA_LIBADD)
  AC_SUBST(WIN32_EXTRA_LDFLAGS)
  AC_SUBST(WIN32_EXTRA_PYTHON_LIBADD)
@@ -81,5 +81,5 @@ index 34aed96..8744cc7 100644
          $(top_builddir)/libxml2.la $(CYGWIN_EXTRA_PYTHON_LIBADD) $(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS)
  
 -- 
-1.8.1.2
+2.1.0
 
diff --git a/recipes/libxml2/0002-makefiles-disable-tests.patch b/recipes/libxml2/0002-makefiles-disable-tests.patch
index 32442906..7738c59f 100644
--- a/recipes/libxml2/0002-makefiles-disable-tests.patch
+++ b/recipes/libxml2/0002-makefiles-disable-tests.patch
@@ -1,14 +1,14 @@
-From 4a0aeb3e7734b21e6eab54faffc72e0dea56dbb1 Mon Sep 17 00:00:00 2001
+From b67767a901ec31a0ddc1e2dff5c4f5d21241661f Mon Sep 17 00:00:00 2001
 From: Andoni Morales Alastruey <ylatuya@gmail.com>
 Date: Mon, 28 Oct 2013 18:05:43 +0100
-Subject: [PATCH 2/3] makefiles: disable tests
+Subject: [PATCH 2/5] makefiles: disable tests
 
 ---
  Makefile.am | 9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index a4a9f87..8a41588 100644
+index 70720f3..a2881a3 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -10,10 +10,11 @@ AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/include
@@ -28,5 +28,5 @@ index a4a9f87..8a41588 100644
  bin_PROGRAMS = xmllint xmlcatalog
  
 -- 
-1.8.1.2
+2.1.0
 
diff --git a/recipes/libxml2/0003-configure-fix-python-dir-prefix.patch b/recipes/libxml2/0003-configure-fix-python-dir-prefix.patch
index fc8eea3f..d12f0af7 100644
--- a/recipes/libxml2/0003-configure-fix-python-dir-prefix.patch
+++ b/recipes/libxml2/0003-configure-fix-python-dir-prefix.patch
@@ -1,17 +1,17 @@
-From 39f985f4d0a804e870e7c15433de44d0c1215123 Mon Sep 17 00:00:00 2001
+From 5a75153014bd1c0669415bda1ee899c0ae9c3aad Mon Sep 17 00:00:00 2001
 From: Andoni Morales Alastruey <ylatuya@gmail.com>
 Date: Mon, 28 Oct 2013 18:07:07 +0100
-Subject: [PATCH 3/3] configure: fix python dir prefix
+Subject: [PATCH 3/5] configure: fix python dir prefix
 
 ---
- configure.in | 1 +
+ configure.ac | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/configure.in b/configure.in
-index 7f77b9b..77e87b1 100644
---- a/configure.in
-+++ b/configure.in
-@@ -835,6 +835,7 @@ if test "$with_python" != "no" ; then
+diff --git a/configure.ac b/configure.ac
+index c3985f2..e5dbc15 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -908,6 +908,7 @@ if test "$with_python" != "no" ; then
  	    fi
  	fi
      fi
@@ -20,5 +20,5 @@ index 7f77b9b..77e87b1 100644
      PYTHON_LIBS=`python$PYTHON_VERSION-config --ldflags`
  else
 -- 
-1.8.1.2
+2.1.0
 
diff --git a/recipes/libxml2/0004-Fix-build-without-lzma.patch b/recipes/libxml2/0004-Fix-build-without-lzma.patch
index f6feae62..e2945b6f 100644
--- a/recipes/libxml2/0004-Fix-build-without-lzma.patch
+++ b/recipes/libxml2/0004-Fix-build-without-lzma.patch
@@ -1,7 +1,7 @@
-From 4053dca5e7c411120018b7f57e790ade267ba757 Mon Sep 17 00:00:00 2001
+From 732ef56b0b1315f2cfa7ae8fe1181309ce95e87d Mon Sep 17 00:00:00 2001
 From: Andoni Morales Alastruey <ylatuya@gmail.com>
 Date: Tue, 28 Jan 2014 11:44:22 +0100
-Subject: [PATCH] Fix build without lzma
+Subject: [PATCH 4/5] Fix build without lzma
 
 ---
  xmlIO.c | 6 +++---
@@ -9,7 +9,7 @@ Subject: [PATCH] Fix build without lzma
  2 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/xmlIO.c b/xmlIO.c
-index 847cb7e..8fb8702 100644
+index e628ab0..a1a927e 100644
 --- a/xmlIO.c
 +++ b/xmlIO.c
 @@ -35,7 +35,7 @@
@@ -21,7 +21,7 @@ index 847cb7e..8fb8702 100644
  #include <lzma.h>
  #endif
  
-@@ -1320,7 +1320,7 @@ xmlGzfileClose (void * context) {
+@@ -1334,7 +1334,7 @@ xmlGzfileClose (void * context) {
  }
  #endif /* HAVE_ZLIB_H */
  
@@ -30,7 +30,7 @@ index 847cb7e..8fb8702 100644
  /************************************************************************
   *									*
   *		I/O for compressed file accesses			*
-@@ -2314,7 +2314,7 @@ xmlRegisterDefaultInputCallbacks(void) {
+@@ -2328,7 +2328,7 @@ xmlRegisterDefaultInputCallbacks(void) {
      xmlRegisterInputCallbacks(xmlGzfileMatch, xmlGzfileOpen,
  	                      xmlGzfileRead, xmlGzfileClose);
  #endif /* HAVE_ZLIB_H */
@@ -40,7 +40,7 @@ index 847cb7e..8fb8702 100644
  	                      xmlXzfileRead, xmlXzfileClose);
  #endif /* HAVE_ZLIB_H */
 diff --git a/xzlib.c b/xzlib.c
-index 928bd17..5526e5f 100644
+index 0dcb9f4..1cf0c57 100644
 --- a/xzlib.c
 +++ b/xzlib.c
 @@ -8,7 +8,7 @@
@@ -52,12 +52,12 @@ index 928bd17..5526e5f 100644
  
  #include <string.h>
  #ifdef HAVE_ERRNO_H
-@@ -752,4 +752,4 @@ __libxml2_xzclose(xzFile file)
+@@ -795,4 +795,4 @@ __libxml2_xzclose(xzFile file)
      xmlFree(state);
      return ret ? ret : LZMA_OK;
  }
 -#endif /* HAVE_LZMA_H */
 +#endif /* HAVE_LIBLZMA */
 -- 
-1.8.3.2
+2.1.0
 
diff --git a/recipes/libxml2/0005-configure.ac-Don-t-overwrite-LDFLAGS.patch b/recipes/libxml2/0005-configure.ac-Don-t-overwrite-LDFLAGS.patch
new file mode 100644
index 00000000..11ffe79c
--- /dev/null
+++ b/recipes/libxml2/0005-configure.ac-Don-t-overwrite-LDFLAGS.patch
@@ -0,0 +1,25 @@
+From 2676c2425e918d0c25e2ebf1ddf7980dc0d43d3c Mon Sep 17 00:00:00 2001
+From: Edward Hervey <bilboed@bilboed.com>
+Date: Fri, 13 Feb 2015 13:05:05 +0100
+Subject: [PATCH 5/5] configure.ac: Don't overwrite LDFLAGS
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index e5dbc15..080134f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -392,7 +392,7 @@ if test "$with_zlib" = "no"; then
+ else
+     AC_CHECK_HEADERS(zlib.h,
+         [SAVE_LDFLAGS="${LDFLAGS}"
+-	 LDFLAGS="-L${Z_DIR}/lib"
++	 LDFLAGS="${LDFLAGS} -L${Z_DIR}/lib"
+ 	AC_CHECK_LIB(z, gzread,[
+ 	    AC_DEFINE([HAVE_LIBZ], [1], [Have compression library])
+ 	    WITH_ZLIB=1
+-- 
+2.1.0
+