Accepting request 1177065 from hardware
OBS-URL: https://build.opensuse.org/request/show/1177065 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libosinfo?expand=0&rev=53
This commit is contained in:
commit
7f5d548637
@ -0,0 +1,31 @@
|
|||||||
|
From 2a23a33b06fab59b351358fba1a4969902217b58 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michal Privoznik <mprivozn@redhat.com>
|
||||||
|
Date: Mon, 27 Nov 2023 15:11:45 +0100
|
||||||
|
Subject: [PATCH] osinfo: Make xmlError struct constant in
|
||||||
|
propagate_libxml_error()
|
||||||
|
|
||||||
|
In libxml2 commit v2.12.0~14 the API changed so that
|
||||||
|
xmlGetLastError() returns pointer to a constant xmlError struct.
|
||||||
|
Reflect this change in our code.
|
||||||
|
|
||||||
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||||||
|
---
|
||||||
|
osinfo/osinfo_install_script.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
|
||||||
|
index 5800f37..303245a 100644
|
||||||
|
--- a/osinfo/osinfo_install_script.c
|
||||||
|
+++ b/osinfo/osinfo_install_script.c
|
||||||
|
@@ -769,7 +769,7 @@ static void propagate_libxml_error(GError **error, const char *format, ...) G_GN
|
||||||
|
|
||||||
|
static void propagate_libxml_error(GError **error, const char *format, ...)
|
||||||
|
{
|
||||||
|
- xmlErrorPtr err = xmlGetLastError();
|
||||||
|
+ const xmlError *err = xmlGetLastError();
|
||||||
|
char *prefix;
|
||||||
|
va_list ap;
|
||||||
|
|
||||||
|
--
|
||||||
|
2.45.1
|
||||||
|
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun May 26 10:18:24 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
||||||
|
|
||||||
|
- Add upstream change:
|
||||||
|
* 0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Mar 4 14:24:21 MST 2024 - carnold@suse.com
|
Mon Mar 4 14:24:21 MST 2024 - carnold@suse.com
|
||||||
|
|
||||||
|
@ -27,6 +27,8 @@ License: GPL-2.0-or-later AND LGPL-2.1-or-later
|
|||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
URL: https://releases.pagure.org/libosinfo
|
URL: https://releases.pagure.org/libosinfo
|
||||||
Source0: %{url}/%{name}-%{version}.tar.xz
|
Source0: %{url}/%{name}-%{version}.tar.xz
|
||||||
|
# PATCH-FIX-UPSTREAM -- libxml 2.12 compatibility
|
||||||
|
Patch0: 0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch
|
||||||
BuildRequires: gtk-doc
|
BuildRequires: gtk-doc
|
||||||
BuildRequires: hwdata
|
BuildRequires: hwdata
|
||||||
BuildRequires: libcurl-devel
|
BuildRequires: libcurl-devel
|
||||||
|
Loading…
Reference in New Issue
Block a user