gentoo auto-resync : 03:12:2023 - 10:59:05

5 files changed, 149 insertions, 1 deletions

diff --git a/sys-apps/osinfo-db-tools/Manifest b/sys-apps/osinfo-db-tools/Manifest
index 7c4a61de2189..f7af0585a63b 100644
--- a/sys-apps/osinfo-db-tools/Manifest
+++ b/sys-apps/osinfo-db-tools/Manifest
@@ -1,5 +1,9 @@
 AUX osinfo-db-tools-1.10.0-no-clobber-fortify-source.patch 357 BLAKE2B 6f03e39bdce770d98188fc792ec0f47b14c0662aee992ab034a97554261fd977c2e7cfa21b95eb6934eff3909f0af6857570642ef66088d4d6809142863a47cc SHA512 ab561d3c3134a870f6d50c08358114d9052c354eb9d91fdc3f5605d61404ff6aa03b281e21a7e7ea47ec006cc54220de4e45eca2e6ac05f31097829c1b6f9943
+AUX osinfo-db-tools-1.11.0-Make-xmlError-structs-constant.patch 2087 BLAKE2B 91486144c791ee881efc73db1a6ccc05fc8da97c2c84e5513c56bf22569a365e05371b440e963f751ff0908169d4b3ce13f1450cd566040e71a4e67425ae2b0b SHA512 70862e35522c59e0b7acdf7e7f665ac30446e2f14e8bf7ad5e66119700306540505fac45811ef58c8c59034ce0abfedd5a88f3dfdc752e59c6b4d5f3e4bf07a0
+AUX osinfo-db-tools-1.11.0-osinfo-db-validate-Add-more-libxml-includes.patch 1229 BLAKE2B b15f56f2ec7ba9e49ba62e6d80ea26f11f838cbac48533bfb5a9b3a620ef6177c8f2d68c0d46b7506e5dbcc534edebd42be72d0ebf705ac9ed4c36c4e563ed60 SHA512 233a5d37735213b838eb6d3f3e923d617be01158601bd0a66cf2d832a783596f1cf6fc23674f788ddf0c7688ca7bd7d1906401f52284909831d09401cb3a8dcf
 DIST osinfo-db-tools-1.10.0.tar.xz 60508 BLAKE2B 2b9abbdba25add96440e2a937ae994c0305f995b924ffc7c88c2c31c122d3e5cf0c710fbf55724bea56f63be7250321ee27d2179e3f247461d6843f7e03dfc58 SHA512 27271b15404a6cb0065854ba8556c272cf3427ff4fd18fc9a22dbca2b01686c32661b24e18f5eff9a1b240a3a459d8fe66cbde530873d60b8c850bdd0b42c475
+DIST osinfo-db-tools-1.11.0.tar.xz 64792 BLAKE2B fc085da5bad46c5c178bdd09cc294c8f0f208cbd3ee4dda9e22bd681cac70913bc4dc9a11d44d252b5d7cb33b8a5625aca7c285ae098f72839e5fe4d2238c157 SHA512 adab5b16d8fcbae89619eb12f669fa4c7765a65af54a864995e3a9131bb18ee62568c8f7ed166f0400e5e622f56844ba53ed9ef5c2322e33acb9ef1cf0c94701
 EBUILD osinfo-db-tools-1.10.0-r1.ebuild 1060 BLAKE2B 2870ce831be5a755d00d37781f28dd299f764032afd98583cb25a9167575f7132b330c5c49fcab3cf6835e8caaac2bf2b8a5c07f276c28829bc0b84b94e961ba SHA512 4e0ad4203bb3378d73a43597f474261ac3faaa6ee2a55f8a1e0c93155c708f2b059a8679f09db0ff45a41bc4e0808359de4e41d03b9d2098c8691d0590738a1b
