mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
libxml2: bump version
This commit is contained in:
@@ -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="aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f"
|
||||
CHECKSUM_SHA256="c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92"
|
||||
PATCHES="libxml2-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 ?x86 x86_64"
|
||||
@@ -1,14 +1,14 @@
|
||||
From 6e60069123970aef557347f87218c447795d969b Mon Sep 17 00:00:00 2001
|
||||
From e2922942ced05ec782bd63e9b40da6866d0d16c8 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 05d1671..0944f20 100644
|
||||
index a9284b9..faaed02 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -1269,8 +1269,8 @@ cmake_DATA = libxml2-config.cmake
|
||||
@@ -1273,8 +1273,8 @@ cmake_DATA = libxml2-config.cmake
|
||||
#
|
||||
# Install the tests program sources as examples
|
||||
#
|
||||
@@ -20,10 +20,10 @@ index 05d1671..0944f20 100644
|
||||
|
||||
install-data-local:
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 07113a8..c2aa3c5 100644
|
||||
index 5b161a5..26fbc57 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -848,24 +848,19 @@ if test "$with_python" != "no" ; then
|
||||
@@ -864,24 +864,19 @@ if test "$with_python" != "no" ; then
|
||||
fi
|
||||
if test "$PYTHON_VERSION" != "" -a "$PYTHON_INCLUDES" = ""
|
||||
then
|
||||
@@ -56,7 +56,7 @@ index 07113a8..c2aa3c5 100644
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
@@ -876,13 +871,13 @@ if test "$with_python" != "no" ; then
|
||||
@@ -892,13 +887,13 @@ if test "$with_python" != "no" ; then
|
||||
fi
|
||||
if test "$PYTHON_VERSION" != "" -a "$PYTHON_SITE_PACKAGES" = ""
|
||||
then
|
||||
@@ -85,10 +85,10 @@ index 227e24d..06d137c 100644
|
||||
|
||||
PYTESTS= \
|
||||
diff --git a/xml2-config.in b/xml2-config.in
|
||||
index cb4aa61..a35f22b 100644
|
||||
index 5863ffa..fd460ff 100644
|
||||
--- a/xml2-config.in
|
||||
+++ b/xml2-config.in
|
||||
@@ -38,8 +38,8 @@ while test $# -gt 0; do
|
||||
@@ -40,8 +40,8 @@ while test $# -gt 0; do
|
||||
case "$1" in
|
||||
--prefix=*)
|
||||
prefix=$optarg
|
||||
@@ -99,7 +99,7 @@ index cb4aa61..a35f22b 100644
|
||||
;;
|
||||
|
||||
--prefix)
|
||||
@@ -48,7 +48,7 @@ while test $# -gt 0; do
|
||||
@@ -50,7 +50,7 @@ while test $# -gt 0; do
|
||||
|
||||
--exec-prefix=*)
|
||||
exec_prefix=$optarg
|
||||
@@ -109,17 +109,17 @@ index cb4aa61..a35f22b 100644
|
||||
|
||||
--exec-prefix)
|
||||
--
|
||||
2.23.0
|
||||
2.30.0
|
||||
|
||||
|
||||
From 785631ebf4b1be763e9f7cea187669d971944186 Mon Sep 17 00:00:00 2001
|
||||
From fa1f57f11b6a6365f0dcb5a71bb154a574e656db 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 7328fd3..b71520f 100644
|
||||
index effbb2e..4779c95 100644
|
||||
--- a/catalog.c
|
||||
+++ b/catalog.c
|
||||
@@ -32,6 +32,9 @@
|
||||
@@ -145,7 +145,7 @@ index 7328fd3..b71520f 100644
|
||||
#endif
|
||||
|
||||
#if defined(_WIN32) && defined(_MSC_VER)
|
||||
@@ -3078,6 +3081,21 @@ xmlCatalogIsEmpty(xmlCatalogPtr catal) {
|
||||
@@ -3077,6 +3080,21 @@ xmlCatalogIsEmpty(xmlCatalogPtr catal) {
|
||||
* *
|
||||
************************************************************************/
|
||||
|
||||
@@ -167,7 +167,7 @@ index 7328fd3..b71520f 100644
|
||||
/**
|
||||
* xmlInitializeCatalogData:
|
||||
*
|
||||
@@ -3170,10 +3188,16 @@ xmlInitializeCatalog(void) {
|
||||
@@ -3169,10 +3187,16 @@ xmlInitializeCatalog(void) {
|
||||
cur++;
|
||||
path = (char *) xmlStrndup((const xmlChar *)paths, cur - paths);
|
||||
if (path != NULL) {
|
||||
@@ -185,28 +185,28 @@ index 7328fd3..b71520f 100644
|
||||
}
|
||||
}
|
||||
--
|
||||
2.23.0
|
||||
2.30.0
|
||||
|
||||
|
||||
From 6133a5326df0ea3ee9f486cda6b2fc88d0f6827c Mon Sep 17 00:00:00 2001
|
||||
From 4283c85702d0ed1e3192467c52d0426b8e6dd329 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 c2aa3c5..6764233 100644
|
||||
index 26fbc57..ddb62ea 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -769,7 +769,7 @@ else
|
||||
@@ -785,7 +785,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 supress
|
||||
# warnings we'd like to suppress
|
||||
EXTRA_CFLAGS="${EXTRA_CFLAGS} -Wno-long-long -Wno-format-extra-args"
|
||||
case "${host}" in
|
||||
--
|
||||
2.23.0
|
||||
2.30.0
|
||||
|
||||
Reference in New Issue
Block a user