libxml2: bump version

dev-libs/libxml2/libxml2-2.9.13.recipe

@@ -11,11 +11,11 @@ HOMEPAGE="http://www.xmlsoft.org/"
 COPYRIGHT="1998-2013 Daniel Veillard.  All Rights Reserved."
 LICENSE="MIT"
 REVISION="1"
-SOURCE_URI="ftp://xmlsoft.org/libxml2/libxml2-$portVersion.tar.gz"
-CHECKSUM_SHA256="c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92"
+SOURCE_URI="https://download.gnome.org/sources/libxml2/2.9/libxml2-$portVersion.tar.xz"
+CHECKSUM_SHA256="276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e"
 PATCHES="libxml2-$portVersion.patchset"
 
-ARCHITECTURES="all ?x86"
+ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
 
 

dev-libs/libxml2/patches/libxml2-2.9.13.patchset

@@ -1,29 +1,14 @@
-From e2922942ced05ec782bd63e9b40da6866d0d16c8 Mon Sep 17 00:00:00 2001
+From 15b025f87e3186c1f7ba064c162cdf2bcacf535e Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Wed, 1 Jan 2014 22:13:22 +0100
 Subject: Port patches from libxml2-2.8.0.
 
 
-diff --git a/Makefile.am b/Makefile.am
-index a9284b9..faaed02 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1273,8 +1273,8 @@ cmake_DATA = libxml2-config.cmake
- #
- # Install the tests program sources as examples 
- #
--BASE_DIR=$(datadir)/doc
--DOC_MODULE=libxml2-$(VERSION)
-+BASE_DIR=$(docdir)
-+DOC_MODULE=
- EXAMPLES_DIR=$(BASE_DIR)/$(DOC_MODULE)/examples
- 
- install-data-local: 
 diff --git a/configure.ac b/configure.ac
-index 5b161a5..26fbc57 100644
+index 46faa23..e281702 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -864,24 +864,19 @@ if test "$with_python" != "no" ; then
+@@ -840,24 +840,19 @@ if test "$with_python" != "no" ; then
      fi
      if test "$PYTHON_VERSION" != "" -a "$PYTHON_INCLUDES" = ""
      then
@@ -56,7 +41,7 @@ index 5b161a5..26fbc57 100644
  		fi
  	    fi
  	fi
-@@ -892,13 +887,13 @@ if test "$with_python" != "no" ; then
+@@ -868,13 +863,13 @@ if test "$with_python" != "no" ; then
      fi
      if test "$PYTHON_VERSION" != "" -a "$PYTHON_SITE_PACKAGES" = ""
      then
@@ -72,7 +57,7 @@ index 5b161a5..26fbc57 100644
 -		PYTHON_SITE_PACKAGES=$with_python/lib/site-packages
 +		PYTHON_SITE_PACKAGES=$with_python/lib/vendor-packages
  	    else
- 		PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib())"`
+ 		PYTHON_SITE_PACKAGES=$($PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(True,False,"${exec_prefix}"))')
  	    fi
 diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am
 index 227e24d..06d137c 100644
@@ -109,17 +94,17 @@ index 5863ffa..fd460ff 100644
  
      --exec-prefix)
 -- 
-2.30.0
+2.30.2
 
 
-From fa1f57f11b6a6365f0dcb5a71bb154a574e656db Mon Sep 17 00:00:00 2001
+From 1d07f58593833b3a3df4c1374c37c1cb59802b87 Mon Sep 17 00:00:00 2001
 From: Jessica Hamilton <jessica.l.hamilton@gmail.com>
 Date: Sat, 30 May 2015 11:38:15 +1200
 Subject: Haiku: search for catalogs in directories
 
 
 diff --git a/catalog.c b/catalog.c
-index effbb2e..4779c95 100644
+index e071b49..6ef5668 100644
 --- a/catalog.c
 +++ b/catalog.c
 @@ -32,6 +32,9 @@
@@ -145,7 +130,7 @@ index effbb2e..4779c95 100644
  #endif
  
  #if defined(_WIN32) && defined(_MSC_VER)
-@@ -3077,6 +3080,21 @@ xmlCatalogIsEmpty(xmlCatalogPtr catal) {
+@@ -3079,6 +3082,21 @@ xmlCatalogIsEmpty(xmlCatalogPtr catal) {
   *									*
   ************************************************************************/
  
@@ -167,7 +152,7 @@ index effbb2e..4779c95 100644
  /**
   * xmlInitializeCatalogData:
   *
-@@ -3169,10 +3187,16 @@ xmlInitializeCatalog(void) {
+@@ -3171,10 +3189,16 @@ xmlInitializeCatalog(void) {
  			cur++;
  		    path = (char *) xmlStrndup((const xmlChar *)paths, cur - paths);
  		    if (path != NULL) {
@@ -185,20 +170,20 @@ index effbb2e..4779c95 100644
  		    }
  		}
 -- 
-2.30.0
+2.30.2
 
 
-From 4283c85702d0ed1e3192467c52d0426b8e6dd329 Mon Sep 17 00:00:00 2001
+From d5b81a0c013d0c6dfe20cbda44b0d2ff890d5f01 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Wed, 3 Apr 2019 18:27:19 +0200
 Subject: Remove options unknown to gcc2
 
 
 diff --git a/configure.ac b/configure.ac
-index 26fbc57..ddb62ea 100644
+index e281702..4162493 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -785,7 +785,7 @@ else
+@@ -761,7 +761,7 @@ else
      fi
  
      # warnings we'd like to see
@@ -208,5 +193,5 @@ index 26fbc57..ddb62ea 100644
      EXTRA_CFLAGS="${EXTRA_CFLAGS} -Wno-long-long -Wno-format-extra-args"
      case "${host}" in
 -- 
-2.30.0
+2.30.2