Accepting request 91698 from home:vuntz:branches:GNOME:Factory

Update to 3.2.2

OBS-URL: https://build.opensuse.org/request/show/91698
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=116
This commit is contained in:
Dominique Leuenberger 2011-11-15 21:55:45 +00:00 committed by Git OBS Bridge
parent fe13395545
commit 981284dd70
6 changed files with 30 additions and 72 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d982dcb144104b9b2ba5bcf0e976e3021ffff760e058cd6ab7a9f4c56afa83be
size 1792146

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f8f77b2c1e91fd861ad0c6e62ac1327615431923b1cf93ffd5ec592e254adb18
size 1834389

View File

@ -1,10 +0,0 @@
--- plugins/power/gsd-power-manager.c 2011-09-26 10:49:43.000000000 -0500
+++ plugins/power/gsd-power-manager.c.orig 2011-10-17 10:28:30.000000000 -0500
@@ -24,6 +24,7 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
+#include <sys/wait.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <libupower-glib/upower.h>

View File

@ -1,52 +0,0 @@
From 3b41d8d62ebef1070e4304ad40cf395d12834808 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Wed, 19 Oct 2011 12:46:18 +0000
Subject: media-keys: Fix the suspend key not working
We were trying to find UPower on the session bus instead of the
system bus.
Spotted by Sebastien Bacher <seb128@ubuntu.com>
https://bugzilla.gnome.org/show_bug.cgi?id=660267#c3
---
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index 7330591..e1b511e 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -2053,16 +2053,6 @@ on_bus_gotten (GObject *source_object,
NULL,
(GAsyncReadyCallback) power_keyboard_ready_cb,
manager);
-
- g_dbus_proxy_new (manager->priv->connection,
- G_DBUS_PROXY_FLAGS_NONE,
- NULL,
- "org.freedesktop.UPower",
- "/org/freedesktop/UPower",
- "org.freedesktop.UPower",
- NULL,
- (GAsyncReadyCallback) upower_ready_cb,
- manager);
}
static void
@@ -2076,6 +2066,16 @@ register_manager (GsdMediaKeysManager *manager)
manager->priv->bus_cancellable,
(GAsyncReadyCallback) on_bus_gotten,
manager);
+
+ g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
+ G_DBUS_PROXY_FLAGS_NONE,
+ NULL,
+ "org.freedesktop.UPower",
+ "/org/freedesktop/UPower",
+ "org.freedesktop.UPower",
+ NULL,
+ (GAsyncReadyCallback) upower_ready_cb,
+ manager);
}
GsdMediaKeysManager *
--
cgit v0.9.0.2

View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Tue Nov 15 10:37:55 UTC 2011 - vuntz@opensuse.org
- Update to version 3.2.2:
+ Fix a number of memory leaks and static analysis bugs
+ Media keys:
- Fix suspend key not working
- Fix newly captured keybindings with GTK+ 3.2.1 not working
('<Primary>' key)
- Fix OSD display problem in fallback mode
- Allow grabbing the Print key without a modifier
+ Power:
- Fix possible undefined symbol
+ Printers:
- Fix crash on start when registering a D-Bus service
- Fix problems getting ownership information for print jobs
- Only show errors when the print job triggering it is ours
- Make error notifications resident, and dismiss them when
the problem is resolved
+ Wacom:
- Set cursor devices to be in relative mode by default
- Drop gnome-settings-daemon-upower-system-bus.patch: fixed
upstream.
- Drop gnome-settings-daemon-fix-missing-wexitstatus.patch: fixed
upstream.
-------------------------------------------------------------------
Wed Nov 2 15:50:48 UTC 2011 - rbrownccb@opensuse.org

View File

@ -18,7 +18,7 @@
Name: gnome-settings-daemon
Version: 3.2.1
Version: 3.2.2
Release: 1
License: GPLv2+
Summary: Settings daemon for the GNOME desktop
@ -41,10 +41,6 @@ Patch14: gnome-packagekit-fate302445.patch
Patch15: gnome-packagekit-BNC383261.patch
# PATCH-FIX-OPENSUSE gnome-settings-daemon-stop-reload-proxy-settings.patch bnc689592#c1, bnc#538353 glin@suse.com -- Stop g-s-d poping up the authentication dialog for reloading the proxy settings
Patch17: gnome-settings-daemon-stop-reload-proxy-settings.patch
# PATCH-FIX-UPSTREAM gnome-settings-daemon-fix-missing-wexitstatus.patch bgo#662020 malcolmlewis@opensuse.org -- Add missing include that can cause issues at runtime, especially on 11.4.
Patch18: gnome-settings-daemon-fix-missing-wexitstatus.patch
# PATCH-FIX-UPSTREAM gnome-settings-daemon-upower-system-bus.patch bgo#660267 rbrownccb@opensuse.org -- Make g-s-d look for UPower on system bus to fix suspend button
Patch19: gnome-settings-daemon-upower-system-bus.patch
BuildRequires: fdupes
BuildRequires: gnome-common
# Disabled because of the non-rebased patches
@ -146,8 +142,6 @@ translation-update-upstream
#%%patch15 -p0
%patch17 -p1
%endif
%patch18
%patch19 -p1
%if 0%{?BUILD_FROM_VCS}
NOCONFIGURE=1 /usr/bin/gnome-autogen.sh