gentoo auto-resync : 13:05:2023 - 05:50:34

5 files changed, 292 insertions, 0 deletions

diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index 6519a49e5110..34640a84185c 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -1,7 +1,12 @@
+AUX at-spi2-core-2.48.2-build-no-dbus-broker.patch 1034 BLAKE2B a384864b1446ceac42515776a1ab47112d3755392b21a1cffe4a341a8b1e4f5600379c9020ab4dc309f6449612b900fbee6c1ec710bacc97b2d9693e13a307d8 SHA512 545c4f64748ce4b6ffc0124375d09f606a414057e3b118fb5d5cd911db1cb57f128693228cae45b3cdbc1e5064985a98e44bc1d77793e2a46dec0edec8dd9fa8
+AUX at-spi2-core-2.48.2-more-build-fixes.patch 3789 BLAKE2B 7e57f7947b7e536aac0af59841470180d0a48048101bf8e0df77c1afb4f08589efa4a3452431b120371f5e948864c2bae8af1e18cc979fbd4fe457f5593de391 SHA512 9a48331ae3b5c25606a875f2a89b1d386dfa8a146e9c46a949f656698421fd7b1816aa46a89307e3adb7bfbeda5850f0a4499131f7528a2a076efa52d493024e
 DIST at-spi2-core-2.46.0.tar.xz 540600 BLAKE2B e3ed9915c39a9f71b64a9753c7f91208d15289fe09a9505b4766df7fa04c3e6e5cdc7b3702315eabbdf70f9fc08b4cca4546353485328ab101e2950a672885d6 SHA512 633af2c02fab3b8cb02e37f929ce80dd5ce28ca5641046ef5e25cb29299530b90028e6c6f318a0c098a4270bed3eab48fb55d6967a76bfadd2520f49de47c770
 DIST at-spi2-core-2.48.0.tar.xz 554000 BLAKE2B b8f513256670d24ae9f08572ae7878f109b5d76090fa4f881b67324d1d270889c648e456fe3ca34aaead9e85589f5ae355c8b4803f35c2cb2ace831051b1000b SHA512 976dce741d640c5b5e006eca53170062ebc91cace0fb74df68606c8443b63317fe271d4e3238d1e3ee3e5586b4a4905c91d7987adb94c8f886a1aaddd54c632e
 DIST at-spi2-core-2.48.1.tar.xz 554220 BLAKE2B 80c67221d1164ed857586450083ed08c201044cf26c7e338b474344c8579d91bb8310746fa57e01c3c41331647c36b17161d2f1ffda750f5484df0837569398b SHA512 31314322287f73a60ec449896d5bdacb7956e14e5baec1634b34685e340ce5c3d0385023350cc31b316886b24fd1af858656dbdc9119a53c880d85761d15a3c1
+DIST at-spi2-core-2.48.2.tar.xz 554056 BLAKE2B 3e499c155a6d8780cb08a714521b530353f8e8a507c42acfbab89ea637413f17f5ecb431574eb862ac47d465f80320f04dedeced0547c0f057b426ea763f6c81 SHA512 e30c9873965bee057eab33b787588a709ba775213c8d9b2ba5382e91be48aa86bedb7d268cb4e07a3980c12a673811f94a423dbaa83fd32c1702a0cbbddb8b44
 EBUILD at-spi2-core-2.46.0.ebuild 1465 BLAKE2B f80766774966d17a0118d0b3e5f843648abd1f2c17c3768a1e30c0f5ec24792fb85cbec5e34d6c9e375f69c59b4567c6163850266472e77e9f79e602eb90b236 SHA512 1cabedef0fc8bd01dff37edd018f9aff71857cd206d487a0b36d2e4442144ad95a0685cbfc5711cef20579b40e0c14b860b87a4fe33207024745ac4e49da98b8
 EBUILD at-spi2-core-2.48.0.ebuild 1785 BLAKE2B b90e1d2377bda0623adc15dea33b254131e70e7203678a60d88860eeaea7d5143df2ea1435453c96c55efab0305b98e8a5812b61737ba2f28837ebbdaa1154fe SHA512 bf003b366d6c5a078732d87f977418cffca604b1b01db7b41911d63997cff02a0a1530e93dab19544e8d9001908cb4500d65f055aaa5dc7e62b78428d2b8e2e6
 EBUILD at-spi2-core-2.48.1.ebuild 1793 BLAKE2B 6cccb8a9eaf7839554404ea18105eeeabeaefaa0b91625b9d981e6ed53e8b921f23ae12e2c9903c62aa4034d64ee95c2416da89fa3e3569042b7233a65a3c35c SHA512 d431a4ebee9585dc3e4fdbf9392c51770951e88a2de91905e91b40712c87eded0bb63c70026d1ca938b8772571a77a20d688972fd364eb12042aa102349f949c
