diff --git a/001-Make-xmlError-structs-constant.patch b/001-Make-xmlError-structs-constant.patch deleted file mode 100644 index 652381c..0000000 --- a/001-Make-xmlError-structs-constant.patch +++ /dev/null @@ -1,46 +0,0 @@ -Subject: Make xmlError structs constant -From: Michal Privoznik mprivozn@redhat.com Mon Nov 27 15:04:43 2023 +0100 -Date: Mon Nov 27 15:04:43 2023 +0100: -Git: 34378a4ac257f2f5fcf364786d1634a8c36b304f - -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 - -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); diff --git a/osinfo-db-tools-1.11.0.tar.xz b/osinfo-db-tools-1.11.0.tar.xz deleted file mode 100644 index deffb9b..0000000 --- a/osinfo-db-tools-1.11.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ba6d31bb5ef07056e38879e070671afbcfec0eb41a87f9950450bbb831b0a1d -size 64792 diff --git a/osinfo-db-tools-1.12.0.tar.xz b/osinfo-db-tools-1.12.0.tar.xz new file mode 100644 index 0000000..5649786 --- /dev/null +++ b/osinfo-db-tools-1.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3315f675d18770f25dea8ed04b20b8fc80efb00f60c37ee5e815f9c3776e7f3 +size 66204 diff --git a/osinfo-db-tools.changes b/osinfo-db-tools.changes index a786a15..ee1dfc9 100644 --- a/osinfo-db-tools.changes +++ b/osinfo-db-tools.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Dec 2 11:12:22 MST 2024 - carnold@suse.com + +- Update to version 1.12.0 (jsc#PED-8910) + * Fix some memory leaks + * Fix runtime warnings on osinfo-db-export + * Adapt to libxml2 changes + * Several CI improvements + * Several translation improvements +- Drop 001-Make-xmlError-structs-constant.patch + ------------------------------------------------------------------- Mon Jul 1 13:35:02 MDT 2024 - carnold@suse.com diff --git a/osinfo-db-tools.spec b/osinfo-db-tools.spec index 57825e0..846de87 100644 --- a/osinfo-db-tools.spec +++ b/osinfo-db-tools.spec @@ -17,14 +17,14 @@ Name: osinfo-db-tools -Version: 1.11.0 +Version: 1.12.0 Release: 0 Summary: Tools for managing the osinfo database License: LGPL-2.1+ and GPL-2.0+ Group: System/Management Url: https://releases.pagure.org/libosinfo/ Source: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.xz -Patch1: 001-Make-xmlError-structs-constant.patch + BuildRequires: gettext-devel BuildRequires: glib2-devel BuildRequires: json-glib-devel