From 9ac33612ba14a444707132f0bbd76aecf23670b0 Mon Sep 17 00:00:00 2001 From: kth5 Date: Mon, 16 Dec 2024 14:01:40 +0100 Subject: [PATCH] * update osinfo-db-tools to 1.12.0-1 --- osinfo-db-tools/.SRCINFO | 29 +++++++ osinfo-db-tools/.nvchecker.toml | 4 + osinfo-db-tools/PKGBUILD | 49 +++++++---- .../osinfo-db-tools-libxml2-2.12.patch | 85 ------------------- 4 files changed, 64 insertions(+), 103 deletions(-) create mode 100644 osinfo-db-tools/.SRCINFO create mode 100644 osinfo-db-tools/.nvchecker.toml delete mode 100644 osinfo-db-tools/osinfo-db-tools-libxml2-2.12.patch diff --git a/osinfo-db-tools/.SRCINFO b/osinfo-db-tools/.SRCINFO new file mode 100644 index 0000000000..7584495b56 --- /dev/null +++ b/osinfo-db-tools/.SRCINFO @@ -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 diff --git a/osinfo-db-tools/.nvchecker.toml b/osinfo-db-tools/.nvchecker.toml new file mode 100644 index 0000000000..eb786fa4a1 --- /dev/null +++ b/osinfo-db-tools/.nvchecker.toml @@ -0,0 +1,4 @@ +[osinfo-db-tools] +source = "git" +git = "https://gitlab.com/libosinfo/osinfo-db-tools.git" +prefix = "v" diff --git a/osinfo-db-tools/PKGBUILD b/osinfo-db-tools/PKGBUILD index 9443b3d83b..8b7cf3903c 100644 --- a/osinfo-db-tools/PKGBUILD +++ b/osinfo-db-tools/PKGBUILD @@ -1,32 +1,45 @@ +# POWER Maintainer: Alexander Baldeck # Maintainer: Balló György pkgname=osinfo-db-tools -pkgver=1.11.0 -pkgrel=2.1 +pkgver=1.12.0 +pkgrel=1 pkgdesc='Tools for managing the osinfo database' arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) url='https://libosinfo.org/' -license=('GPL-2.0-or-later') -depends=('gcc-libs' 'glib2' 'glibc' 'json-glib' 'libarchive' 'libsoup3' 'libxml2') -makedepends=('meson') -checkdepends=('python-pytest' 'python-requests') -source=("https://releases.pagure.org/libosinfo/$pkgname-$pkgver.tar.xz"{,.asc} - 'osinfo-db-tools-libxml2-2.12.patch') -validpgpkeys=('DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF' # Daniel P. Berrange - '09B9C8FF223EF113AFA06A39EE926C2BDACC177B' # Fabiano Fidêncio - '206D3B352F566F3B0E6572E997D9123DE37A484F') # Victor Toso de Carvalho -sha256sums=('8ba6d31bb5ef07056e38879e070671afbcfec0eb41a87f9950450bbb831b0a1d' - 'SKIP' - '5088a4d8e141d1ced604e93498f65b1d1aeb0c1f29db9098dad89231ceeb2b5d') +license=(GPL-2.0-or-later) +depends=( + gcc-libs + glib2 + glibc + json-glib + libarchive + libsoup3 + libxml2 +) +makedepends=( + 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 +) prepare() { - # Fix build with libxml2 2.12 - # https://gitlab.com/libosinfo/osinfo-db-tools/-/merge_requests/80 - patch -d $pkgname-$pkgver -Np1 -i ../osinfo-db-tools-libxml2-2.12.patch + cd $pkgname + sed -i 's/-Werror//' meson.build } build() { - arch-meson $pkgname-$pkgver build + arch-meson $pkgname build meson compile -C build } diff --git a/osinfo-db-tools/osinfo-db-tools-libxml2-2.12.patch b/osinfo-db-tools/osinfo-db-tools-libxml2-2.12.patch deleted file mode 100644 index af42e41229..0000000000 --- a/osinfo-db-tools/osinfo-db-tools-libxml2-2.12.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 34378a4ac257f2f5fcf364786d1634a8c36b304f Mon Sep 17 00:00:00 2001 -From: Michal Privoznik -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 ---- - 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 -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 ---- - 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 - */ - -+#include - #include -+#include - #include - #include - --- -GitLab -