diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-12-03 10:59:06 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-12-03 10:59:06 +0000 |
commit | 09abaf880cd5b1ca2d0d7c320780f91fb3a0428f (patch) | |
tree | 1179bca49724a1a4f4b3b85773f318d7986efc35 /app-emulation/libvirt-glib | |
parent | ee80da75aff1346bee8179e97b9ff83a8eaaabaf (diff) |
gentoo auto-resync : 03:12:2023 - 10:59:05
Diffstat (limited to 'app-emulation/libvirt-glib')
5 files changed, 173 insertions, 2 deletions
diff --git a/app-emulation/libvirt-glib/Manifest b/app-emulation/libvirt-glib/Manifest index 8f1fed0d4f2e..6c35bd8b8d13 100644 --- a/app-emulation/libvirt-glib/Manifest +++ b/app-emulation/libvirt-glib/Manifest @@ -1,3 +1,7 @@ +AUX libvirt-glib-4.0.0-Make-xmlError-structs-constant.patch 2524 BLAKE2B bc9f6212ccd11555eeae7180e40c5f342b095db94f670bacc83af3f24099e4e3072b5b4606b7f9eab767fa4964e774d30c0f6019291cc92d28b272e056e7c149 SHA512 3d504a16d3526acddad83b74641e52c34c8a592de3a13a8be6f853f811a9e9e1b2c3f9cd8e8e552ce1581c4a102c812c26384ec445d0188ff57430f65f8d4cc3 +AUX libvirt-glib-4.0.0-libvirt-gconfig-Add-more-libxml-includes.patch 1776 BLAKE2B 35e1a01a15cda34874cc1416c1615b01a7f8ac17c42abf52d8e23e278a785b3484d768fcfdac8a81b6f29894a8a6cc09dc53074664b3c874db9d1e10ef376bb7 SHA512 f6afee71e49906a074343af82547c7d791a7ad277bb0dcf418bb0d8ea6cfb3477ec60030ac2e0aac28e0519225820c40e2c606d2cb6cf1804c9833b2a5947b03 DIST libvirt-glib-4.0.0.tar.xz 161836 BLAKE2B e196d1f02f6f202b1883500241bbfda963b34ee12bd945b3fa897f84f55a049f98e0429132ccfad7168e5ba2b41245e9e7e3817a7f057e0dc40b674ca6c9b661 SHA512 e1b99e80aa671fa5a4d7f7f7a4ea70ce7c5fdaf97574407f79aa11a75dd177e1e3f92027728a83ded62e305852bbda76eb90326aaa1f5f19b77272b008351810 -EBUILD libvirt-glib-4.0.0.ebuild 1053 BLAKE2B e17965cd6ed817605e862cfdf9e8fb3305490d599ba27492c7922176ce167e77f9a76046854d11be30b0da78f5c94e5f504568d55751a5c40d59c58498564ca5 SHA512 fb211f01668271278ac6af2a77194666cc25a5e774983fd90f5f2e254b302d8af857d83d903d9f26971e46aef27414024b5ab9b38ff40db558664a6abae7ac74 +DIST libvirt-glib-5.0.0.tar.xz 169416 BLAKE2B e80ac0cd8d39432d554e566f4e1e045ada14e66917735c1c8a6306a65272216d095f21170e1b5294e09f41aaf2a3259ad395b134087a1bc13b176afd675dcc26 SHA512 bb09474c0d6d4bc00844e7a1ede882f0834d0810804b70b8f8607f2e764f72cc9da14883794e58dd53640433ffaecc13dd3c1c147b82e86fa2fdca6e5903933c +EBUILD libvirt-glib-4.0.0.ebuild 1204 BLAKE2B d5b2dec4dad744a6e1a972efcf72b15bac5856fef91ea0c3700cb7b95d8e8cc6d35992f5a2bbceb0e69115e49ba3290f03024dc9dfac132a455ff0918bca2336 SHA512 865f348c48a0386bbcddac2a198962a6828fce08805a3edfec83eeb82a634f3c338ed312406b14b413000d8aa0a6a4340127dc32bc402bfe7a484f296328e8e9 +EBUILD libvirt-glib-5.0.0.ebuild 1055 BLAKE2B 44fced7ba0ade173f2a2c05feb0b1bb4a6383c77c538c991a952634ac64f41815e529beafddc89631b259ffa65a9ede953e1b6523d57c7eab5fac76ae98c7e11 SHA512 6275703e1ee4adb823137acead4fc3505f70f51cb343ed702d21a73ac69f218d06a7a96b4e3a8831f343decc888ddb43d5ee4fde134796bdb7f373fd21f51049 MISC metadata.xml 447 BLAKE2B f40aac6909d57d1d003987dd50fb0b9cf7a91053c37b3986f801e8376dcc6390c767507d262708f0caa4f8e0106fb17d638cc633c86724a9546f89120f9aa3e8 SHA512 b5ebae9b402c12eb5626bd21ef65eed93ff483c158ffdd96bd545726b4f17358b2946e5a6e7606ab4922ec91df256a571dd5c145041ec739a1fd9dc77ba6ff24 diff --git a/app-emulation/libvirt-glib/files/libvirt-glib-4.0.0-Make-xmlError-structs-constant.patch b/app-emulation/libvirt-glib/files/libvirt-glib-4.0.0-Make-xmlError-structs-constant.patch new file mode 100644 index 000000000000..654436a65d99 --- /dev/null +++ b/app-emulation/libvirt-glib/files/libvirt-glib-4.0.0-Make-xmlError-structs-constant.patch @@ -0,0 +1,64 @@ +From 56acbe8a0765a02418f80fb3599b3cf7160ef446 Mon Sep 17 00:00:00 2001 +Message-ID: <56acbe8a0765a02418f80fb3599b3cf7160ef446.1701156704.git.mprivozn@redhat.com> +From: Michal Privoznik <mprivozn@redhat.com> +Date: Sat, 25 Nov 2023 07:13:33 +0100 +Subject: [glib 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 + (gvir_xml_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. + +Signed-off-by: Michal Privoznik <mprivozn@redhat.com> +--- + libvirt-gconfig/libvirt-gconfig-helpers.c | 2 +- + libvirt-gconfig/libvirt-gconfig-object.c | 5 +++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/libvirt-gconfig/libvirt-gconfig-helpers.c b/libvirt-gconfig/libvirt-gconfig-helpers.c +index e8f9664..37075e3 100644 +--- a/libvirt-gconfig/libvirt-gconfig-helpers.c ++++ b/libvirt-gconfig/libvirt-gconfig-helpers.c +@@ -41,7 +41,7 @@ static GError *gvir_config_error_new_literal(GQuark domain, + gint code, + const gchar *message) + { +- xmlErrorPtr xerr = xmlGetLastError(); ++ const xmlError *xerr = xmlGetLastError(); + + if (!xerr) + return NULL; +diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c +index eb8763e..1fcc667 100644 +--- a/libvirt-gconfig/libvirt-gconfig-object.c ++++ b/libvirt-gconfig/libvirt-gconfig-object.c +@@ -59,7 +59,7 @@ static void gvir_xml_generic_error_nop(void *userData G_GNUC_UNUSED, + } + + static void gvir_xml_structured_error_nop(void *userData G_GNUC_UNUSED, +- xmlErrorPtr error G_GNUC_UNUSED) ++ const xmlError *error G_GNUC_UNUSED) + { + } + +@@ -197,7 +197,8 @@ void gvir_config_object_validate(GVirConfigObject *config, + priv = config->priv; + + xmlSetGenericErrorFunc(NULL, gvir_xml_generic_error_nop); +- xmlSetStructuredErrorFunc(NULL, gvir_xml_structured_error_nop); ++ /* Drop this typecast when >=libxml2-2.12.0 is required */ ++ xmlSetStructuredErrorFunc(NULL, (xmlStructuredErrorFunc) gvir_xml_structured_error_nop); + + if (!priv->node) { + gvir_config_set_error_literal(err, +-- +2.41.0 + diff --git a/app-emulation/libvirt-glib/files/libvirt-glib-4.0.0-libvirt-gconfig-Add-more-libxml-includes.patch b/app-emulation/libvirt-glib/files/libvirt-glib-4.0.0-libvirt-gconfig-Add-more-libxml-includes.patch new file mode 100644 index 000000000000..7a13eb211e20 --- /dev/null +++ b/app-emulation/libvirt-glib/files/libvirt-glib-4.0.0-libvirt-gconfig-Add-more-libxml-includes.patch @@ -0,0 +1,50 @@ +From bcc82de1d74057f6d124c2eaff0ac97cbbf52657 Mon Sep 17 00:00:00 2001 +Message-ID: <bcc82de1d74057f6d124c2eaff0ac97cbbf52657.1701156704.git.mprivozn@redhat.com> +In-Reply-To: <56acbe8a0765a02418f80fb3599b3cf7160ef446.1701156704.git.mprivozn@redhat.com> +References: <56acbe8a0765a02418f80fb3599b3cf7160ef446.1701156704.git.mprivozn@redhat.com> +From: Michal Privoznik <mprivozn@redhat.com> +Date: Sat, 25 Nov 2023 07:15:46 +0100 +Subject: [glib PATCH 2/2] libvirt-gconfig: 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. + +Resolves: https://gitlab.com/libvirt/libvirt-glib/-/issues/6 +Signed-off-by: Michal Privoznik <mprivozn@redhat.com> +--- + libvirt-gconfig/libvirt-gconfig-helpers.c | 1 + + libvirt-gconfig/libvirt-gconfig-object.c | 3 +++ + 2 files changed, 4 insertions(+) + +diff --git a/libvirt-gconfig/libvirt-gconfig-helpers.c b/libvirt-gconfig/libvirt-gconfig-helpers.c +index 37075e3..4dbb177 100644 +--- a/libvirt-gconfig/libvirt-gconfig-helpers.c ++++ b/libvirt-gconfig/libvirt-gconfig-helpers.c +@@ -25,6 +25,7 @@ + + #include <string.h> + ++#include <libxml/parser.h> + #include <libxml/xmlerror.h> + #include <glib/gi18n-lib.h> + +diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c +index 1fcc667..4dd189d 100644 +--- a/libvirt-gconfig/libvirt-gconfig-object.c ++++ b/libvirt-gconfig/libvirt-gconfig-object.c +@@ -25,7 +25,10 @@ + + #include <string.h> + ++#include <libxml/tree.h> ++#include <libxml/entities.h> + #include <libxml/relaxng.h> ++ + #include <glib/gi18n-lib.h> + + #include "libvirt-gconfig/libvirt-gconfig.h" +-- +2.41.0 + diff --git a/app-emulation/libvirt-glib/libvirt-glib-4.0.0.ebuild b/app-emulation/libvirt-glib/libvirt-glib-4.0.0.ebuild index 22cba180aefe..8e52a89d36ff 100644 --- a/app-emulation/libvirt-glib/libvirt-glib-4.0.0.ebuild +++ b/app-emulation/libvirt-glib/libvirt-glib-4.0.0.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=7 @@ -31,6 +31,11 @@ BDEPEND=" vala? ( $(vala_depend) ) " +PATCHES=( + "${FILESDIR}"/${PN}-4.0.0-Make-xmlError-structs-constant.patch + "${FILESDIR}"/${PN}-4.0.0-libvirt-gconfig-Add-more-libxml-includes.patch +) + src_prepare() { default use vala && vala_src_prepare diff --git a/app-emulation/libvirt-glib/libvirt-glib-5.0.0.ebuild b/app-emulation/libvirt-glib/libvirt-glib-5.0.0.ebuild new file mode 100644 index 000000000000..8b22083a5ab3 --- /dev/null +++ b/app-emulation/libvirt-glib/libvirt-glib-5.0.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson vala + +DESCRIPTION="GLib and GObject mappings for libvirt" +HOMEPAGE="https://libvirt.org/ https://gitlab.com/libvirt/libvirt-glib/" +SRC_URI="https://libvirt.org/sources/glib/${P}.tar.xz" +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="gtk-doc +introspection test +vala" +RESTRICT="!test? ( test )" +REQUIRED_USE="vala? ( introspection )" + +RDEPEND=" + >=dev-libs/libxml2-2.9.1 + >=app-emulation/libvirt-2.3.0:= + >=dev-libs/glib-2.48.0:2 + introspection? ( >=dev-libs/gobject-introspection-1.48.0:= ) +" +DEPEND="${RDEPEND}" + +BDEPEND=" + dev-util/glib-utils + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc + app-text/docbook-xml-dtd:4.3 ) + vala? ( $(vala_depend) ) +" + +src_prepare() { + default + use vala && vala_src_prepare +} + +src_configure() { + local emesonargs=( + $(meson_feature gtk-doc docs) + $(meson_feature introspection) + $(meson_feature test tests) + $(meson_feature vala vapi) + ) + + meson_src_configure +} |