From 34e7ef5c253d9fa614c361decc7c004cad12b3ba Mon Sep 17 00:00:00 2001 From: David King Date: Sat, 9 Dec 2023 11:59:54 +0000 Subject: [PATCH] Fix building against libxml2 2.12.0 --- sane-backends-1.2.1-libxml2-2.12.0.patch | 24 ++++++++++++++++++++++++ sane-backends.spec | 7 ++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 sane-backends-1.2.1-libxml2-2.12.0.patch diff --git a/sane-backends-1.2.1-libxml2-2.12.0.patch b/sane-backends-1.2.1-libxml2-2.12.0.patch new file mode 100644 index 0000000..61c485d --- /dev/null +++ b/sane-backends-1.2.1-libxml2-2.12.0.patch @@ -0,0 +1,24 @@ +From 3f727cfb8f9bd6b3e3ac1ebf91ae7b9602f3d351 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=BCrg=20Billeter?= +Date: Tue, 28 Nov 2023 21:24:01 +0100 +Subject: [PATCH] sanei_usb: Fix build with libxml2 2.12 + +--- + sanei/sanei_usb.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sanei/sanei_usb.c b/sanei/sanei_usb.c +index 022f6fab9..850c3b369 100644 +--- a/sanei/sanei_usb.c ++++ b/sanei/sanei_usb.c +@@ -65,6 +65,7 @@ + #include + + #if WITH_USB_RECORD_REPLAY ++#include + #include + #endif + +-- +GitLab + diff --git a/sane-backends.spec b/sane-backends.spec index b52e043..4e996dc 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -24,7 +24,7 @@ Summary: Scanner access software Name: sane-backends Version: 1.2.1 -Release: 6%{?dist} +Release: 7%{?dist} # backend/coolscan*, backend/epson2*, backend/epsonds*, backend/magicolor*, backend/kodakaio* - # GPL-2.0-only # backend/qcam* - MIT AND GPL-2.0-or-later WITH SANE-exception @@ -57,6 +57,8 @@ Patch2: sane-backends-1.0.23-sane-config-multilib.patch Patch3: sane-genesys-plustek7600i-8100-support.patch # Fix for c99 Patch4: sane-backends-1.2.1-fedora-c99.patch +# https://gitlab.com/sane-project/backends/-/merge_requests/814 +Patch5: sane-backends-1.2.1-libxml2-2.12.0.patch URL: http://www.sane-project.org @@ -404,6 +406,9 @@ udevadm hwdb --update >/dev/null 2>&1 || : %{_unitdir}/saned@.service %changelog +* Sat Dec 09 2023 David King - 1.2.1-7 +- Fix building against libxml2 2.12.0 + * Wed Aug 30 2023 Zdenek Dohnal - 1.2.1-6 - applied accepted license exception - SANE-exception