* update osinfo-db-tools to 1.12.0-1
This commit is contained in:
parent
5a1697a889
commit
9ac33612ba
29
osinfo-db-tools/.SRCINFO
Normal file
29
osinfo-db-tools/.SRCINFO
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
pkgbase = osinfo-db-tools
|
||||||
|
pkgdesc = Tools for managing the osinfo database
|
||||||
|
pkgver = 1.12.0
|
||||||
|
pkgrel = 1
|
||||||
|
url = https://libosinfo.org/
|
||||||
|
arch = x86_64
|
||||||
|
arch = powerpc64le
|
||||||
|
arch = powerpc64
|
||||||
|
arch = powerpc
|
||||||
|
arch = riscv64
|
||||||
|
license = GPL-2.0-or-later
|
||||||
|
checkdepends = python-pytest
|
||||||
|
checkdepends = python-requests
|
||||||
|
makedepends = git
|
||||||
|
makedepends = meson
|
||||||
|
depends = gcc-libs
|
||||||
|
depends = glib2
|
||||||
|
depends = glibc
|
||||||
|
depends = json-glib
|
||||||
|
depends = libarchive
|
||||||
|
depends = libsoup3
|
||||||
|
depends = libxml2
|
||||||
|
source = git+https://gitlab.com/libosinfo/osinfo-db-tools.git?signed#tag=v1.12.0
|
||||||
|
validpgpkeys = DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF
|
||||||
|
validpgpkeys = 09B9C8FF223EF113AFA06A39EE926C2BDACC177B
|
||||||
|
validpgpkeys = 206D3B352F566F3B0E6572E997D9123DE37A484F
|
||||||
|
b2sums = d95c4ab2190637f7cae280b403684d7379cacbcc25c2ff42706bc29da61cd5b3415b0236203d53c91000f00580252572da3d15a883487ce9f594ddcc449fa7d0
|
||||||
|
|
||||||
|
pkgname = osinfo-db-tools
|
||||||
4
osinfo-db-tools/.nvchecker.toml
Normal file
4
osinfo-db-tools/.nvchecker.toml
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
[osinfo-db-tools]
|
||||||
|
source = "git"
|
||||||
|
git = "https://gitlab.com/libosinfo/osinfo-db-tools.git"
|
||||||
|
prefix = "v"
|
||||||
@ -1,32 +1,45 @@
|
|||||||
|
# POWER Maintainer: Alexander Baldeck <alex.bldck@gmail.com>
|
||||||
# Maintainer: Balló György <ballogyor+arch at gmail dot com>
|
# Maintainer: Balló György <ballogyor+arch at gmail dot com>
|
||||||
|
|
||||||
pkgname=osinfo-db-tools
|
pkgname=osinfo-db-tools
|
||||||
pkgver=1.11.0
|
pkgver=1.12.0
|
||||||
pkgrel=2.1
|
pkgrel=1
|
||||||
pkgdesc='Tools for managing the osinfo database'
|
pkgdesc='Tools for managing the osinfo database'
|
||||||
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
|
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
|
||||||
url='https://libosinfo.org/'
|
url='https://libosinfo.org/'
|
||||||
license=('GPL-2.0-or-later')
|
license=(GPL-2.0-or-later)
|
||||||
depends=('gcc-libs' 'glib2' 'glibc' 'json-glib' 'libarchive' 'libsoup3' 'libxml2')
|
depends=(
|
||||||
makedepends=('meson')
|
gcc-libs
|
||||||
checkdepends=('python-pytest' 'python-requests')
|
glib2
|
||||||
source=("https://releases.pagure.org/libosinfo/$pkgname-$pkgver.tar.xz"{,.asc}
|
glibc
|
||||||
'osinfo-db-tools-libxml2-2.12.patch')
|
json-glib
|
||||||
validpgpkeys=('DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF' # Daniel P. Berrange
|
libarchive
|
||||||
'09B9C8FF223EF113AFA06A39EE926C2BDACC177B' # Fabiano Fidêncio
|
libsoup3
|
||||||
'206D3B352F566F3B0E6572E997D9123DE37A484F') # Victor Toso de Carvalho <me@victortoso.com>
|
libxml2
|
||||||
sha256sums=('8ba6d31bb5ef07056e38879e070671afbcfec0eb41a87f9950450bbb831b0a1d'
|
)
|
||||||
'SKIP'
|
makedepends=(
|
||||||
'5088a4d8e141d1ced604e93498f65b1d1aeb0c1f29db9098dad89231ceeb2b5d')
|
git
|
||||||
|
meson
|
||||||
|
)
|
||||||
|
checkdepends=(
|
||||||
|
python-pytest
|
||||||
|
python-requests
|
||||||
|
)
|
||||||
|
source=("git+https://gitlab.com/libosinfo/$pkgname.git?signed#tag=v$pkgver")
|
||||||
|
b2sums=(d95c4ab2190637f7cae280b403684d7379cacbcc25c2ff42706bc29da61cd5b3415b0236203d53c91000f00580252572da3d15a883487ce9f594ddcc449fa7d0)
|
||||||
|
validpgpkeys=(
|
||||||
|
DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF # Daniel P. Berrange
|
||||||
|
09B9C8FF223EF113AFA06A39EE926C2BDACC177B # Fabiano Fidêncio
|
||||||
|
206D3B352F566F3B0E6572E997D9123DE37A484F # Victor Toso de Carvalho <me@victortoso.com>
|
||||||
|
)
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
# Fix build with libxml2 2.12
|
cd $pkgname
|
||||||
# https://gitlab.com/libosinfo/osinfo-db-tools/-/merge_requests/80
|
sed -i 's/-Werror//' meson.build
|
||||||
patch -d $pkgname-$pkgver -Np1 -i ../osinfo-db-tools-libxml2-2.12.patch
|
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
arch-meson $pkgname-$pkgver build
|
arch-meson $pkgname build
|
||||||
meson compile -C build
|
meson compile -C build
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,85 +0,0 @@
|
|||||||
From 34378a4ac257f2f5fcf364786d1634a8c36b304f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michal Privoznik <mprivozn@redhat.com>
|
|
||||||
Date: Mon, 27 Nov 2023 15:04:43 +0100
|
|
||||||
Subject: [PATCH 1/2] Make xmlError structs constant
|
|
||||||
|
|
||||||
In libxml2 commits v2.12.0~14 and v2.12.0~77 the API changed so
|
|
||||||
that:
|
|
||||||
|
|
||||||
1) xmlGetLastError() returns pointer to a constant xmlError
|
|
||||||
struct, and
|
|
||||||
|
|
||||||
2) xmlSetStructuredErrorFunc() changed the signature of callback
|
|
||||||
(validate_structured_error_nop()), it too is passed pointer to
|
|
||||||
a constant xmlError struct.
|
|
||||||
|
|
||||||
But of course, older libxml2 expects different callback
|
|
||||||
signature. Therefore, we need to typecast it anyway.
|
|
||||||
|
|
||||||
Also, drop obviously incorrect @error annotation in
|
|
||||||
validate_structured_error_nop; the variable is used.
|
|
||||||
|
|
||||||
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
||||||
---
|
|
||||||
tools/osinfo-db-validate.c | 5 +++--
|
|
||||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/tools/osinfo-db-validate.c b/tools/osinfo-db-validate.c
|
|
||||||
index a721b4d..b1434a6 100644
|
|
||||||
--- a/tools/osinfo-db-validate.c
|
|
||||||
+++ b/tools/osinfo-db-validate.c
|
|
||||||
@@ -35,7 +35,7 @@ static void validate_generic_error_nop(void *userData G_GNUC_UNUSED,
|
|
||||||
}
|
|
||||||
|
|
||||||
static void validate_structured_error_nop(void *userData G_GNUC_UNUSED,
|
|
||||||
- xmlErrorPtr error G_GNUC_UNUSED)
|
|
||||||
+ const xmlError *error)
|
|
||||||
{
|
|
||||||
if (error->file)
|
|
||||||
g_printerr("%s:%d %s", error->file, error->line, error->message);
|
|
||||||
@@ -173,7 +173,8 @@ static gboolean validate_files(GFile *schema, gsize nfiles, GFile **files, GErro
|
|
||||||
g_autofree gchar *schemapath = NULL;
|
|
||||||
|
|
||||||
xmlSetGenericErrorFunc(NULL, validate_generic_error_nop);
|
|
||||||
- xmlSetStructuredErrorFunc(NULL, validate_structured_error_nop);
|
|
||||||
+ /* Drop this typecast when >=libxml2-2.12.0 is required */
|
|
||||||
+ xmlSetStructuredErrorFunc(NULL, (xmlStructuredErrorFunc) validate_structured_error_nop);
|
|
||||||
|
|
||||||
schemapath = g_file_get_path(schema);
|
|
||||||
rngParser = xmlRelaxNGNewParserCtxt(schemapath);
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
||||||
|
|
||||||
From 019487cbc79925e49988789bf533c78dab7e1842 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michal Privoznik <mprivozn@redhat.com>
|
|
||||||
Date: Mon, 27 Nov 2023 15:06:04 +0100
|
|
||||||
Subject: [PATCH 2/2] osinfo-db-validate: Add more libxml/ includes
|
|
||||||
|
|
||||||
In its 2.12.0 release, libxml reworked their header files (some
|
|
||||||
might even call it cleaning up, I call it API incompatible
|
|
||||||
change) and now we don't get all declarations we need by just
|
|
||||||
including one file. Add missing includes.
|
|
||||||
|
|
||||||
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
||||||
---
|
|
||||||
tools/osinfo-db-validate.c | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/tools/osinfo-db-validate.c b/tools/osinfo-db-validate.c
|
|
||||||
index b1434a6..f3275db 100644
|
|
||||||
--- a/tools/osinfo-db-validate.c
|
|
||||||
+++ b/tools/osinfo-db-validate.c
|
|
||||||
@@ -20,7 +20,9 @@
|
|
||||||
* Daniel P. Berrange <berrange@redhat.com>
|
|
||||||
*/
|
|
||||||
|
|
||||||
+#include <libxml/parser.h>
|
|
||||||
#include <libxml/relaxng.h>
|
|
||||||
+#include <libxml/tree.h>
|
|
||||||
#include <locale.h>
|
|
||||||
#include <glib/gi18n.h>
|
|
||||||
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user