libxml2: bump version

dev-libs/libxml2/libxml2-2.12.5.recipe

@@ -10,9 +10,11 @@ available in other environments."
 HOMEPAGE="http://www.xmlsoft.org/"
 COPYRIGHT="1998-2013 Daniel Veillard.  All Rights Reserved."
 LICENSE="MIT"
-REVISION="4"
-SOURCE_URI="https://download.gnome.org/sources/libxml2/2.10/libxml2-$portVersion.tar.xz"
-CHECKSUM_SHA256="ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45"
+REVISION="1"
+SOURCE_URI="https://download.gnome.org/sources/libxml2/2.12/libxml2-$portVersion.tar.xz"
+CHECKSUM_SHA256="a972796696afd38073e0f59c283c3a2f5a560b5268b4babc391b286166526b21"
+SOURCE_URI_2="https://www.w3.org/XML/Test/xmlts20130923.tar.gz"
+CHECKSUM_SHA256_2="9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f"
 PATCHES="libxml2-$portVersion.patchset"
 
 ARCHITECTURES="all"
@@ -97,10 +99,8 @@ BUILD_PREREQUIRES="
 PATCH()
 {
 	# replace hard-coded references to the development documentation dir
-	sed -i "s,^DEVHELP_DIR=\(.*\),DEVHELP_DIR=${developDocDir}," \
+	sed -i "s,^devhelpdir = \(.*\),devhelpdir = ${developDocDir}," \
 		doc/devhelp/Makefile.am
-	sed -i "s,%{_datadir}/gtk-doc/html/libxml2,${developDocDir},g" \
-		libxml.spec.in
 }
 
 BUILD()
@@ -119,6 +119,7 @@ BUILD()
 
 	runConfigure ./configure LDFLAGS="-lnetwork"  \
 		--disable-static \
+		--with-legacy \
 		$withPython
 	make $jobArgs
 }
@@ -172,5 +173,8 @@ INSTALL()
 
 TEST()
 {
-	make tests
+	# link the conformance suite
+	ln -sf ../../sources-2/xmlconf
+
+	make check
 }

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

@@ -1,11 +1,11 @@
-From 88c7b532d4f767284014f9c9cdd199a7470eae4a Mon Sep 17 00:00:00 2001
+From 3097cc843ae1f55c6b3e41842720f7ba80b65c1a 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/xml2-config.in b/xml2-config.in
-index bda3221..df420f5 100644
+index 1f82f80..8e8bc1e 100644
 --- a/xml2-config.in
 +++ b/xml2-config.in
 @@ -40,8 +40,8 @@ while test $# -gt 0; do
@@ -29,17 +29,17 @@ index bda3221..df420f5 100644
  
      --exec-prefix)
 -- 
-2.37.3
+2.42.1
 
 
-From 1943f113e77ec2fd7f180c0f09fc20b62ebaeada Mon Sep 17 00:00:00 2001
+From cae7f18391597687f704bfd4a15d438c856608e0 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 b7837e3..1334097 100644
+index 945ea2c..759c719 100644
 --- a/catalog.c
 +++ b/catalog.c
 @@ -18,6 +18,9 @@
@@ -49,10 +49,10 @@ index b7837e3..1334097 100644
 +#ifdef __HAIKU__
 +#include <ftw.h>
 +#endif
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
+ #ifdef HAVE_SYS_STAT_H
+ #include <sys/stat.h>
  #endif
-@@ -68,10 +71,10 @@
+@@ -67,10 +70,10 @@
  #define XML_URN_PUBID "urn:publicid:"
  #define XML_CATAL_BREAK ((xmlChar *) -1)
  #ifndef XML_XML_DEFAULT_CATALOG
@@ -65,7 +65,7 @@ index b7837e3..1334097 100644
  #endif
  
  #if defined(_WIN32) && defined(_MSC_VER)
-@@ -3071,6 +3074,21 @@ xmlCatalogIsEmpty(xmlCatalogPtr catal) {
+@@ -3066,6 +3069,21 @@ xmlCatalogIsEmpty(xmlCatalogPtr catal) {
   *									*
   ************************************************************************/
  
@@ -87,7 +87,7 @@ index b7837e3..1334097 100644
  /**
   * xmlInitializeCatalogData:
   *
-@@ -3163,10 +3181,16 @@ xmlInitializeCatalog(void) {
+@@ -3158,10 +3176,16 @@ xmlInitializeCatalog(void) {
  			cur++;
  		    path = (char *) xmlStrndup((const xmlChar *)paths, cur - paths);
  		    if (path != NULL) {
@@ -105,28 +105,28 @@ index b7837e3..1334097 100644
  		    }
  		}
 -- 
-2.37.3
+2.42.1
 
 
-From 54f5ca74fdfbe329969182de9fff7837c747df6a Mon Sep 17 00:00:00 2001
+From 742549cee74d0862aad38c4350482699fc16c507 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 59763cf..abcf5c1 100644
+index d099b87..edb7f2e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -718,7 +718,7 @@ else
+@@ -516,7 +516,7 @@ else
      fi
  
      # warnings we'd like to see
--    EXTRA_CFLAGS="${EXTRA_CFLAGS} -pedantic -Wall -Wextra -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls"
-+    EXTRA_CFLAGS="${EXTRA_CFLAGS} -pedantic -Wall -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls"
+-    AM_CFLAGS="${AM_CFLAGS} -pedantic -Wall -Wextra -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes"
++    AM_CFLAGS="${AM_CFLAGS} -pedantic -Wall -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes"
      # warnings we'd like to suppress
-     EXTRA_CFLAGS="${EXTRA_CFLAGS} -Wno-long-long -Wno-format-extra-args"
+     AM_CFLAGS="${AM_CFLAGS} -Wno-long-long -Wno-format-extra-args"
      case "${host}" in
 -- 
-2.37.3
+2.42.1