libxml2, add 2.14.2 (#12548)

SONAME changes, so need to keep the older one alive for now
2026-04-22 11:40:06 +02:00 · 2025-07-18 09:16:39 +02:00
parent cda61f71d0
commit 747aebab93
2 changed files with 329 additions and 0 deletions
--- a/dev-libs/libxml2/patches/libxml2_2.14-2.14.4.patchset
+++ b/dev-libs/libxml2/patches/libxml2_2.14-2.14.4.patchset
@@ -0,0 +1,136 @@
+From 226718a81e4721605f287aec28f6b016634852f7 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 0097751..c0583b2 100644
+--- a/xml2-config.in
+++ b/xml2-config.in
+@@ -40,8 +40,8 @@ while test $# -gt 0; do
+     case "$1" in
+     --prefix=*)
+ 	prefix=$optarg
+-	includedir=$prefix/include
+-	libdir=$prefix/lib
+	includedir=$prefix/develop/headers
+	libdir=$prefix/develop/lib
+ 	;;
+ 
+     --prefix)
+@@ -50,7 +50,7 @@ while test $# -gt 0; do
+ 
+     --exec-prefix=*)
+       exec_prefix=$optarg
+-      libdir=$exec_prefix/lib
+      libdir=$exec_prefix/develop/lib
+       ;;
+ 
+     --exec-prefix)
+-- 
+2.48.1
+
+
+From 2074a8b3174a3716147b2d5cda6e766aa40546d1 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 dc22e27..92b9309 100644
+--- a/catalog.c
+++ b/catalog.c
+@@ -20,6 +20,10 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+#ifdef __HAIKU__
+#include <ftw.h>
+#endif
+
+ #include <fcntl.h>
+ #include <sys/stat.h>
+ 
+@@ -55,10 +59,10 @@
+ #define XML_URN_PUBID "urn:publicid:"
+ #define XML_CATAL_BREAK ((xmlChar *) -1)
+ #ifndef XML_XML_DEFAULT_CATALOG
+-#define XML_XML_DEFAULT_CATALOG "file://" XML_SYSCONFDIR "/xml/catalog"
+#define XML_XML_DEFAULT_CATALOG "/boot/system/data/xml/catalog"
+ #endif
+ #ifndef XML_SGML_DEFAULT_CATALOG
+-#define XML_SGML_DEFAULT_CATALOG "file://" XML_SYSCONFDIR "/sgml/catalog"
+#define XML_SGML_DEFAULT_CATALOG "/boot/system/data/sgml/catalog"
+ #endif
+ 
+ static xmlChar *xmlCatalogNormalizePublic(const xmlChar *pubID);
+@@ -3036,6 +3040,21 @@ xmlCatalogIsEmpty(xmlCatalogPtr catal) {
+  *									*
+  ************************************************************************/
+ 
+#ifdef __HAIKU__
+static xmlCatalogEntryPtr *__haikuNextEntry;
+static int __haikuAddCatalog(const char* subpath, const struct stat* sb, int typeflag)
+{
+       if (typeflag == FTW_F) {
+               *__haikuNextEntry = xmlNewCatalogEntry(XML_CATA_CATALOG, NULL,
+                       NULL, BAD_CAST subpath, xmlCatalogDefaultPrefer, NULL);
+               if (*__haikuNextEntry != NULL)
+                       __haikuNextEntry = &((*__haikuNextEntry)->next);
+       }
+
+       return 0;
+}
+#endif
+
+ /**
+  * xmlInitCatalogInternal:
+  *
+@@ -3090,10 +3109,16 @@ xmlInitializeCatalog(void) {
+ 			cur++;
+ 		    path = (char *) xmlStrndup((const xmlChar *)paths, cur - paths);
+ 		    if (path != NULL) {
+#ifdef __HAIKU__
+                       __haikuNextEntry = nextent;
+                       ftw(path, __haikuAddCatalog, 3);
+                       nextent = __haikuNextEntry;
+#else
+ 			*nextent = xmlNewCatalogEntry(XML_CATA_CATALOG, NULL,
+ 				NULL, BAD_CAST path, xmlCatalogDefaultPrefer, NULL);
+ 			if (*nextent != NULL)
+ 			    nextent = &((*nextent)->next);
+#endif
+ 			xmlFree(path);
+ 		    }
+ 		}
+-- 
+2.48.1
+
+
+From e266c8c240004d3a5e2c9a8550be0d45f5fa73e2 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 aaa02e3..63f3b52 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -372,9 +372,9 @@ if test "${GCC}" != "yes" ; then
+     esac
+ else
+     # warnings we'd like to see
+-    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
+-    AM_CFLAGS="${AM_CFLAGS} -Wno-long-long -Wno-format-extra-args -Wno-array-bounds"
+    AM_CFLAGS="${AM_CFLAGS} -Wno-long-long -Wno-format-extra-args"
+     case "${host}" in
+           alpha*-*-linux* )
+               AM_CFLAGS="${AM_CFLAGS} -mieee"
+-- 
+2.48.1
+