-EBUILD osinfo-db-tools-1.10.0-r2.ebuild 1136 BLAKE2B 9dff6db6be528aa9080908366d223c6499149f3de783dc1840d3d8723bb7727c054227255991ad0101cfed45d4ea80b50c2ef31489a68500ba59263e529dfbba SHA512 b748818fa3bf010811da3f3ba6ee7ed54da556d2bbff7be41f6ea7ffdd062dfc5ea06edddd245987bacdfb43489cb553911c572759071b57c709dde5b21be068
+EBUILD osinfo-db-tools-1.10.0-r2.ebuild 1279 BLAKE2B 3105a5b331d8c01dcb457733394eefc1464e86eb689be43088fe2e289791da60d7e6a7bddd5c7eae6b3e110b3506eed7353acc07f567359965e52f939c2813ce SHA512 3033d08426eb3e9462f806c6d308162ada8565c4c5d1c5b1d1a5c4357fae00b0e04b789b250537ce881a153c1621ad55e753bd885bbc2da2a9c849340f72cbe3
+EBUILD osinfo-db-tools-1.11.0.ebuild 1279 BLAKE2B 3105a5b331d8c01dcb457733394eefc1464e86eb689be43088fe2e289791da60d7e6a7bddd5c7eae6b3e110b3506eed7353acc07f567359965e52f939c2813ce SHA512 3033d08426eb3e9462f806c6d308162ada8565c4c5d1c5b1d1a5c4357fae00b0e04b789b250537ce881a153c1621ad55e753bd885bbc2da2a9c849340f72cbe3
 MISC metadata.xml 354 BLAKE2B d60564aa9028df9e48d1213b20c33f1057fd21becf7ecf5f3004138fd5eac922b36d5c609d2bbdb03a8208d9a6f5a2969982c68b9ea9bee5c4e212e0caabd4fa SHA512 e6377db8098215eafb31f39fcbbf7982702419d3be0a7ad4a8299e0073d59e79f44d45e2c232fda0276e1f1ebf476ad19028bde0d780b662b1ffe3fa1817ba39
diff --git a/sys-apps/osinfo-db-tools/files/osinfo-db-tools-1.11.0-Make-xmlError-structs-constant.patch b/sys-apps/osinfo-db-tools/files/osinfo-db-tools-1.11.0-Make-xmlError-structs-constant.patch
new file mode 100644
index 000000000000..964b2c10b6ec
--- /dev/null
+++ b/sys-apps/osinfo-db-tools/files/osinfo-db-tools-1.11.0-Make-xmlError-structs-constant.patch
@@ -0,0 +1,53 @@
+From 34378a4ac257f2f5fcf364786d1634a8c36b304f Mon Sep 17 00:00:00 2001
+Message-ID: <34378a4ac257f2f5fcf364786d1634a8c36b304f.1701158114.git.mprivozn@redhat.com>
+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);
+-- 
+2.41.0
+
diff --git a/sys-apps/osinfo-db-tools/files/osinfo-db-tools-1.11.0-osinfo-db-validate-Add-more-libxml-includes.patch b/sys-apps/osinfo-db-tools/files/osinfo-db-tools-1.11.0-osinfo-db-validate-Add-more-libxml-includes.patch
new file mode 100644
index 000000000000..c823465fe227
--- /dev/null
+++ b/sys-apps/osinfo-db-tools/files/osinfo-db-tools-1.11.0-osinfo-db-validate-Add-more-libxml-includes.patch
@@ -0,0 +1,35 @@
+From 019487cbc79925e49988789bf533c78dab7e1842 Mon Sep 17 00:00:00 2001
+Message-ID: <019487cbc79925e49988789bf533c78dab7e1842.1701158114.git.mprivozn@redhat.com>
+In-Reply-To: <34378a4ac257f2f5fcf364786d1634a8c36b304f.1701158114.git.mprivozn@redhat.com>
+References: <34378a4ac257f2f5fcf364786d1634a8c36b304f.1701158114.git.mprivozn@redhat.com>
+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>
+ 
+-- 
+2.41.0
+
diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0-r2.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0-r2.ebuild
index 220ff049a956..49f4ca477a35 100644
--- a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0-r2.ebuild
+++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0-r2.ebuild
@@ -40,6 +40,8 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.10.0-no-clobber-fortify-source.patch
+	"${FILESDIR}"/${PN}-1.11.0-Make-xmlError-structs-constant.patch
+	"${FILESDIR}"/${PN}-1.11.0-osinfo-db-validate-Add-more-libxml-includes.patch
 )
 
 python_check_deps() {
diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.11.0.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.11.0.ebuild
new file mode 100644
index 000000000000..49f4ca477a35
--- /dev/null
+++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.11.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit meson python-any-r1
+
+DESCRIPTION="Tools for managing the osinfo database"
+HOMEPAGE="https://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	dev-libs/json-glib
+	>=app-arch/libarchive-3.0.0:=
+	net-libs/libsoup:3.0
+	>=dev-libs/libxml2-2.6.0
+"
+# perl dep is for pod2man (manpages)
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.19.8
+	dev-lang/perl
+	test? (
+		$(python_gen_any_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10.0-no-clobber-fortify-source.patch
+	"${FILESDIR}"/${PN}-1.11.0-Make-xmlError-structs-constant.patch
+	"${FILESDIR}"/${PN}-1.11.0-osinfo-db-validate-Add-more-libxml-includes.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \
+	python_has_version "dev-python/requests[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}