commit: e2a5eb39eb9daf0f600578560eb9f68bb9a26b0f Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Mon Oct 27 11:53:18 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Oct 27 13:04:37 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2a5eb39
app-emulation/qemu: fix gio for passt passt needs gio but not gdbus-codegen. Make gdbus-codegen optional, dbus_display (not handled) which requires it will still fail as expected. Closes: https://bugs.gentoo.org/964165 Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/44350 Closes: https://github.com/gentoo/gentoo/pull/44350 Signed-off-by: Sam James <sam <AT> gentoo.org> app-emulation/qemu/files/qemu-10.1.2-fix_passt.patch | 18 ++++++++++++++++++ app-emulation/qemu/qemu-10.1.2.ebuild | 2 ++ app-emulation/qemu/qemu-9999.ebuild | 1 + 3 files changed, 21 insertions(+) diff --git a/app-emulation/qemu/files/qemu-10.1.2-fix_passt.patch b/app-emulation/qemu/files/qemu-10.1.2-fix_passt.patch new file mode 100644 index 000000000000..9af9454eaf8e --- /dev/null +++ b/app-emulation/qemu/files/qemu-10.1.2-fix_passt.patch @@ -0,0 +1,18 @@ +see https://bugs.gentoo.org/964165, patch sent to qemu-devel ml +passt needs gio but not gdbus-codegen. Make gdbus-codegen optional, +dbus_display which requires it will still fail as expected. +--- a/meson.build ++++ b/meson.build +@@ -1126,8 +1126,7 @@ if not get_option('gio').auto() or have_system + gio = not_found + endif + if gio.found() +- gdbus_codegen = find_program('gdbus-codegen', +- required: get_option('gio')) ++ gdbus_codegen = find_program('gdbus-codegen', required: false) + gio_unix = dependency('gio-unix-2.0', required: get_option('gio'), + method: 'pkg-config') + gio = declare_dependency(dependencies: [gio, gio_unix], +-- +2.51.0 + diff --git a/app-emulation/qemu/qemu-10.1.2.ebuild b/app-emulation/qemu/qemu-10.1.2.ebuild index 906a00598ad1..15e274e3b242 100644 --- a/app-emulation/qemu/qemu-10.1.2.ebuild +++ b/app-emulation/qemu/qemu-10.1.2.ebuild @@ -332,6 +332,7 @@ RDEPEND=" " PATCHES=( + "${FILESDIR}"/${PN}-10.1.2-fix_passt.patch "${FILESDIR}"/${PN}-9.0.0-disable-keymap.patch "${FILESDIR}"/${PN}-9.2.0-capstone-include-path.patch "${FILESDIR}"/${PN}-8.1.0-skip-tests.patch @@ -636,6 +637,7 @@ qemu_src_configure() { $(conf_notuser opengl) $(conf_notuser pam auth-pam) $(conf_notuser passt) + $(conf_notuser passt gio) $(conf_notuser png) $(conf_notuser rbd) $(conf_notuser sasl vnc-sasl) diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 2676d7c9b3ac..b46a9c80b8b0 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -636,6 +636,7 @@ qemu_src_configure() { $(conf_notuser opengl) $(conf_notuser pam auth-pam) $(conf_notuser passt) + $(conf_notuser passt gio) $(conf_notuser png) $(conf_notuser rbd) $(conf_notuser sasl vnc-sasl)
