Accepting request 252149 from GNOME:Factory
Push GNOME 3.14.0 (forwarded request 251846 from Zaitor) OBS-URL: https://build.opensuse.org/request/show/252149 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/at-spi2-core?expand=0&rev=58
This commit is contained in:
commit
e6e8f0991c
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:db550edd98e53b4252521459c2dcaf0f3b060a9bad52489b9dbadbaedad3fb89
|
||||
size 454668
|
3
at-spi2-core-2.14.0.tar.xz
Normal file
3
at-spi2-core-2.14.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5807b02e6ef695b52fde7ff26d675dd94a0707df3c42fe7fd224828e092514c8
|
||||
size 456376
|
@ -1,13 +0,0 @@
|
||||
diff -Npur at-spi2-core-2.10.2-bak/registryd/registry-main.c at-spi2-core-2.10.2/registryd/registry-main.c
|
||||
--- at-spi2-core-2.10.2-bak/registryd/registry-main.c 2014-05-30 03:00:30.249444690 +0800
|
||||
+++ at-spi2-core-2.10.2/registryd/registry-main.c 2014-05-30 03:01:05.005444798 +0800
|
||||
@@ -164,6 +164,9 @@ register_client (void)
|
||||
const char *startup_id;
|
||||
const char *app_id;
|
||||
|
||||
+ if (client_proxy)
|
||||
+ return TRUE;
|
||||
+
|
||||
startup_id = g_getenv ("DESKTOP_AUTOSTART_ID");
|
||||
if (!startup_id)
|
||||
startup_id = "";
|
@ -1,3 +1,43 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 22 17:14:09 UTC 2014 - zaitor@opensuse.org
|
||||
|
||||
- Update to version 2.14.0:
|
||||
+ Updated translations.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 16 09:53:52 UTC 2014 - zaitor@opensuse.org
|
||||
|
||||
- Update to version 2.13.92:
|
||||
+ Fix alignment checks when cross-compiling (bgo#736653).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 18 22:08:02 UTC 2014 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 2.13.90:
|
||||
+ Fix crash when testing interfaces with collections
|
||||
(bgo#734805).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 21 17:21:18 UTC 2014 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 2.13.4:
|
||||
+ Ensure that we register with the session manager only once
|
||||
(bgo#728934).
|
||||
+ Fix ucs2keysym prototype (bgo#730897).
|
||||
+ introspection: add some missing Returns: (nullable)
|
||||
annotations.
|
||||
+ Fix various memory leaks.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 30 19:16:37 UTC 2014 - zaitor@opensuse.org
|
||||
|
||||
- Update to version 2.13.1:
|
||||
+ Add GError setter in atspi_accessible_get_process_id function.
|
||||
+ registryd: Wait for gnome-session before registering if it is
|
||||
not running yet (bgo#728934).
|
||||
- Drop at-spi2-register-on-session-running.patch and
|
||||
at-spi2-core-cancel-logout.patch, fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 30 03:14:44 UTC 2014 - dliang@suse.com
|
||||
|
||||
|
@ -17,19 +17,15 @@
|
||||
|
||||
|
||||
Name: at-spi2-core
|
||||
Version: 2.12.0
|
||||
Version: 2.14.0
|
||||
Release: 0
|
||||
Summary: Assistive Technology Service Provider Interface - D-Bus based implementation
|
||||
License: GPL-2.0+
|
||||
Group: System/Libraries
|
||||
Url: http://www.gnome.org/
|
||||
Source0: http://download.gnome.org/sources/at-spi2-core/2.12/%{name}-%{version}.tar.xz
|
||||
Source0: http://download.gnome.org/sources/at-spi2-core/2.14/%{name}-%{version}.tar.xz
|
||||
Source98: baselibs.conf
|
||||
Source99: %{name}-rpmlintrc
|
||||
# PATCH-FIX-UPSTREAM at-spi2-register-on-session-running.patch bnc#873541 dliang@suse.com -- register to session in autostart session
|
||||
Patch0: at-spi2-register-on-session-running.patch
|
||||
# PATCH-FIX-UPSTREAM at-spi2-core-cancel-logout.patch bnc#876680 dliang@suse.com -- register to gnome-session only one time
|
||||
Patch1: at-spi2-core-cancel-logout.patch
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: gobject-introspection-devel
|
||||
BuildRequires: intltool
|
||||
@ -84,8 +80,6 @@ to develop applications that require these.
|
||||
%lang_package
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
%configure \
|
||||
|
@ -1,83 +0,0 @@
|
||||
diff -Npur at-spi2-core-2.12.0/registryd/registry-main.c at-spi2-core-2.12.0-new/registryd/registry-main.c
|
||||
--- at-spi2-core-2.12.0/registryd/registry-main.c 2014-03-17 21:47:05.000000000 +0800
|
||||
+++ at-spi2-core-2.12.0-new/registryd/registry-main.c 2014-05-06 14:45:04.371517936 +0800
|
||||
@@ -57,8 +57,10 @@ static GDBusProxy *client_proxy = N
|
||||
|
||||
#define SM_CLIENT_DBUS_INTERFACE "org.gnome.SessionManager.ClientPrivate"
|
||||
|
||||
+static gboolean register_client (void);
|
||||
+
|
||||
static void
|
||||
-on_session_over (GDBusProxy *proxy,
|
||||
+on_session_signal (GDBusProxy *proxy,
|
||||
gchar *sender_name,
|
||||
gchar *signal_name,
|
||||
GVariant *parameters,
|
||||
@@ -66,20 +68,38 @@ on_session_over (GDBusProxy *proxy,
|
||||
{
|
||||
if (g_strcmp0 (signal_name, "SessionOver") == 0) {
|
||||
g_main_loop_quit (mainloop);
|
||||
+ } else if (g_strcmp0 (signal_name, "SessionRunning") == 0) {
|
||||
+ if (!register_client ())
|
||||
+ g_warning ("Unable to register client with session manager");
|
||||
}
|
||||
}
|
||||
|
||||
static gboolean
|
||||
session_manager_connect (void)
|
||||
{
|
||||
+ GVariant *res;
|
||||
+ gboolean is_running;
|
||||
|
||||
sm_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, 0, NULL,
|
||||
SM_DBUS_NAME,
|
||||
SM_DBUS_PATH,
|
||||
SM_DBUS_INTERFACE, NULL, NULL);
|
||||
|
||||
+ res = g_dbus_proxy_call_sync (sm_proxy,
|
||||
+ "IsSessionRunning", NULL,
|
||||
+ 0, 1000, NULL, NULL);
|
||||
+
|
||||
+ if (res) {
|
||||
+ g_variant_get (res, "(b)", &is_running);
|
||||
+ g_variant_unref (res);
|
||||
+ if (is_running) {
|
||||
+ if (!register_client ())
|
||||
+ g_warning ("Unable to register client with session manager");
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
g_signal_connect (G_OBJECT (sm_proxy), "g-signal",
|
||||
- G_CALLBACK (on_session_over), NULL);
|
||||
+ G_CALLBACK (on_session_signal), NULL);
|
||||
|
||||
return (sm_proxy != NULL);
|
||||
}
|
||||
@@ -87,7 +107,7 @@ session_manager_connect (void)
|
||||
static gboolean
|
||||
end_session_response (gboolean is_okay, const gchar *reason)
|
||||
{
|
||||
- GVariant *ret;
|
||||
+ GVariant *ret;
|
||||
GError *error = NULL;
|
||||
|
||||
if (!reason)
|
||||
@@ -132,7 +152,7 @@ static gboolean
|
||||
register_client (void)
|
||||
{
|
||||
GError *error;
|
||||
- GVariant *res;
|
||||
+ GVariant *res;
|
||||
const char *startup_id;
|
||||
const char *app_id;
|
||||
|
||||
@@ -232,9 +252,6 @@ main (int argc, char **argv)
|
||||
{
|
||||
if (!session_manager_connect ())
|
||||
g_warning ("Unable to connect to session manager");
|
||||
-
|
||||
- if (!register_client ())
|
||||
- g_warning ("Unable to register client with session manager");
|
||||
}
|
||||
|
||||
g_main_loop_run (mainloop);
|
Loading…
x
Reference in New Issue
Block a user