* update libosinfo to 1.11.0-2
This commit is contained in:
parent
bd1f661edf
commit
6f8b0828b2
@ -4,19 +4,27 @@
|
||||
|
||||
pkgname=libosinfo
|
||||
pkgver=1.11.0
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc='GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support'
|
||||
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
|
||||
url='https://libosinfo.org/'
|
||||
license=('GPL' 'LGPL')
|
||||
license=('GPL-2.0-or-later AND LGPL-2.1-or-later')
|
||||
depends=('gcc-libs' 'glib2' 'glibc' 'hwdata' 'libsoup3' 'libxml2' 'libxslt' 'osinfo-db')
|
||||
makedepends=('gobject-introspection' 'meson' 'vala')
|
||||
source=("https://releases.pagure.org/libosinfo/$pkgname-$pkgver.tar.xz"{,.asc})
|
||||
source=("https://releases.pagure.org/libosinfo/$pkgname-$pkgver.tar.xz"{,.asc}
|
||||
'libosinfo-Make-xmlError-struct-constant.patch')
|
||||
validpgpkeys=('DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF' # Daniel P. Berrange
|
||||
'09B9C8FF223EF113AFA06A39EE926C2BDACC177B' # Fabiano Fidêncio
|
||||
'206D3B352F566F3B0E6572E997D9123DE37A484F') # Victor Toso de Carvalho <me@victortoso.com>
|
||||
sha256sums=('1bf96eec9e1460f3d1a713163cca1ff0d480a3490b50899292f14548b3a96b60'
|
||||
'SKIP')
|
||||
'SKIP'
|
||||
'1b4a5d69750a660d63b4408ffc9e6cc247e4ae6a4d52c033c6bdc3c918a41a65')
|
||||
|
||||
|
||||
prepare() {
|
||||
# Fix build with libxml2 2.12.0
|
||||
patch -d $pkgname-$pkgver -Np1 -i ../libosinfo-Make-xmlError-struct-constant.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
local meson_options=(
|
||||
|
31
libosinfo/libosinfo-Make-xmlError-struct-constant.patch
Normal file
31
libosinfo/libosinfo-Make-xmlError-struct-constant.patch
Normal file
@ -0,0 +1,31 @@
|
||||
From 5bbdd06503456784c5ffa22409e8bab50470d673 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 5800f374..303245a1 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;
|
||||
|
||||
--
|
||||
GitLab
|
||||
|
Loading…
x
Reference in New Issue
Block a user