+EBUILD at-spi2-core-2.48.2-r1.ebuild 1990 BLAKE2B 6fbe60f3b1d1b1433cecc5a470d169e1aa6dada7c6c0d37580c5f74a455f2cdcca647cc3bd43e543926ee7d6abbee56bdd244577845045cf476896c5ceddfae4 SHA512 f08248ac4a0144a3f86dd4090c168cd1578b629a082da44c83838ca4dbf42c9ccdbfc031f7788635e47e675eaa1955011fb944b724031a2c86dd7804f8814c76
+EBUILD at-spi2-core-2.48.2.ebuild 1793 BLAKE2B 6cccb8a9eaf7839554404ea18105eeeabeaefaa0b91625b9d981e6ed53e8b921f23ae12e2c9903c62aa4034d64ee95c2416da89fa3e3569042b7233a65a3c35c SHA512 d431a4ebee9585dc3e4fdbf9392c51770951e88a2de91905e91b40712c87eded0bb63c70026d1ca938b8772571a77a20d688972fd364eb12042aa102349f949c
 MISC metadata.xml 353 BLAKE2B a11426ebcc6d7d5d3b6af03001b0da28239ca8374757211ed13e13b2d23f0580a4bbd8a7bdc2f6db655dbff2f4dba8288f45385f628e8b95fb3d5f8ad74fce3b SHA512 ccd21495d004a42ffeb05aeac3667f198b2c21b10c7df7ce7cded2593c668be08c5c5dc3315f52dbda423a3236be6d1ad9a4769f9d753760d5e84a06ffb62281
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}]
+	)
+
+	!<dev-libs/atk-2.46.0
+	!<app-accessibility/at-spi2-atk-2.46.0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? (
+		dev-python/sphinx
+		dev-util/gdbus-codegen
+		>=dev-util/gi-docgen-2021.1
+	)
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-more-build-fixes.patch
+	"${FILESDIR}"/${P}-build-no-dbus-broker.patch
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dsystemd_user_dir="$(systemd_get_userunitdir)"
+		$(meson_native_use_bool gtk-doc docs)
+		$(meson_native_use_feature introspection)
+		$(meson_use systemd use_systemd)
+		$(meson_feature X x11)
+		-Ddisable_p2p=false
+		-Datk_only=false
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	virtx dbus-run-session meson test -C "${BUILD_DIR}" || die
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/{libatspi,atk} || die
+		mv "${ED}"/usr/share/doc/libatspi "${ED}"/usr/share/gtk-doc/libatspi/html || die
+		mv "${ED}"/usr/share/doc/atk "${ED}"/usr/share/gtk-doc/atk/html || die
+	fi
+}
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.48.2.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.48.2.ebuild
new file mode 100644
index 000000000000..0ec5d49b8cfa
--- /dev/null
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.48.2.ebuild
@@ -0,0 +1,67 @@
+# 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"
+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:= )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXtst[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+	)
+
+	!<dev-libs/atk-2.46.0
+	!<app-accessibility/at-spi2-atk-2.46.0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? (
+		dev-python/sphinx
+		dev-util/gdbus-codegen
+		>=dev-util/gi-docgen-2021.1
+	)
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dsystemd_user_dir="$(systemd_get_userunitdir)"
+		$(meson_native_use_bool gtk-doc docs)
+		$(meson_native_use_feature introspection)
+		$(meson_feature X x11)
+		-Ddisable_p2p=false
+		-Datk_only=false
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	virtx dbus-run-session meson test -C "${BUILD_DIR}" || die
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/{libatspi,atk} || die
+		mv "${ED}"/usr/share/doc/libatspi "${ED}"/usr/share/gtk-doc/libatspi/html || die
+		mv "${ED}"/usr/share/doc/atk "${ED}"/usr/share/gtk-doc/atk/html || die
+	fi
+}
diff --git a/app-accessibility/at-spi2-core/files/at-spi2-core-2.48.2-build-no-dbus-broker.patch b/app-accessibility/at-spi2-core/files/at-spi2-core-2.48.2-build-no-dbus-broker.patch
new file mode 100644
index 000000000000..142fa841755c
--- /dev/null
+++ b/app-accessibility/at-spi2-core/files/at-spi2-core-2.48.2-build-no-dbus-broker.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/906235
+https://gitlab.gnome.org/GNOME/at-spi2-core/-/commit/ada254318a0a35e6f9ae3c080963353ead2a8966
+
+From ada254318a0a35e6f9ae3c080963353ead2a8966 Mon Sep 17 00:00:00 2001
+From: Mike Gorse <mgorse@suse.com>
+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 <mgorse@suse.com>
+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