diff options
| -rw-r--r-- | app-accessibility/at-spi2-atk/ChangeLog | 10 | ||||
| -rw-r--r-- | app-accessibility/at-spi2-atk/at-spi2-atk-2.2.1-r1.ebuild | 51 | ||||
| -rw-r--r-- | app-accessibility/at-spi2-atk/at-spi2-atk-2.4.0.ebuild (renamed from app-accessibility/at-spi2-atk/at-spi2-atk-2.0.2.ebuild) | 21 | ||||
| -rw-r--r-- | app-accessibility/at-spi2-atk/files/at-spi2-atk-2.2.1-socket_ref_state_set-NULL.patch | 66 | ||||
| -rw-r--r-- | app-accessibility/at-spi2-core/ChangeLog | 9 | ||||
| -rw-r--r-- | app-accessibility/at-spi2-core/at-spi2-core-2.4.1.ebuild (renamed from app-accessibility/at-spi2-core/at-spi2-core-2.2.1-r1.ebuild) | 12 | ||||
| -rw-r--r-- | app-accessibility/at-spi2-core/files/at-spi2-core-2.0.2-abort-if-already-running.patch | 88 |
7 files changed, 35 insertions, 222 deletions
diff --git a/app-accessibility/at-spi2-atk/ChangeLog b/app-accessibility/at-spi2-atk/ChangeLog index b1cafa1d8657..3f86ccc21ca8 100644 --- a/app-accessibility/at-spi2-atk/ChangeLog +++ b/app-accessibility/at-spi2-atk/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-accessibility/at-spi2-atk # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog,v 1.6 2012/05/03 01:48:59 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog,v 1.7 2012/05/14 00:10:05 tetromino Exp $ + +*at-spi2-atk-2.4.0 (14 May 2012) + + 14 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + -at-spi2-atk-2.0.2.ebuild, -at-spi2-atk-2.2.1-r1.ebuild, + -files/at-spi2-atk-2.2.1-socket_ref_state_set-NULL.patch, + +at-spi2-atk-2.4.0.ebuild: + Version bump for gnome-3.4. Drop old. 03 May 2012; Jeff Horelick <jdhore@gentoo.org> at-spi2-atk-2.0.2.ebuild, at-spi2-atk-2.2.1-r1.ebuild, at-spi2-atk-2.2.2.ebuild: diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.2.1-r1.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.2.1-r1.ebuild deleted file mode 100644 index 5d2796c74140..000000000000 --- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.2.1-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.2.1-r1.ebuild,v 1.2 2012/05/03 01:48:59 jdhore Exp $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit eutils gnome2 - -DESCRIPTION="Gtk module for bridging AT-SPI to Atk" -HOMEPAGE="http://live.gnome.org/Accessibility" - -LICENSE="LGPL-2" -SLOT="2" -KEYWORDS="~amd64 ~x86" -IUSE="" - -COMMON_DEPEND=" - >=app-accessibility/at-spi2-core-2.1.4 - >=dev-libs/atk-2.1.0 - dev-libs/glib:2 - >=sys-apps/dbus-1 - x11-libs/libX11 -" -RDEPEND="${COMMON_DEPEND} - !<gnome-extra/at-spi-1.32.0-r1 -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - >=dev-util/intltool-0.40 -" - -pkg_setup() { - DOCS="AUTHORS NEWS README" - # xevie is deprecated/broken since xorg-1.6/1.7 - G2CONF="${G2CONF} --enable-p2p" -} - -src_prepare() { - # disable teamspaces test since that requires Novell.ICEDesktop.Daemon - epatch "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch" - # Upstream patch, will be in next release - epatch "${FILESDIR}/${P}-socket_ref_state_set-NULL.patch" - - # FIXME: droute test fails - sed -e 's:TESTS = droute-test\.*:TESTS = :' -i droute/Makefile.* || - die "sed droute/Makefile.* failed" - - gnome2_src_prepare -} diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.0.2.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.4.0.ebuild index 7260b62b09c9..825f8dd3f672 100644 --- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.0.2.ebuild +++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.4.0.ebuild @@ -1,24 +1,24 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.0.2.ebuild,v 1.2 2012/05/03 01:48:59 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.4.0.ebuild,v 1.1 2012/05/14 00:10:05 tetromino Exp $ -EAPI="3" +EAPI="4" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" -inherit eutils gnome2 +inherit eutils gnome2 virtualx DESCRIPTION="Gtk module for bridging AT-SPI to Atk" HOMEPAGE="http://live.gnome.org/Accessibility" LICENSE="LGPL-2" SLOT="2" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm ~hppa ~x86" IUSE="" COMMON_DEPEND=" - >=app-accessibility/at-spi2-core-1.91.92 - >=dev-libs/atk-1.29.3 + >=app-accessibility/at-spi2-core-2.4 + >=dev-libs/atk-2.1.0 dev-libs/glib:2 >=sys-apps/dbus-1 x11-libs/libX11 @@ -40,9 +40,14 @@ pkg_setup() { src_prepare() { # disable teamspaces test since that requires Novell.ICEDesktop.Daemon epatch "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch" + # FIXME: droute test fails - sed -e 's:TESTS = droute-test\.*:TESTS = :' -i droute/Makefile.* || - die "sed droute/Makefile.* failed" +# sed -e 's:TESTS = droute-test\.*:TESTS = :' -i droute/Makefile.* || +# die "sed droute/Makefile.* failed" gnome2_src_prepare } + +src_test() { + Xemake check +} diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.2.1-socket_ref_state_set-NULL.patch b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.2.1-socket_ref_state_set-NULL.patch deleted file mode 100644 index 5a6ccd61b375..000000000000 --- a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.2.1-socket_ref_state_set-NULL.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 18d98d35c452678efc2bf09f38fb2d0594641613 Mon Sep 17 00:00:00 2001 -From: Mario Sanchez Prada <msanchez@igalia.com> -Date: Fri, 28 Oct 2011 20:30:42 +0200 -Subject: [PATCH] Socket's implementation of ref_state_set to return empty - sets instead of NULL - -Calls to atk_object_ref_state_set() are expected to return a valid -state set always, so it would be better if this implementation of -socket's ref_state_set() returned empty sets instead of just NULL, to -avoid calling to atk_state_set_*() functions over invalid instances of -AtkStateSet (e.g. add_pending_items() in accessible-cache.c). - -https://bugs.freedesktop.org/show_bug.cgi?id=42350 ---- - atk-adaptor/bridge.c | 16 ++++++++-------- - 1 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c -index d049731..a1ee202 100644 ---- a/atk-adaptor/bridge.c -+++ b/atk-adaptor/bridge.c -@@ -334,17 +334,19 @@ socket_ref_state_set (AtkObject *accessible) - DBusMessageIter iter, iter_array; - AtkStateSet *set; - -+ set = atk_state_set_new (); -+ - if (!socket->embedded_plug_id) -- return NULL; -+ return set; - - child_name = g_strdup (socket->embedded_plug_id); - if (!child_name) -- return NULL; -+ return set; - child_path = g_utf8_strchr (child_name + 1, -1, ':'); - if (!child_path) - { - g_free (child_name); -- return NULL; -+ return set; - } - *(child_path++) = '\0'; - message = dbus_message_new_method_call (child_name, child_path, ATSPI_DBUS_INTERFACE_ACCESSIBLE, "GetState"); -@@ -352,15 +354,13 @@ socket_ref_state_set (AtkObject *accessible) - reply = dbus_connection_send_with_reply_and_block (spi_global_app_data->bus, message, 1, NULL); - dbus_message_unref (message); - if (reply == NULL) -- return NULL; -+ return set; - if (strcmp (dbus_message_get_signature (reply), "au") != 0) - { - dbus_message_unref (reply); -- return NULL; -+ return set; - } -- set = atk_state_set_new (); -- if (!set) -- return NULL; -+ - dbus_message_iter_init (reply, &iter); - dbus_message_iter_recurse (&iter, &iter_array); - do --- -1.7.7.2 - diff --git a/app-accessibility/at-spi2-core/ChangeLog b/app-accessibility/at-spi2-core/ChangeLog index 57f06444e2dd..133dec92ae11 100644 --- a/app-accessibility/at-spi2-core/ChangeLog +++ b/app-accessibility/at-spi2-core/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-accessibility/at-spi2-core # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/ChangeLog,v 1.6 2012/04/21 12:18:02 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/ChangeLog,v 1.7 2012/05/14 00:08:46 tetromino Exp $ + +*at-spi2-core-2.4.1 (14 May 2012) + + 14 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + -files/at-spi2-core-2.0.2-abort-if-already-running.patch, + -at-spi2-core-2.2.1-r1.ebuild, +at-spi2-core-2.4.1.ebuild: + Version bump for gnome-3.4. Drop old. 21 Apr 2012; Markus Meier <maekke@gentoo.org> at-spi2-core-2.2.3.ebuild: add ~arm, bug #411761 diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.2.1-r1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.4.1.ebuild index e89e705bc5af..83b5ffd545c0 100644 --- a/app-accessibility/at-spi2-core/at-spi2-core-2.2.1-r1.ebuild +++ b/app-accessibility/at-spi2-core/at-spi2-core-2.4.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.2.1-r1.ebuild,v 1.1 2011/11/05 04:50:26 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.4.1.ebuild,v 1.1 2012/05/14 00:08:46 tetromino Exp $ EAPI="4" GCONF_DEBUG="no" @@ -13,11 +13,10 @@ HOMEPAGE="http://live.gnome.org/Accessibility" LICENSE="LGPL-2" SLOT="2" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm ~hppa ~x86" IUSE="doc +introspection" -RDEPEND=" - >=dev-libs/glib-2.28:2 +RDEPEND=">=dev-libs/glib-2.28:2 >=sys-apps/dbus-1 x11-libs/libX11 x11-libs/libXi @@ -26,6 +25,7 @@ RDEPEND=" " DEPEND="${RDEPEND} >=dev-util/intltool-0.40 + virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.9 ) " @@ -38,8 +38,6 @@ pkg_setup() { src_prepare() { # disable teamspaces test since that requires Novell.ICEDesktop.Daemon epatch "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch" - # Upstream patch to fix org.a11y.Bus.IsEnabled, will be in next release - epatch "${FILESDIR}/${P}-org.a11y.Bus.IsEnabled-property.patch" gnome2_src_prepare } diff --git a/app-accessibility/at-spi2-core/files/at-spi2-core-2.0.2-abort-if-already-running.patch b/app-accessibility/at-spi2-core/files/at-spi2-core-2.0.2-abort-if-already-running.patch deleted file mode 100644 index 0e39dcf3766a..000000000000 --- a/app-accessibility/at-spi2-core/files/at-spi2-core-2.0.2-abort-if-already-running.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 72b5b5733841657af00f31370d26bdfd5a0b60b7 Mon Sep 17 00:00:00 2001 -From: Mike Gorse <mgorse@novell.com> -Date: Thu, 09 Jun 2011 16:50:58 +0000 -Subject: Make the bus launcher abort if an instance is already running - -Upon starting up, at-spi-bus-launcher now looks for an X property with -the bus address and tries to connect to it, aborting if successful. -This fixes a bug where, if the launcher was run twice (perhaps by both -an autostart script and a request for the bus address), the second -instance would start its main loop, eventually abort, and delete the X -property, which would cause a new X property to be created later, -overriding the old one, if a different user requested the address, -leading to a11y breakage. ---- -diff --git a/bus/at-spi-bus-launcher.c b/bus/at-spi-bus-launcher.c -index 9300979..dcc35e4 100644 ---- a/bus/at-spi-bus-launcher.c -+++ b/bus/at-spi-bus-launcher.c -@@ -27,6 +27,7 @@ - #include <signal.h> - #include <sys/wait.h> - #include <errno.h> -+#include <stdio.h> - - #include <gio/gio.h> - #include <X11/Xlib.h> -@@ -349,6 +350,49 @@ is_a11y_using_corba (void) - return result; - } - -+static gboolean -+already_running () -+{ -+ Atom AT_SPI_BUS; -+ Atom actual_type; -+ Display *bridge_display; -+ int actual_format; -+ unsigned char *data = NULL; -+ unsigned long nitems; -+ unsigned long leftover; -+ gboolean result = FALSE; -+ -+ bridge_display = XOpenDisplay (NULL); -+ if (!bridge_display) -+ return FALSE; -+ -+ AT_SPI_BUS = XInternAtom (bridge_display, "AT_SPI_BUS", False); -+ XGetWindowProperty (bridge_display, -+ XDefaultRootWindow (bridge_display), -+ AT_SPI_BUS, 0L, -+ (long) BUFSIZ, False, -+ (Atom) 31, &actual_type, &actual_format, -+ &nitems, &leftover, &data); -+ -+ if (data) -+ { -+ GDBusConnection *bus; -+ GError *error = NULL; -+ const gchar *old_session = g_getenv ("DBUS_SESSION_BUS_ADDRESS"); -+ /* TODO: Is there a better way to connect? This is really hacky */ -+ g_setenv ("DBUS_SESSION_BUS_ADDRESS", data, TRUE); -+ bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error); -+ g_setenv ("DBUS_SESSION_BUS_ADDRESS", old_session, TRUE); -+ if (bus != NULL) -+ result = TRUE; -+ g_object_unref (bus); -+ } -+ -+ XCloseDisplay (bridge_display); -+ return result; -+} -+ -+ - int - main (int argc, - char **argv) -@@ -363,6 +407,9 @@ main (int argc, - if (is_a11y_using_corba ()) - return 0; - -+ if (already_running ()) -+ return 0; -+ - _global_app = g_slice_new0 (A11yBusLauncher); - _global_app->loop = g_main_loop_new (NULL, FALSE); - _global_app->launch_immediately = (argc == 2 && strcmp (argv[1], "--launch-immediately") == 0); --- -cgit v0.9 |