update to 2.9.7

ok jca@  test in bulk build by naddy@
This commit is contained in:
steven 2017-11-08 06:51:35 +00:00
parent 83ffebb914
commit 74a10782d6
4 changed files with 18 additions and 16 deletions

View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.171 2017/09/14 14:56:41 jasper Exp $
# $OpenBSD: Makefile,v 1.172 2017/11/08 06:51:35 steven Exp $
COMMENT-main= XML parsing library
COMMENT-python= Python bindings for libxml
VERSION= 2.9.5
VERSION= 2.9.7
DISTNAME= libxml2-${VERSION}
PKGNAME-main= libxml-${VERSION}
PKGNAME-python= py-libxml-${VERSION}
SHARED_LIBS += xml2 15.2 # 11.4
SHARED_LIBS += xml2 16.0 # 11.4
CATEGORIES= textproc
MASTER_SITES= http://gd.tuwien.ac.at/pub/libxml/ \
ftp://xmlsoft.org/libxml/

View File

@ -1,2 +1,2 @@
SHA256 (libxml2-2.9.5.tar.gz) = QDHB7O6c57pPMT6R72KEFkiFzbaZN6Ej9qg7tqctzTg=
SIZE (libxml2-2.9.5.tar.gz) = 5466888
SHA256 (libxml2-2.9.7.tar.gz) = 9jxefTA2LtKLOL+hrGMT+agCMHILf7bIBXXuqz/1kAw=
SIZE (libxml2-2.9.7.tar.gz) = 5467389

View File

@ -1,12 +1,13 @@
$OpenBSD: patch-timsort_h,v 1.4 2013/09/25 12:32:24 jasper Exp $
--- timsort.h.orig Tue Sep 24 10:50:59 2013
+++ timsort.h Tue Sep 24 10:51:40 2013
@@ -48,7 +48,7 @@ typedef unsigned __int64 uint64_t;
int compute_minrun(uint64_t);
$OpenBSD: patch-timsort_h,v 1.5 2017/11/08 06:51:35 steven Exp $
Index: timsort.h
--- timsort.h.orig
+++ timsort.h
@@ -74,7 +74,7 @@ typedef unsigned __int64 uint64_t;
static int compute_minrun(const uint64_t);
#ifndef CLZ
-#if defined(__GNUC__) && ((__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ > 3))
+#if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#ifdef __GNUC__
+#if defined (__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
#define CLZ __builtin_clzll
#else

View File

@ -1,7 +1,8 @@
$OpenBSD: patch-xmllint_c,v 1.4 2007/07/05 16:05:09 steven Exp $
--- xmllint.c.orig Tue Apr 17 14:28:16 2007
+++ xmllint.c Mon Jul 2 12:50:32 2007
@@ -103,7 +103,7 @@
$OpenBSD: patch-xmllint_c,v 1.5 2017/11/08 06:51:35 steven Exp $
Index: xmllint.c
--- xmllint.c.orig
+++ xmllint.c
@@ -87,7 +87,7 @@
#endif
#ifndef XML_XML_DEFAULT_CATALOG