diff --git a/raptor-libxml2-2.11-support.patch b/raptor-libxml2-2.11-support.patch new file mode 100644 index 0000000..7e7920a --- /dev/null +++ b/raptor-libxml2-2.11-support.patch @@ -0,0 +1,31 @@ +From 4dbc4c1da2a033c497d84a1291c46f416a9cac51 Mon Sep 17 00:00:00 2001 +From: David Anes +Date: Thu, 4 May 2023 11:54:02 +0200 +Subject: [PATCH] Remove the access to entities 'checked' private symbol for + libxml2 2.11.0 + +Since version 2.11.0, some private symbols that were never intended +as public API/ABI have been removed from libxml2, therefore the field +'checked' is no longer present and raptor fails to build in this +scenario. +--- + src/raptor_libxml.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/raptor_libxml.c b/src/raptor_libxml.c +index 538c2c8e..8bcee139 100644 +--- a/src/raptor_libxml.c ++++ b/src/raptor_libxml.c +@@ -246,10 +246,11 @@ raptor_libxml_getEntity(void* user_data, const xmlChar *name) + + ret->owner = 1; + +-#if LIBXML_VERSION >= 20627 ++#if LIBXML_VERSION >= 20627 && LIBXML_VERSION < 21100 + /* Checked field was released in 2.6.27 on 2006-10-25 + * http://git.gnome.org/browse/libxml2/commit/?id=a37a6ad91a61d168ecc4b29263def3363fff4da6 + * ++ * and was later removed in version 2.11.0 + */ + + /* Mark this entity as having been checked - never do this again */ diff --git a/raptor.changes b/raptor.changes index 0972c41..33cd5ce 100644 --- a/raptor.changes +++ b/raptor.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 4 09:59:20 UTC 2023 - David Anes + +- Add support for libxml 2.11.0+ + * Added patch raptor-libxml2-2.11-support.patch + ------------------------------------------------------------------- Tue Mar 7 12:23:30 UTC 2023 - Dirk Müller diff --git a/raptor.spec b/raptor.spec index 0e414ba..21692e4 100644 --- a/raptor.spec +++ b/raptor.spec @@ -28,6 +28,8 @@ Source1: https://download.librdf.org/source/raptor2-%{version}.tar.gz.asc Source2: %{name}.keyring Source3: baselibs.conf Patch2: ubsan.patch +# Patch sent upstream: https://github.com/dajobe/raptor/pull/58 +Patch3: raptor-libxml2-2.11-support.patch BuildRequires: bison BuildRequires: curl-devel BuildRequires: libicu-devel @@ -67,6 +69,7 @@ raptor library. %prep %setup -q -n %{name}2-%{version} %patch2 +%patch3 -p1 %build %configure \