* [gentoo-commits] repo/gentoo:master commit in: app-accessibility/at-spi2-core/, app-accessibility/at-spi2-core/files/
@ 2018-08-30 22:54 Mart Raudsepp
0 siblings, 0 replies; 3+ messages in thread
From: Mart Raudsepp @ 2018-08-30 22:54 UTC (permalink / raw
To: gentoo-commits
commit: 7439891c294714fa8fa9598defae766ece517c2b
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 30 22:34:31 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Aug 30 22:53:45 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7439891c
app-accessibility/at-spi2-core: bump to 2.26.2
Package-Manager: Portage-2.3.48, Repoman-2.3.10
app-accessibility/at-spi2-core/Manifest | 1 +
.../at-spi2-core/at-spi2-core-2.26.2.ebuild | 55 ++++++++++++++++++++++
.../files/2.26.2-fix-inverted-logic.patch | 28 +++++++++++
3 files changed, 84 insertions(+)
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index 901f45fa8f7..6ea0e4c38af 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -1,2 +1,3 @@
DIST at-spi2-core-2.22.1.tar.xz 454048 BLAKE2B 5ee4cdb83815258d9be8b81870b590b2f85311acf75e3c830c00092cbe5dd66a07f933318ce7d4bc308308f6f87e46579b30948b67b8b7f753adc5e10589246b SHA512 2376b57ce744351ed09a13cd02f0c02264c0998860710cfcdac59f0efb78061512986f5d7305a2f6c594d70213722f81795620e8cd2c6587c6d3f1335477171f
DIST at-spi2-core-2.24.1.tar.xz 452440 BLAKE2B 2e3e262d507dadbdb8fc5bb1bd60d3dbe8a9c2946228b6dc551d0a9564684d96b1b6cbe29849c1d846b3106b5444a2c6880a10825ba20cca87893f6a52815023 SHA512 e7f354a90204f12d4e464a6b4e4cb27141af3715d7c5ec253bdd2ebe65bc7d191ae7b775c45470a1bd1fe2c0accdd4e84feeb5e1eb1a6c05f3e5e734371027be
+DIST at-spi2-core-2.26.2.tar.xz 494484 BLAKE2B 0c67cea9c0107fb6503a933de134eb662f192ae2a98734bde1b0629da151476858720d2dcb1791a00a44b61ae2ead945178fba659f88303c552567d7f3f9817b SHA512 6a8e158e30c37ce475467b6634aff046a318875271966d7bfa3e56052d0cd26cd37435d0b9ae14f079542b8b3e76088da5bd50ed39eb39f3f40394c55ed3f255
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.26.2.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.26.2.ebuild
new file mode 100644
index 00000000000..beb3feab8ee
--- /dev/null
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.26.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib-minimal
+
+DESCRIPTION="D-Bus accessibility specifications and registration daemon"
+HOMEPAGE="https://wiki.gnome.org/Accessibility"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+IUSE="X +introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+
+# x11-libs/libSM is needed until upstream #719808 is solved either
+# making the dep unneeded or fixing their configure
+# Only libX11 is optional right now
+RDEPEND="
+ >=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
+ >=sys-apps/dbus-1[${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+ X? (
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXtst[${MULTILIB_USEDEP}]
+ x11-libs/libXi[${MULTILIB_USEDEP}]
+ )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.25
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+PATCHES=(
+ # disable teamspaces test since that requires Novell.ICEDesktop.Daemon
+ "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
+ "${FILESDIR}/${PV}-fix-inverted-logic.patch"
+)
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ $(multilib_native_use_enable introspection) \
+ $(use_enable X x11)
+
+ # work-around gtk-doc out-of-source brokedness
+ if multilib_is_native_abi; then
+ ln -s "${S}"/doc/libatspi/html doc/libatspi/html || die
+ fi
+}
+
+multilib_src_compile() { gnome2_src_compile; }
+multilib_src_install() { gnome2_src_install; }
diff --git a/app-accessibility/at-spi2-core/files/2.26.2-fix-inverted-logic.patch b/app-accessibility/at-spi2-core/files/2.26.2-fix-inverted-logic.patch
new file mode 100644
index 00000000000..7aa10f8bfc2
--- /dev/null
+++ b/app-accessibility/at-spi2-core/files/2.26.2-fix-inverted-logic.patch
@@ -0,0 +1,28 @@
+From c2e87fe00b596dba20c9d57d406ab8faa744b15a Mon Sep 17 00:00:00 2001
+From: Maya Rashish <maya@NetBSD.org>
+Date: Sat, 2 Dec 2017 13:24:29 +0200
+Subject: [PATCH] Fix inverted logic.
+
+Don't write more into a buffer than it can hold.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=791124
+---
+ bus/at-spi-bus-launcher.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bus/at-spi-bus-launcher.c b/bus/at-spi-bus-launcher.c
+index 261353f..eb2b8e3 100644
+--- a/bus/at-spi-bus-launcher.c
++++ b/bus/at-spi-bus-launcher.c
+@@ -244,7 +244,7 @@ unix_read_all_fd_to_string (int fd,
+ {
+ ssize_t bytes_read;
+
+- while (max_bytes > 1 && (bytes_read = read (fd, buf, MAX (4096, max_bytes - 1))))
++ while (max_bytes > 1 && (bytes_read = read (fd, buf, MIN (4096, max_bytes - 1))))
+ {
+ if (bytes_read < 0)
+ return FALSE;
+--
+2.18.0
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-accessibility/at-spi2-core/, app-accessibility/at-spi2-core/files/
@ 2022-03-21 18:13 Matt Turner
0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2022-03-21 18:13 UTC (permalink / raw
To: gentoo-commits
commit: 77873a347a4f9d40c94d7eb66d12709f92c33ba3
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 18:13:20 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 18:13:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77873a34
app-accessibility/at-spi2-core: Fix build with USE=-X
Closes: https://bugs.gentoo.org/835701
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
.../at-spi2-core/at-spi2-core-2.44.0.ebuild | 1 +
.../files/2.44.0-Fix-build-with-X11-disabled.patch | 38 ++++++++++++++++++++++
2 files changed, 39 insertions(+)
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.44.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.44.0.ebuild
index 6d1568dc223b..ec6aee601bdb 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.44.0.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.44.0.ebuild
@@ -38,6 +38,7 @@ BDEPEND="
PATCHES=(
# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
"${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
+ "${FILESDIR}/${PV}-Fix-build-with-X11-disabled.patch"
)
multilib_src_configure() {
diff --git a/app-accessibility/at-spi2-core/files/2.44.0-Fix-build-with-X11-disabled.patch b/app-accessibility/at-spi2-core/files/2.44.0-Fix-build-with-X11-disabled.patch
new file mode 100644
index 000000000000..bd6dfaaec885
--- /dev/null
+++ b/app-accessibility/at-spi2-core/files/2.44.0-Fix-build-with-X11-disabled.patch
@@ -0,0 +1,38 @@
+From 08036a4c4491eea57d7b713bb4440f541584204b Mon Sep 17 00:00:00 2001
+From: Mike Gorse <mgorse@suse.com>
+Date: Mon, 21 Mar 2022 10:19:03 -0500
+Subject: [PATCH] Fix build with X11 disabled
+
+Closes #51
+---
+ registryd/deviceeventcontroller.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
+index 8a321adc..3068ec4b 100644
+--- a/registryd/deviceeventcontroller.c
++++ b/registryd/deviceeventcontroller.c
+@@ -1720,16 +1720,16 @@ spi_dec_synth_keysym (SpiDEController *controller, long keysym)
+ if (synth_mods != modifiers) {
+ lock_mods = synth_mods & ~modifiers;
+ spi_dec_plat_lock_modifiers (controller, lock_mods);
+- if (modifiers & LockMask)
+- spi_dec_plat_unlock_modifiers (controller, LockMask);
++ if (modifiers & SPI_KEYMASK_SHIFTLOCK)
++ spi_dec_plat_unlock_modifiers (controller, SPI_KEYMASK_SHIFTLOCK);
+ }
+ spi_dec_plat_synth_keycode_press (controller, key_synth_code);
+ spi_dec_plat_synth_keycode_release (controller, key_synth_code);
+
+ if (synth_mods != modifiers) {
+ spi_dec_plat_unlock_modifiers (controller, lock_mods);
+- if (modifiers & LockMask)
+- spi_dec_plat_lock_modifiers (controller, LockMask);
++ if (modifiers & SPI_KEYMASK_SHIFTLOCK)
++ spi_dec_plat_lock_modifiers (controller, SPI_KEYMASK_SHIFTLOCK);
+ }
+ return TRUE;
+ }
+--
+2.34.1
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-accessibility/at-spi2-core/, app-accessibility/at-spi2-core/files/
@ 2023-05-13 2:47 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-05-13 2:47 UTC (permalink / raw
To: gentoo-commits
commit: 2f459d91424eed14539e15652733ff726832094c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 13 02:47:01 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 13 02:47:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f459d91
app-accessibility/at-spi2-core: backport build fixes
Closes: https://bugs.gentoo.org/906235
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../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(+)
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/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
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-05-13 2:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-21 18:13 [gentoo-commits] repo/gentoo:master commit in: app-accessibility/at-spi2-core/, app-accessibility/at-spi2-core/files/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2023-05-13 2:47 Sam James
2018-08-30 22:54 Mart Raudsepp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox