backport fix from upstream to unbreak the xmlcatalog command

ptd out by aja@
This commit is contained in:
jasper 2014-10-18 08:56:21 +00:00
parent 793cd44530
commit 52074a0570
2 changed files with 22 additions and 1 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.156 2014/10/17 13:24:59 jasper Exp $
# $OpenBSD: Makefile,v 1.157 2014/10/18 08:56:21 jasper Exp $
COMMENT-main= XML parsing library
COMMENT-python= Python bindings for libxml
@ -14,6 +14,8 @@ MASTER_SITES= http://gd.tuwien.ac.at/pub/libxml/ \
HOMEPAGE= http://xmlsoft.org/
REVISION= 0
# BSD-like
PERMIT_PACKAGE_CDROM= Yes

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-parser_c,v 1.12 2014/10/18 08:56:21 jasper Exp $
From f65128f38289d77ff322d63aef2858cc0a819c34 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@redhat.com>
Date: Fri, 17 Oct 2014 17:13:41 +0800
Subject: Revert "Missing initialization for the catalog module"
--- parser.c.orig Sat Oct 18 10:33:23 2014
+++ parser.c Sat Oct 18 10:33:44 2014
@@ -14830,9 +14830,6 @@ xmlInitParser(void) {
#ifdef LIBXML_XPATH_ENABLED
xmlXPathInit();
#endif
-#ifdef LIBXML_CATALOG_ENABLED
- xmlInitializeCatalog();
-#endif
xmlParserInitialized = 1;
#ifdef LIBXML_THREAD_ENABLED
}