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

4 files changed, 105 insertions, 2 deletions

diff --git a/sys-libs/libosinfo/Manifest b/sys-libs/libosinfo/Manifest
index 173b07b65b87..d023b7032a64 100644
--- a/sys-libs/libosinfo/Manifest
+++ b/sys-libs/libosinfo/Manifest
@@ -1,4 +1,7 @@
 AUX 1.10.0-build-Add-option-to-disable-libsoup3.patch 1484 BLAKE2B a67153267432e60910e9f013dcc1aee243da3488386fac2b3a79e1d08df47aa5612289bcf7c62866ed919da0f67bb8d6e542bba309f632cfbe5d4ff9e7843d5c SHA512 34a819fd67ef78b55064d663652ff78bf2110521c4fd333e650975728bbec32c0680bf522b5c2e21c62061194acdd497ff0ac0bad652a30ca2eaeb9b6712b792
+AUX 1.11.0-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch 1128 BLAKE2B 3c31f3da071de6f37e44548a93770eb64f45e38a6c22a0adad1c017e4c8997b63746db70ba959a4bfb19df11d3cf9773074c2c524d33ecaa6ca1cc416e43d022 SHA512 4030610edfb596b4b026d3ef5347d6355b49f5dd4efeedb41e0249d611958fc07fc6752f82c9a2e255ba9bd5298a3c9792e89c2f60e56aa4464e18d178bd1686
 DIST libosinfo-1.10.0.tar.xz 293804 BLAKE2B 5c676a466459c4e4150294fd263cd32ed95f181a3dea913977165f61dd81d75fb545dd96d0f87661ea13db9f10706c064421a5ecf0ec1b220054149c66c957d1 SHA512 58a30d62d5a4862150826fd9fda3d5189df3693efca3a8732efaa470fa65dbb64181987534ccc13c0bf2fd4efda229217a169590405f0601927472f6ca08e4e7
-EBUILD libosinfo-1.10.0-r1.ebuild 1630 BLAKE2B e0214e6f69816a58d1cd75b716e42546f4753829fe7133d6b575400b991eee3ba2d3e743de2a52b7c9638319256634affb7c4d349437d7ef5cee0cf7315afeb5 SHA512 c766c3f5f889709ccf1b1be9d5b6e3a0f4a67189ee54d8e52da7bdd5c5c5cd83bc99394eae12c6cd20df5dbd63c54f900730e4272b5682289547ed6139fd1dea
+DIST libosinfo-1.11.0.tar.xz 303944 BLAKE2B 3d61d66c6ef7a9e2706a1a5dd17d8ceff4538a8ff5988eb81509cbd81673dd193b3685092842d7dbb37e6f92c7ed1f915fcf71cf5db5cad8482f230b3ce066ac SHA512 d1b527cc50eaa92e143f068d9a484a1e591dafb77e65e0172e43d6d6440970c5c3b4e2d65050fd0d64f39d1163d49b339ae6d75943306917b4b367c26a938fb6
+EBUILD libosinfo-1.10.0-r1.ebuild 1711 BLAKE2B a1d8d2d7512ff7fa8296ed59634a583ec9820d803cd150fe34cdd5a11aa2342040c7e5ed465c9053efbdff3f583fe6ef5d971a42ead6f163410764ffdae2fb21 SHA512 107dd79454a45258d907c0c45fba1e6896c9f4abc5efd1c038d404b552bd6edaf6033ab37c68accc279ce3134dabd9ee1e47bf4042a4dc258e71100c63b3ae1c
+EBUILD libosinfo-1.11.0.ebuild 1648 BLAKE2B 6286ca369ab77550b6cb2104038d46288a91e409af45eec3a5f7d38a586c987c15b3a3d21d103be2ae1794290dcdef4f6ef22fb3ea8e9094fe5289dfc4758875 SHA512 ec29bdeefd5910e3c2e9fdd3070c44a6cbbf19e4b9b374ba05d7d287b0b3c3b90417499e7ccc1025f400deb59399fb9b0bbc5cc956e4642d79b2e9c5951c20db
 MISC metadata.xml 348 BLAKE2B 3bf0a4c2898ac80214a7d8856d743829706c8289dcf752874c44ff0cc7e07af29a50b2dbf271983a87db47774334ad4613516d7d3340fca7824f2fa6c1b12be8 SHA512 1cd02c1f8716f281eb4f9aafb3d02edd09ef2a2fe95f5035fae5759dcc371841225d41cf908acd43d8973bc4da31c15983ae27c24650f7c244decd37d66b4074
