From 88c7b532d4f767284014f9c9cdd199a7470eae4a 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
--- 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.37.3


From 1943f113e77ec2fd7f180c0f09fc20b62ebaeada 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
--- a/catalog.c
+++ b/catalog.c
@@ -18,6 +18,9 @@
 #ifdef LIBXML_CATALOG_ENABLED
 #include <stdlib.h>
 #include <string.h>
+#ifdef __HAIKU__
+#include <ftw.h>
+#endif
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -68,10 +71,10 @@
 #define XML_URN_PUBID "urn:publicid:"
 #define XML_CATAL_BREAK ((xmlChar *) -1)
 #ifndef XML_XML_DEFAULT_CATALOG
-#define XML_XML_DEFAULT_CATALOG "file://" 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://" SYSCONFDIR "/sgml/catalog"
+#define XML_SGML_DEFAULT_CATALOG "/boot/system/data/sgml/catalog"
 #endif
 
 #if defined(_WIN32) && defined(_MSC_VER)
@@ -3071,6 +3074,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
+
 /**
  * xmlInitializeCatalogData:
  *
@@ -3163,10 +3181,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.37.3


From 54f5ca74fdfbe329969182de9fff7837c747df6a 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
--- a/configure.ac
+++ b/configure.ac
@@ -718,7 +718,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"
     # warnings we'd like to suppress
     EXTRA_CFLAGS="${EXTRA_CFLAGS} -Wno-long-long -Wno-format-extra-args"
     case "${host}" in
-- 
2.37.3