mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 03:30:05 +02:00
libxml2: fix gcc2 build when including dict.h
This commit is contained in:
Jerome Duval
@@ -10,7 +10,7 @@ available in other environments."
|
||||
HOMEPAGE="http://www.xmlsoft.org/"
|
||||
COPYRIGHT="1998-2013 Daniel Veillard. All Rights Reserved."
|
||||
LICENSE="MIT"
|
||||
REVISION="3"
|
||||
REVISION="4"
|
||||
SOURCE_URI="ftp://xmlsoft.org/libxml2/libxml2-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871"
|
||||
PATCHES="libxml2-$portVersion.patchset"
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
From 767d83b5c8d71625205469ceeb1b53e65fde0e37 Mon Sep 17 00:00:00 2001
|
||||
From 536da195f5113fbfc43ec16008b26d2a1c19ebaa 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 70720f3..c617e0d 100644
|
||||
index 9c630be..7fd25f8 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -1225,8 +1225,8 @@ cmake_DATA = libxml2-config.cmake
|
||||
@@ -1269,8 +1269,8 @@ cmake_DATA = libxml2-config.cmake
|
||||
#
|
||||
# Install the tests program sources as examples
|
||||
#
|
||||
@@ -20,10 +20,10 @@ index 70720f3..c617e0d 100644
|
||||
|
||||
install-data-local:
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 0260281..4a6df6e 100644
|
||||
index ca911f3..974d292 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -856,24 +856,19 @@ if test "$with_python" != "no" ; then
|
||||
@@ -848,24 +848,19 @@ if test "$with_python" != "no" ; then
|
||||
fi
|
||||
if test "$PYTHON_VERSION" != "" -a "$PYTHON_INCLUDES" = ""
|
||||
then
|
||||
@@ -56,7 +56,7 @@ index 0260281..4a6df6e 100644
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
@@ -884,13 +879,13 @@ if test "$with_python" != "no" ; then
|
||||
@@ -876,13 +871,13 @@ if test "$with_python" != "no" ; then
|
||||
fi
|
||||
if test "$PYTHON_VERSION" != "" -a "$PYTHON_SITE_PACKAGES" = ""
|
||||
then
|
||||
@@ -109,17 +109,17 @@ index 1957486..9c98a0e 100644
|
||||
|
||||
--exec-prefix)
|
||||
--
|
||||
2.2.2
|
||||
2.21.0
|
||||
|
||||
|
||||
From 18b0f85f4e8edaacf9b20e232dc96114c0b68fe0 Mon Sep 17 00:00:00 2001
|
||||
From 1def30eeb6f7b41895dfbc15fbb507b6f3bbaa56 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 5773db3..1065298 100644
|
||||
index f814121..5939325 100644
|
||||
--- a/catalog.c
|
||||
+++ b/catalog.c
|
||||
@@ -32,6 +32,9 @@
|
||||
@@ -145,7 +145,7 @@ index 5773db3..1065298 100644
|
||||
#endif
|
||||
|
||||
#if defined(_WIN32) && defined(_MSC_VER)
|
||||
@@ -3074,6 +3077,21 @@ xmlCatalogIsEmpty(xmlCatalogPtr catal) {
|
||||
@@ -3078,6 +3081,21 @@ xmlCatalogIsEmpty(xmlCatalogPtr catal) {
|
||||
* *
|
||||
************************************************************************/
|
||||
|
||||
@@ -167,7 +167,7 @@ index 5773db3..1065298 100644
|
||||
/**
|
||||
* xmlInitializeCatalogData:
|
||||
*
|
||||
@@ -3166,10 +3184,16 @@ xmlInitializeCatalog(void) {
|
||||
@@ -3170,10 +3188,16 @@ xmlInitializeCatalog(void) {
|
||||
cur++;
|
||||
path = (char *) xmlStrndup((const xmlChar *)paths, cur - paths);
|
||||
if (path != NULL) {
|
||||
@@ -185,16 +185,14 @@ index 5773db3..1065298 100644
|
||||
}
|
||||
}
|
||||
--
|
||||
2.2.2
|
||||
2.21.0
|
||||
|
||||
From 607d388f8f591239695762da33231670d9c2f325 Mon Sep 17 00:00:00 2001
|
||||
|
||||
From 410cb6cb8c7ef64bfe68a1f991e80fb2052ed880 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Wed, 3 Apr 2019 18:27:19 +0200
|
||||
Subject: [PATCH] Remove options unknown to gcc2
|
||||
Subject: Remove options unknown to gcc2
|
||||
|
||||
---
|
||||
configure.ac | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 974d292..35e972d 100644
|
||||
@@ -213,5 +211,48 @@ index 974d292..35e972d 100644
|
||||
alpha*-*-linux* )
|
||||
EXTRA_CFLAGS="${EXTRA_CFLAGS} -mieee"
|
||||
--
|
||||
2.19.1
|
||||
2.21.0
|
||||
|
||||
|
||||
From ca8fdeeb5c2cbea088c1451fd68b4c98966a077c Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Mon, 17 Jun 2019 15:04:08 +0200
|
||||
Subject: dict.h: gcc 2.95 doesn't allow multiple storage classes.
|
||||
|
||||
uses an extern "C" block instead.
|
||||
|
||||
diff --git a/include/libxml/dict.h b/include/libxml/dict.h
|
||||
index b83db59..4e71834 100644
|
||||
--- a/include/libxml/dict.h
|
||||
+++ b/include/libxml/dict.h
|
||||
@@ -11,17 +11,19 @@
|
||||
#ifndef __XML_DICT_H__
|
||||
#define __XML_DICT_H__
|
||||
|
||||
-#ifdef __cplusplus
|
||||
-#define __XML_EXTERNC extern "C"
|
||||
-#else
|
||||
-#define __XML_EXTERNC
|
||||
-#endif
|
||||
-
|
||||
/*
|
||||
* The dictionary.
|
||||
*/
|
||||
-__XML_EXTERNC typedef struct _xmlDict xmlDict;
|
||||
-__XML_EXTERNC typedef xmlDict *xmlDictPtr;
|
||||
+#ifdef __cplusplus
|
||||
+extern "C" {
|
||||
+#endif
|
||||
+
|
||||
+typedef struct _xmlDict xmlDict;
|
||||
+typedef xmlDict *xmlDictPtr;
|
||||
+
|
||||
+#ifdef __cplusplus
|
||||
+}
|
||||
+#endif
|
||||
|
||||
#include <limits.h>
|
||||
#include <libxml/xmlversion.h>
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user