[gentoo-commits] proj/gnome:gnome-next commit in: app-accessibility/at-spi2-core/files/, app-accessibility/at-spi2-core/

[gentoo-commits] proj/gnome:gnome-next commit in: app-accessibility/at-spi2-core/files/, app-accessibility/at-spi2-core/

[Alexandre Restovtsev]

commit:     2aa6224155061bbf58ecd26ccca3215eb4db86e6
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Jul 26 06:37:38 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Jul 26 06:39:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2aa62241

app-accessibility/at-spi2-core: 2.0.2-r1 → 2.1.4

Bump to gnome-3.1.x version. Builds on x86. Fix DEPEND typo. The
already-running patch has been applied upstream.

---
 ...e-2.0.2-r1.ebuild => at-spi2-core-2.1.4.ebuild} |   10 +--
 ...-spi2-core-2.0.2-abort-if-already-running.patch |   88 --------------------
 2 files changed, 3 insertions(+), 95 deletions(-)

diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.0.2-r1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.1.4.ebuild
similarity index 79%
rename from app-accessibility/at-spi2-core/at-spi2-core-2.0.2-r1.ebuild
rename to app-accessibility/at-spi2-core/at-spi2-core-2.1.4.ebuild
index 2d960fa..d36a347 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.0.2-r1.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.1.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://live.gnome.org/Accessibility"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc +introspection"
 
 RDEPEND="
@@ -24,7 +24,7 @@ RDEPEND="
 	x11-libs/libXtst
 	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
 "
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	doc? ( >=dev-util/gtk-doc-1.9 )
 "
@@ -39,9 +39,5 @@ src_prepare() {
 	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
 	epatch "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
 
-	# https://bugzilla.gnome.org/show_bug.cgi?id=652215
-	# Fixed in upstream git master branch, but not in gnome-3-0 branch
-	epatch "${FILESDIR}/${PN}-2.0.2-abort-if-already-running.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 0e39dcf..0000000
--- 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