Balló György pushed to branch main at Arch Linux / Packaging / Packages / libosinfo
Commits: 127d5553 by Balló György at 2024-05-12T14:15:00+02:00 Switch to git source - - - - - 3 changed files: - .SRCINFO - PKGBUILD - − libosinfo-Make-xmlError-struct-constant.patch Changes: ===================================== .SRCINFO ===================================== @@ -5,6 +5,7 @@ pkgbase = libosinfo url = https://libosinfo.org/ arch = x86_64 license = GPL-2.0-or-later AND LGPL-2.1-or-later + makedepends = git makedepends = gobject-introspection makedepends = meson makedepends = vala @@ -16,14 +17,10 @@ pkgbase = libosinfo depends = libxml2 depends = libxslt depends = osinfo-db - source = https://releases.pagure.org/libosinfo/libosinfo-1.11.0.tar.xz - source = https://releases.pagure.org/libosinfo/libosinfo-1.11.0.tar.xz.asc - source = libosinfo-Make-xmlError-struct-constant.patch + source = git+https://gitlab.com/libosinfo/libosinfo.git?signed#tag=v1.11.0 validpgpkeys = DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF validpgpkeys = 09B9C8FF223EF113AFA06A39EE926C2BDACC177B validpgpkeys = 206D3B352F566F3B0E6572E997D9123DE37A484F - sha256sums = 1bf96eec9e1460f3d1a713163cca1ff0d480a3490b50899292f14548b3a96b60 - sha256sums = SKIP - sha256sums = 1b4a5d69750a660d63b4408ffc9e6cc247e4ae6a4d52c033c6bdc3c918a41a65 + b2sums = db8f3bd42b2b165c0d46e58fc4e6f15159381e5499130ea692374a9951ca316702b31a44a7d38304f1f76de06a5fa92b4fec68fd479b18706d03e29e509f9c11 pkgname = libosinfo ===================================== PKGBUILD ===================================== @@ -9,20 +9,17 @@ arch=('x86_64') url='https://libosinfo.org/' 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} - 'libosinfo-Make-xmlError-struct-constant.patch') +makedepends=('git' 'gobject-introspection' 'meson' 'vala') +source=("git+https://gitlab.com/libosinfo/$pkgname.git?signed#tag=v$pkgver") +b2sums=('db8f3bd42b2b165c0d46e58fc4e6f15159381e5499130ea692374a9951ca316702b31a44a7d38304f1f76de06a5fa92b4fec68fd479b18706d03e29e509f9c11') validpgpkeys=('DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF' # Daniel P. Berrange '09B9C8FF223EF113AFA06A39EE926C2BDACC177B' # Fabiano Fidêncio '206D3B352F566F3B0E6572E997D9123DE37A484F') # Victor Toso de Carvalho <m...@victortoso.com> -sha256sums=('1bf96eec9e1460f3d1a713163cca1ff0d480a3490b50899292f14548b3a96b60' - 'SKIP' - '1b4a5d69750a660d63b4408ffc9e6cc247e4ae6a4d52c033c6bdc3c918a41a65') - prepare() { + cd $pkgname # Fix build with libxml2 2.12.0 - patch -d $pkgname-$pkgver -Np1 -i ../libosinfo-Make-xmlError-struct-constant.patch + git cherry-pick -n 5bbdd06503456784c5ffa22409e8bab50470d673 } build() { @@ -31,7 +28,7 @@ build() { -D with-pci-ids-path=/usr/share/hwdata/pci.ids ) - arch-meson $pkgname-$pkgver build "${meson_options[@]}" + arch-meson $pkgname build "${meson_options[@]}" meson compile -C build } ===================================== libosinfo-Make-xmlError-struct-constant.patch deleted ===================================== @@ -1,31 +0,0 @@ -From 5bbdd06503456784c5ffa22409e8bab50470d673 Mon Sep 17 00:00:00 2001 -From: Michal Privoznik <mpriv...@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 <mpriv...@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 - View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/libosinfo/-/commit/127d5553ac591a0dd627b406223e06333cf25c5a -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/libosinfo/-/commit/127d5553ac591a0dd627b406223e06333cf25c5a You're receiving this email because of your account on gitlab.archlinux.org.