diff --git a/srcpkgs/osinfo-db-tools/patches/fix-libxml2-2.12.patch b/srcpkgs/osinfo-db-tools/patches/fix-libxml2-2.12.patch deleted file mode 100644 index 62800577432..00000000000 --- a/srcpkgs/osinfo-db-tools/patches/fix-libxml2-2.12.patch +++ /dev/null @@ -1,54 +0,0 @@ -Not currently necessary, but will be with gcc 14 - -From 34378a4ac257f2f5fcf364786d1634a8c36b304f Mon Sep 17 00:00:00 2001 -From: Michal Privoznik -Date: Mon, 27 Nov 2023 15:04:43 +0100 -Subject: [PATCH] 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 - diff --git a/srcpkgs/osinfo-db-tools/template b/srcpkgs/osinfo-db-tools/template index 40cf51a6873..9ccd3f0e389 100644 --- a/srcpkgs/osinfo-db-tools/template +++ b/srcpkgs/osinfo-db-tools/template @@ -1,7 +1,7 @@ # Template file for 'osinfo-db-tools' pkgname=osinfo-db-tools -version=1.10.0 -revision=2 +version=1.12.0 +revision=1 build_style=meson hostmakedepends="pkg-config perl gettext" makedepends="libglib-devel libarchive-devel libxslt-devel @@ -13,4 +13,4 @@ license="GPL-2.0-or-later" homepage="https://libosinfo.org" changelog="https://gitlab.com/libosinfo/osinfo-db-tools/raw/main/NEWS" distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz" -checksum=802cdd53b416706ea5844f046ddcfb658c1b4906b9f940c79ac7abc50981ca68 +checksum=f3315f675d18770f25dea8ed04b20b8fc80efb00f60c37ee5e815f9c3776e7f3