libxml2: bump version.

This commit is contained in:
Jerome Duval
2019-11-14 22:44:36 +01:00
parent fe420c766b
commit cf8efc9f20
2 changed files with 19 additions and 65 deletions

View File

@@ -10,9 +10,9 @@ available in other environments."
HOMEPAGE="http://www.xmlsoft.org/"
COPYRIGHT="1998-2013 Daniel Veillard. All Rights Reserved."
LICENSE="MIT"
REVISION="4"
REVISION="1"
SOURCE_URI="ftp://xmlsoft.org/libxml2/libxml2-$portVersion.tar.gz"
CHECKSUM_SHA256="94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871"
CHECKSUM_SHA256="aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f"
PATCHES="libxml2-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 ?x86 x86_64"

View File

@@ -1,11 +1,11 @@
From 536da195f5113fbfc43ec16008b26d2a1c19ebaa Mon Sep 17 00:00:00 2001
From 6e60069123970aef557347f87218c447795d969b 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 9c630be..7fd25f8 100644
index 05d1671..0944f20 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1269,8 +1269,8 @@ cmake_DATA = libxml2-config.cmake
@@ -20,7 +20,7 @@ index 9c630be..7fd25f8 100644
install-data-local:
diff --git a/configure.ac b/configure.ac
index ca911f3..974d292 100644
index 07113a8..c2aa3c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -848,24 +848,19 @@ if test "$with_python" != "no" ; then
@@ -75,7 +75,7 @@ index ca911f3..974d292 100644
PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib())"`
fi
diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am
index 95ebead..81222d9 100644
index 227e24d..06d137c 100644
--- a/python/tests/Makefile.am
+++ b/python/tests/Makefile.am
@@ -1,4 +1,4 @@
@@ -85,10 +85,10 @@ index 95ebead..81222d9 100644
PYTESTS= \
diff --git a/xml2-config.in b/xml2-config.in
index 1957486..9c98a0e 100644
index cb4aa61..a35f22b 100644
--- a/xml2-config.in
+++ b/xml2-config.in
@@ -40,8 +40,8 @@ while test $# -gt 0; do
@@ -38,8 +38,8 @@ while test $# -gt 0; do
case "$1" in
--prefix=*)
prefix=$optarg
@@ -99,7 +99,7 @@ index 1957486..9c98a0e 100644
;;
--prefix)
@@ -50,7 +50,7 @@ while test $# -gt 0; do
@@ -48,7 +48,7 @@ while test $# -gt 0; do
--exec-prefix=*)
exec_prefix=$optarg
@@ -109,17 +109,17 @@ index 1957486..9c98a0e 100644
--exec-prefix)
--
2.21.0
2.23.0
From 1def30eeb6f7b41895dfbc15fbb507b6f3bbaa56 Mon Sep 17 00:00:00 2001
From 785631ebf4b1be763e9f7cea187669d971944186 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 f814121..5939325 100644
index 7328fd3..b71520f 100644
--- a/catalog.c
+++ b/catalog.c
@@ -32,6 +32,9 @@
@@ -185,74 +185,28 @@ index f814121..5939325 100644
}
}
--
2.21.0
2.23.0
From 410cb6cb8c7ef64bfe68a1f991e80fb2052ed880 Mon Sep 17 00:00:00 2001
From 6133a5326df0ea3ee9f486cda6b2fc88d0f6827c 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 974d292..35e972d 100644
index c2aa3c5..6764233 100644
--- a/configure.ac
+++ b/configure.ac
@@ -769,9 +769,9 @@ else
@@ -769,7 +769,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 -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 supress
- EXTRA_CFLAGS="${EXTRA_CFLAGS} -Wno-long-long -Wno-format-extra-args -Wno-array-bounds"
+ EXTRA_CFLAGS="${EXTRA_CFLAGS} -Wno-long-long -Wno-format-extra-args"
EXTRA_CFLAGS="${EXTRA_CFLAGS} -Wno-long-long -Wno-format-extra-args"
case "${host}" in
alpha*-*-linux* )
EXTRA_CFLAGS="${EXTRA_CFLAGS} -mieee"
--
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
2.23.0