Upstream patch to add extra includes

This commit is contained in:
David King 2023-12-09 13:12:22 +00:00
parent 965b8e8d06
commit 3694f5b8bf
2 changed files with 56 additions and 2 deletions

View File

@ -0,0 +1,50 @@
From 52703ffdf15bcdf116d719b492b3d053e6cc37cc Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Thu, 7 Dec 2023 12:04:02 +0100
Subject: [PATCH] include: Add missing includes
---
include/libxml/relaxng.h | 1 +
include/libxml/schemasInternals.h | 1 +
include/libxml/schematron.h | 1 +
3 files changed, 3 insertions(+)
diff --git a/include/libxml/relaxng.h b/include/libxml/relaxng.h
index e764bad3a..079b7f125 100644
--- a/include/libxml/relaxng.h
+++ b/include/libxml/relaxng.h
@@ -13,6 +13,7 @@
#include <libxml/xmlversion.h>
#include <libxml/xmlerror.h>
#include <libxml/xmlstring.h>
+#include <libxml/tree.h>
#ifdef LIBXML_SCHEMAS_ENABLED
diff --git a/include/libxml/schemasInternals.h b/include/libxml/schemasInternals.h
index 5806f0182..e9d3b3c7a 100644
--- a/include/libxml/schemasInternals.h
+++ b/include/libxml/schemasInternals.h
@@ -21,6 +21,7 @@
#include <libxml/xmlregexp.h>
#include <libxml/hash.h>
#include <libxml/dict.h>
+#include <libxml/tree.h>
#ifdef __cplusplus
extern "C" {
diff --git a/include/libxml/schematron.h b/include/libxml/schematron.h
index 6e3d837a1..8dd8d25c4 100644
--- a/include/libxml/schematron.h
+++ b/include/libxml/schematron.h
@@ -15,6 +15,7 @@
#ifdef LIBXML_SCHEMATRON_ENABLED
+#include <libxml/xmlerror.h>
#include <libxml/tree.h>
#ifdef __cplusplus
--
GitLab

View File

@ -1,6 +1,6 @@
Name: libxml2
Version: 2.12.2
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Library providing XML and HTML support
# Libxml2 is covered under MIT, and the conformance and test suite data in
@ -17,6 +17,8 @@ Patch0: libxml2-multilib.patch
# Patch from openSUSE.
# See: https://bugzilla.gnome.org/show_bug.cgi?id=789714
Patch1: libxml2-2.12.0-python3-unicode-errors.patch
# https://gitlab.gnome.org/GNOME/libxml2/-/issues/642
Patch2: libxml2-2.12.2-add-missing-includes.patch
BuildRequires: cmake-rpm-macros
BuildRequires: gcc
@ -89,7 +91,6 @@ find doc -type f -executable -print -exec chmod 0644 {} ';'
--enable-static \
--with-legacy \
--with-ftp \
--with-xptr-locs \
--with-python=%{__python3}
%make_build
@ -158,6 +159,9 @@ popd
%{python3_sitelib}/__pycache__/drv_libxml2.*
%changelog
* Sat Dec 09 2023 David King <amigadave@amigadave.com> - 2.12.2-2
- Upstream patch to add extra includes
* Wed Dec 06 2023 David King <amigadave@amigadave.com> - 2.12.2-1
- Update to 2.12.2 (#2137281)
- Enable W3C XML Conformance and Schema test suites