PR#7: Fix building against libxml2 2.12.0 - rpms/sane-backends

rpms / sane-backends

#7 Fix building against libxml2 2.12.0

Merged 5 months ago by zdohnal. Opened 5 months ago by amigadave.

rpms/ amigadave/sane-backends libxml2-2.12.0 into rawhide

Fix building against libxml2 2.12.0

David King • 5 months ago

34e7ef5

sane-backends-1.2.1-libxml2-2.12.0.patch

file added

+24

		`@@ -0,0 +1,24 @@`
		`+ From 3f727cfb8f9bd6b3e3ac1ebf91ae7b9602f3d351 Mon Sep 17 00:00:00 2001`
		`+ From: =?UTF-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>`
		`+ 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 <time.h>`
		`+`
		`+ #if WITH_USB_RECORD_REPLAY`
		`+ +#include <libxml/parser.h>`
		`+ #include <libxml/tree.h>`
		`+ #endif`
		`+`
		`+ --`
		`+ GitLab`
		`+`

sane-backends.spec

file modified

+6 -1

		`@@ -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 @@`
		`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 @@`
		`%{_unitdir}/saned@.service`

		`%changelog`
		`+ * Sat Dec 09 2023 David King <amigadave@amigadave.com> - 1.2.1-7`
		`+ - Fix building against libxml2 2.12.0`
		`+`
		`* Wed Aug 30 2023 Zdenek Dohnal <zdohnal@redhat.com> - 1.2.1-6`
		`- applied accepted license exception - SANE-exception`

no initial comment

zdohnal commented 5 months ago

[citest]

zdohnal commented 5 months ago

Hi,

thank you for the PR!

I will check whether the tests are passing (it looks there was an infra error, so I'll reschedule them if possible), and if it looks ok, I will merge it.

zdohnal commented 5 months ago

There seems to be an outage, so CI won't finish - but the build looks ok and the patch does not seem to be able break the tests or installability and the patch is from upstream, so I'll merge it without CI results.