diff --git a/sys-libs/libosinfo/files/1.11.0-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch b/sys-libs/libosinfo/files/1.11.0-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch
new file mode 100644
index 000000000000..ea05c46a03b0
--- /dev/null
+++ b/sys-libs/libosinfo/files/1.11.0-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch
@@ -0,0 +1,32 @@
+From 5bbdd06503456784c5ffa22409e8bab50470d673 Mon Sep 17 00:00:00 2001
+Message-ID: <5bbdd06503456784c5ffa22409e8bab50470d673.1701161424.git.mprivozn@redhat.com>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Mon, 27 Nov 2023 15:11:45 +0100
+Subject: [PATCH] osinfo: Make xmlError struct constant in
+ propagate_libxml_error()
+
+In libxml2 commit v2.12.0~14 the API changed so that
+xmlGetLastError() returns pointer to a constant xmlError struct.
+Reflect this change in our code.
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ osinfo/osinfo_install_script.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
+index 5800f37..303245a 100644
+--- a/osinfo/osinfo_install_script.c
++++ b/osinfo/osinfo_install_script.c
+@@ -769,7 +769,7 @@ static void propagate_libxml_error(GError **error, const char *format, ...) G_GN
+ 
+ static void propagate_libxml_error(GError **error, const char *format, ...)
+ {
+-    xmlErrorPtr err = xmlGetLastError();
++    const xmlError *err = xmlGetLastError();
+     char *prefix;
+     va_list ap;
+ 
+-- 
+2.41.0
+
diff --git a/sys-libs/libosinfo/libosinfo-1.10.0-r1.ebuild b/sys-libs/libosinfo/libosinfo-1.10.0-r1.ebuild
index 4fa2dfb2d4b2..d70c59d07408 100644
--- a/sys-libs/libosinfo/libosinfo-1.10.0-r1.ebuild
+++ b/sys-libs/libosinfo/libosinfo-1.10.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -45,6 +45,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-build-Add-option-to-disable-libsoup3.patch
+	"${FILESDIR}"/1.11.0-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch
 )
 
 src_prepare() {
diff --git a/sys-libs/libosinfo/libosinfo-1.11.0.ebuild b/sys-libs/libosinfo/libosinfo-1.11.0.ebuild
new file mode 100644
index 000000000000..97e6f8c0293f
--- /dev/null
+++ b/sys-libs/libosinfo/libosinfo-1.11.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson vala xdg
+
+DESCRIPTION="GObject library for managing information about real and virtual OSes"
+HOMEPAGE="https://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="gtk-doc +introspection +vala test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# Unsure about osinfo-db-tools rdep, but at least fedora does it too
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	net-libs/libsoup:3.0
+	>=dev-libs/libxml2-2.6.0
+	>=dev-libs/libxslt-1.0.0
+	sys-apps/hwdata
+	sys-apps/osinfo-db-tools
+	sys-apps/osinfo-db
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+"
+DEPEND="${RDEPEND}"
+# perl dep is for pod2man for automagic manpage building
+BDEPEND="
+	dev-lang/perl
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.10
+		app-text/docbook-xml-dtd:4.3
+	)
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch
+)
+
+src_prepare() {
+	default
+	use vala && vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc enable-gtk-doc)
+		$(meson_feature introspection enable-introspection)
+		$(meson_use test enable-tests)
+		$(meson_feature vala enable-vala)
+		-Dlibsoup-abi=3.0
+		-Dwith-pci-ids-path="${EPREFIX}"/usr/share/hwdata/pci.ids
+		-Dwith-usb-ids-path="${EPREFIX}"/usr/share/hwdata/usb.ids
+	)
+	meson_src_configure
+}