From 2f459d91424eed14539e15652733ff726832094c Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 13 May 2023 03:47:01 +0100 Subject: app-accessibility/at-spi2-core: backport build fixes Closes: https://bugs.gentoo.org/906235 Signed-off-by: Sam James --- .../at-spi2-core/at-spi2-core-2.48.2-r1.ebuild | 74 ++++++++++++++ .../at-spi2-core-2.48.2-build-no-dbus-broker.patch | 33 ++++++ .../at-spi2-core-2.48.2-more-build-fixes.patch | 113 +++++++++++++++++++++ 3 files changed, 220 insertions(+) create mode 100644 app-accessibility/at-spi2-core/at-spi2-core-2.48.2-r1.ebuild create mode 100644 app-accessibility/at-spi2-core/files/at-spi2-core-2.48.2-build-no-dbus-broker.patch create mode 100644 app-accessibility/at-spi2-core/files/at-spi2-core-2.48.2-more-build-fixes.patch (limited to 'app-accessibility/at-spi2-core') diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.48.2-r1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.48.2-r1.ebuild new file mode 100644 index 000000000000..c7c497a3df34 --- /dev/null +++ b/app-accessibility/at-spi2-core/at-spi2-core-2.48.2-r1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org meson-multilib systemd virtualx xdg + +DESCRIPTION="D-Bus accessibility specifications and registration daemon" +HOMEPAGE="https://wiki.gnome.org/Accessibility https://gitlab.gnome.org/GNOME/at-spi2-core" + +LICENSE="LGPL-2.1+" +SLOT="2" +IUSE="X gtk-doc +introspection systemd" +REQUIRED_USE="gtk-doc? ( X )" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" + +RDEPEND=" + >=sys-apps/dbus-1.5[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.67.4:2[${MULTILIB_USEDEP}] + >=dev-libs/libxml2-2.9.1:2[${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-1.54.0:= ) + systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] ) + X? ( + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXtst[${MULTILIB_USEDEP}] + x11-libs/libXi[${MULTILIB_USEDEP}] + ) + + ! +Date: Thu, 11 May 2023 15:42:06 -0500 +Subject: [PATCH] Fix the build when dbus-broker is not found + +--- a/bus/meson.build ++++ b/bus/meson.build +@@ -46,6 +46,7 @@ launcher_args = [ + '-DDATADIR="@0@"'.format(atspi_datadir), + ] + ++dbus_daemon_arg = '' + if get_option('dbus_daemon') != 'default' + dbus_daemon_arg = '-DDBUS_DAEMON="@0@"'.format(get_option('dbus_daemon')) + else +@@ -59,11 +60,10 @@ else + required: false) + if dbus_daemon.found() + dbus_daemon_arg = '-DDBUS_DAEMON="@0@"'.format(dbus_daemon.full_path()) +- else +- dbus_daemon_arg = '' + endif + endif + ++dbus_broker_arg = '' + needs_systemd = false + if get_option('dbus_broker') != 'default' + dbus_broker_arg = '-DDBUS_BROKER="@0@"'.format(get_option('dbus_broker')) +-- +GitLab diff --git a/app-accessibility/at-spi2-core/files/at-spi2-core-2.48.2-more-build-fixes.patch b/app-accessibility/at-spi2-core/files/at-spi2-core-2.48.2-more-build-fixes.patch new file mode 100644 index 000000000000..1508bb88c6be --- /dev/null +++ b/app-accessibility/at-spi2-core/files/at-spi2-core-2.48.2-more-build-fixes.patch @@ -0,0 +1,113 @@ +https://bugs.gentoo.org/906235 +https://gitlab.gnome.org/GNOME/at-spi2-core/-/commit/eaf7a1c931bc9a2016ac23a856bee7c7176de823 + +From eaf7a1c931bc9a2016ac23a856bee7c7176de823 Mon Sep 17 00:00:00 2001 +From: Mike Gorse +Date: Thu, 11 May 2023 15:18:54 -0500 +Subject: [PATCH] More build fixes + +My last commit broke the build where dbus-daemon was set to be used by default. + +Added a use_systemd option that can be set to false to disable systemd. This +cannot be used in combination with dbus-broker and results in dbus-broker +support being disabled. If this option is left set to true, then dbus-broker +support will be enabled if dbus-broker-launch is found on the system, although +dbus-daemon will still be used when available unless default_bus is set to +dbus-broker. + +Fixes #116 +--- a/bus/meson.build ++++ b/bus/meson.build +@@ -47,7 +47,7 @@ launcher_args = [ + ] + + if get_option('dbus_daemon') != 'default' +- launcher_args += '-DDBUS_DAEMON="@0@"'.format(get_option('dbus_daemon')) ++ dbus_daemon_arg = '-DDBUS_DAEMON="@0@"'.format(get_option('dbus_daemon')) + else + dbus_daemon = find_program('dbus-daemon', + '/sbin/dbus-daemon', +@@ -58,37 +58,58 @@ else + '/usr/pkg/bin/dbus-daemon', + required: false) + if dbus_daemon.found() +- launcher_args += '-DDBUS_DAEMON="@0@"'.format(dbus_daemon.full_path()) ++ dbus_daemon_arg = '-DDBUS_DAEMON="@0@"'.format(dbus_daemon.full_path()) ++ else ++ dbus_daemon_arg = '' + endif + endif + + needs_systemd = false + if get_option('dbus_broker') != 'default' +- launcher_args += '-DDBUS_BROKER="@0@"'.format(get_option('dbus_broker')) +- if get_option('default_bus') != 'dbus-daemon' +- needs_systemd = true +- endif ++ dbus_broker_arg = '-DDBUS_BROKER="@0@"'.format(get_option('dbus_broker')) ++ needs_systemd = true + else + dbus_broker = find_program('dbus-broker-launch', + required: false) + if dbus_broker.found() +- launcher_args += '-DDBUS_BROKER="@0@"'.format(dbus_broker.full_path()) ++ dbus_broker_arg = '-DDBUS_BROKER="@0@"'.format(dbus_broker.full_path()) + if get_option('default_bus') != 'dbus-daemon' + needs_systemd = true + endif + endif + endif + +-if get_option('default_bus') == 'dbus-broker' +- launcher_args += '-DWANT_DBUS_BROKER' ++if not get_option('use_systemd') ++ if needs_systemd ++ error('Systemd is required for dbus-broker, but use_systemd is set to false.') ++ endif ++ dbus_broker_arg = '' + endif + +-if needs_systemd +- systemd_dep = dependency('libsystemd') ++if dbus_broker_arg != '' ++ if needs_systemd ++ systemd_dep = dependency('libsystemd') ++ else ++ systemd_dep = dependency('libsystemd', required: false) ++ if not systemd_dep.found() ++ dbus_broker_arg = '' ++ endif ++ endif + else + systemd_dep = dependency('', required: false) + endif + ++if dbus_daemon_arg != '' ++ launcher_args += dbus_daemon_arg ++endif ++if dbus_broker_arg != '' ++ launcher_args += dbus_broker_arg ++endif ++ ++if get_option('default_bus') == 'dbus-broker' ++ launcher_args += '-DWANT_DBUS_BROKER' ++endif ++ + executable('at-spi-bus-launcher', 'at-spi-bus-launcher.c', + include_directories: [ root_inc, include_directories('.') ], + dependencies: [ gio_dep, systemd_dep, x11_deps ], +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -15,6 +15,10 @@ option('default_bus', + type: 'combo', + choices: ['dbus-daemon', 'dbus-broker'], + value: 'dbus-daemon') ++option('use_systemd', ++ description: 'Use systemd if available (needed for dbus-broker)', ++ type: 'boolean', ++ value: true) + option('systemd_user_dir', + description: 'Location of the systemd user services', + type: 'string', +-- +GitLab -- cgit v1.2.3-65-gdbad