r34874 - in /desktop/experimental/gnome-settings-daemon/debian: ./ patches/
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Tue May 15 07:23:32 UTC 2012
Author: sjoerd
Date: Tue May 15 07:23:31 2012
New Revision: 34874
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34874
Log:
* Sync with ubuntu:
+ Update build-depend versions of various items
+ Add build-depend on libnss3-dev for smartcard support
+ Add build-depend on libwacom-dev, xserver-xorg-input-wacom for wacom
support
+ debian/patches/10_smaller_syndaemon_timeout.patch:
- Added: Only disable touchpach clicks, not mouse movements (bgo: #673055)
+ debian/patches/git_keyring_environment.patch:
- Added: Get the environment from gnome-keyring when launch custom apps
(from upstream git)
+ debian/patches/power-check-null-devices.patch:
- Added: Fix crash when up_client_get_devices returns NULL (bgo: #674827)
+ debian/patches/power-ignore-bad-dbus-requests.patch:
- Added: If we get a DBus request while the manager isn't active, ignore
it (bgo: #674829)
Added:
desktop/experimental/gnome-settings-daemon/debian/patches/10_smaller_syndaemon_timeout.patch
desktop/experimental/gnome-settings-daemon/debian/patches/git_keyring_environment.patch
desktop/experimental/gnome-settings-daemon/debian/patches/power-check-null-devices.patch
desktop/experimental/gnome-settings-daemon/debian/patches/power-ignore-bad-dbus-requests.patch
Modified:
desktop/experimental/gnome-settings-daemon/debian/changelog
desktop/experimental/gnome-settings-daemon/debian/control
desktop/experimental/gnome-settings-daemon/debian/control.in
desktop/experimental/gnome-settings-daemon/debian/patches/series
Modified: desktop/experimental/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/changelog?rev=34874&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] Tue May 15 07:23:31 2012
@@ -6,8 +6,23 @@
* 02-lock-screensaver-on-lid-close.patch:
+ Removed, fixed upstream
* debian/patches/04_superP.patch: Refreshed
-
- -- Sjoerd Simons <sjoerd at debian.org> Tue, 15 May 2012 08:28:14 +0200
+ * Sync with ubuntu:
+ + Update build-depend versions of various items
+ + Add build-depend on libnss3-dev for smartcard support
+ + Add build-depend on libwacom-dev, xserver-xorg-input-wacom for wacom
+ support
+ + debian/patches/10_smaller_syndaemon_timeout.patch:
+ - Added: Only disable touchpach clicks, not mouse movements (bgo: #673055)
+ + debian/patches/git_keyring_environment.patch:
+ - Added: Get the environment from gnome-keyring when launch custom apps
+ (from upstream git)
+ + debian/patches/power-check-null-devices.patch:
+ - Added: Fix crash when up_client_get_devices returns NULL (bgo: #674827)
+ + debian/patches/power-ignore-bad-dbus-requests.patch:
+ - Added: If we get a DBus request while the manager isn't active, ignore
+ it (bgo: #674829)
+
+ -- Sjoerd Simons <sjoerd at debian.org> Tue, 15 May 2012 08:43:09 +0200
gnome-settings-daemon (3.2.2-3) unstable; urgency=low
Modified: desktop/experimental/gnome-settings-daemon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/control?rev=34874&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/control [utf-8] Tue May 15 07:23:31 2012
@@ -15,8 +15,8 @@
autotools-dev,
intltool (>= 0.37.1),
libdbus-glib-1-dev (>= 0.74),
- libglib2.0-dev (>= 2.30.0),
- libgtk-3-dev (>= 3.0.0),
+ libglib2.0-dev (>= 2.31.0),
+ libgtk-3-dev (>= 3.3.4),
libgconf2-dev (>= 2.6.1),
libnotify-dev (>= 0.7.3),
libxt-dev,
@@ -28,18 +28,21 @@
libxklavier-dev (>= 5.0),
libgstreamer0.10-dev (>= 0.10.1.2),
libgstreamer-plugins-base0.10-dev (>= 0.10.1.2),
- gsettings-desktop-schemas-dev,
- libgnome-desktop-3-dev (>= 3.1.5),
+ gsettings-desktop-schemas-dev (>= 3.3.90),
+ libgnome-desktop-3-dev (>= 3.3.4),
libpulse-dev (>= 0.9.23),
libcanberra-gtk3-dev,
libcups2-dev,
libpolkit-gobject-1-dev,
libpackagekit-glib2-dev (>= 0.6.4),
- libupower-glib-dev (>= 0.9.1),
+ libupower-glib-dev (>= 0.9.11),
libgudev-1.0-dev [linux-any],
libcolord-dev (>= 0.1.12),
hwdata (>= 0.227-1),
- liblcms2-dev
+ liblcms2-dev,
+ libnss3-dev,
+ libwacom-dev (>= 0.3),
+ xserver-xorg-input-wacom,
Standards-Version: 3.9.2
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-settings-daemon/
Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-settings-daemon/
@@ -59,6 +62,7 @@
gnome-control-center (<< 1:2.21.5),
gnome-session (<< 2.24),
gnome-screensaver (<< 2.28.0),
+ gnome-color-manager (<< 3.0),
gdm3 (<< 3.0)
Suggests: x11-xserver-utils,
gnome-screensaver,
Modified: desktop/experimental/gnome-settings-daemon/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/control.in?rev=34874&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/control.in [utf-8] Tue May 15 07:23:31 2012
@@ -10,8 +10,8 @@
autotools-dev,
intltool (>= 0.37.1),
libdbus-glib-1-dev (>= 0.74),
- libglib2.0-dev (>= 2.30.0),
- libgtk-3-dev (>= 3.0.0),
+ libglib2.0-dev (>= 2.31.0),
+ libgtk-3-dev (>= 3.3.4),
libgconf2-dev (>= 2.6.1),
libnotify-dev (>= 0.7.3),
libxt-dev,
@@ -23,18 +23,21 @@
libxklavier-dev (>= 5.0),
libgstreamer0.10-dev (>= 0.10.1.2),
libgstreamer-plugins-base0.10-dev (>= 0.10.1.2),
- gsettings-desktop-schemas-dev,
- libgnome-desktop-3-dev (>= 3.1.5),
+ gsettings-desktop-schemas-dev (>= 3.3.90),
+ libgnome-desktop-3-dev (>= 3.3.4),
libpulse-dev (>= 0.9.23),
libcanberra-gtk3-dev,
libcups2-dev,
libpolkit-gobject-1-dev,
libpackagekit-glib2-dev (>= 0.6.4),
- libupower-glib-dev (>= 0.9.1),
+ libupower-glib-dev (>= 0.9.11),
libgudev-1.0-dev [linux-any],
libcolord-dev (>= 0.1.12),
hwdata (>= 0.227-1),
- liblcms2-dev
+ liblcms2-dev,
+ libnss3-dev,
+ libwacom-dev (>= 0.3),
+ xserver-xorg-input-wacom,
Standards-Version: 3.9.2
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-settings-daemon/
Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-settings-daemon/
@@ -54,6 +57,7 @@
gnome-control-center (<< 1:2.21.5),
gnome-session (<< 2.24),
gnome-screensaver (<< 2.28.0),
+ gnome-color-manager (<< 3.0),
gdm3 (<< 3.0)
Suggests: x11-xserver-utils,
gnome-screensaver,
Added: desktop/experimental/gnome-settings-daemon/debian/patches/10_smaller_syndaemon_timeout.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/10_smaller_syndaemon_timeout.patch?rev=34874&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/10_smaller_syndaemon_timeout.patch (added)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/10_smaller_syndaemon_timeout.patch [utf-8] Tue May 15 07:23:31 2012
@@ -1,0 +1,14 @@
+Index: gnome-settings-daemon-3.4.0/plugins/mouse/gsd-mouse-manager.c
+===================================================================
+--- gnome-settings-daemon-3.4.0.orig/plugins/mouse/gsd-mouse-manager.c 2012-03-29 21:36:09.471126670 +0200
++++ gnome-settings-daemon-3.4.0/plugins/mouse/gsd-mouse-manager.c 2012-03-29 21:36:45.007128390 +0200
+@@ -540,7 +540,8 @@
+ args[2] = "2.0";
+ args[3] = "-K";
+ args[4] = "-R";
+- args[5] = NULL;
++ args[5] = "-t";
++ args[6] = NULL;
+
+ if (!g_find_program_in_path (args[0]))
+ return 0;
Added: desktop/experimental/gnome-settings-daemon/debian/patches/git_keyring_environment.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/git_keyring_environment.patch?rev=34874&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/git_keyring_environment.patch (added)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/git_keyring_environment.patch [utf-8] Tue May 15 07:23:31 2012
@@ -1,0 +1,111 @@
+From 9d7ea1d0b8b90b55f916751858a210a2e02a06b6 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Fri, 30 Mar 2012 11:36:58 +0200
+Subject: [PATCH] media-keys: Get the environment from gnome-keyring
+
+When launching custom applications.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=662528
+---
+ plugins/media-keys/gsd-media-keys-manager.c | 63 ++++++++++++++++++++++++++-
+ 1 file changed, 62 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
+index c809022..bdef10d 100644
+--- a/plugins/media-keys/gsd-media-keys-manager.c
++++ b/plugins/media-keys/gsd-media-keys-manager.c
+@@ -66,6 +66,10 @@
+ #define GNOME_SESSION_DBUS_PATH "/org/gnome/SessionManager"
+ #define GNOME_SESSION_DBUS_INTERFACE "org.gnome.SessionManager"
+
++#define GNOME_KEYRING_DBUS_NAME "org.gnome.keyring"
++#define GNOME_KEYRING_DBUS_PATH "/org/gnome/keyring/daemon"
++#define GNOME_KEYRING_DBUS_INTERFACE "org.gnome.keyring.Daemon"
++
+ #define CUSTOM_BINDING_SCHEMA SETTINGS_BINDING_DIR ".custom-keybinding"
+
+ static const gchar introspection_xml[] =
+@@ -228,6 +232,57 @@ get_term_command (GsdMediaKeysManager *manager)
+ return cmd;
+ }
+
++static char **
++get_keyring_env (GsdMediaKeysManager *manager)
++{
++ GError *error = NULL;
++ GVariant *variant, *item;
++ GVariantIter *iter;
++ char **envp;
++
++ variant = g_dbus_connection_call_sync (manager->priv->connection,
++ GNOME_KEYRING_DBUS_NAME,
++ GNOME_KEYRING_DBUS_PATH,
++ GNOME_KEYRING_DBUS_INTERFACE,
++ "GetEnvironment",
++ NULL,
++ NULL,
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL,
++ &error);
++ if (variant == NULL) {
++ g_warning ("Failed to call GetEnvironment on keyring daemon: %s", error->message);
++ g_error_free (error);
++ return NULL;
++ }
++
++ envp = g_get_environ ();
++
++ g_variant_get (variant, "(a{ss})", &iter);
++
++ while ((item = g_variant_iter_next_value (iter))) {
++ char *key;
++ char *value;
++
++ g_variant_get (item,
++ "{ss}",
++ &key,
++ &value);
++
++ envp = g_environ_setenv (envp, key, value, TRUE);
++
++ g_variant_unref (item);
++ g_free (key);
++ g_free (value);
++ }
++
++ g_variant_iter_free (iter);
++ g_variant_unref (variant);
++
++ return envp;
++}
++
+ static void
+ execute (GsdMediaKeysManager *manager,
+ char *cmd,
+@@ -253,15 +308,21 @@ execute (GsdMediaKeysManager *manager,
+ }
+
+ if (g_shell_parse_argv (exec, &argc, &argv, NULL)) {
++ char **envp;
++
++ envp = get_keyring_env (manager);
++
+ retval = g_spawn_async (g_get_home_dir (),
+ argv,
+- NULL,
++ envp,
+ G_SPAWN_SEARCH_PATH,
+ NULL,
+ NULL,
+ NULL,
+ &error);
++
+ g_strfreev (argv);
++ g_strfreev (envp);
+ }
+
+ if (retval == FALSE) {
+--
+1.7.10
+
Added: desktop/experimental/gnome-settings-daemon/debian/patches/power-check-null-devices.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/power-check-null-devices.patch?rev=34874&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/power-check-null-devices.patch (added)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/power-check-null-devices.patch [utf-8] Tue May 15 07:23:31 2012
@@ -1,0 +1,13 @@
+Index: gnome-settings-daemon-3.4.1/plugins/power/gsd-power-manager.c
+===================================================================
+--- gnome-settings-daemon-3.4.1.orig/plugins/power/gsd-power-manager.c 2012-04-25 13:57:13.176001372 -0400
++++ gnome-settings-daemon-3.4.1/plugins/power/gsd-power-manager.c 2012-04-25 16:24:40.153594415 -0400
+@@ -1161,7 +1161,7 @@
+
+ /* add to database */
+ array = up_client_get_devices (manager->priv->up_client);
+- for (i=0;i<array->len;i++) {
++ for (i = 0; array != NULL && i < array->len; i++) {
+ device = g_ptr_array_index (array, i);
+ engine_device_add (manager, device);
+ engine_check_recall (manager, device);
Added: desktop/experimental/gnome-settings-daemon/debian/patches/power-ignore-bad-dbus-requests.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/power-ignore-bad-dbus-requests.patch?rev=34874&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/power-ignore-bad-dbus-requests.patch (added)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/power-ignore-bad-dbus-requests.patch [utf-8] Tue May 15 07:23:31 2012
@@ -1,0 +1,30 @@
+Index: gnome-settings-daemon-3.4.1/plugins/power/gsd-power-manager.c
+===================================================================
+--- gnome-settings-daemon-3.4.1.orig/plugins/power/gsd-power-manager.c 2012-04-25 16:53:47.385612908 -0400
++++ gnome-settings-daemon-3.4.1/plugins/power/gsd-power-manager.c 2012-04-25 17:04:19.765619601 -0400
+@@ -4149,6 +4149,12 @@
+ {
+ GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
+
++ /* Check session pointer as a proxy for whether the manager is in the
++ start or stop state */
++ if (manager->priv->session == NULL) {
++ return;
++ }
++
+ g_debug ("Calling method '%s.%s' for Power",
+ interface_name, method_name);
+
+@@ -4183,6 +4189,12 @@
+ GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
+ GVariant *retval = NULL;
+
++ /* Check session pointer as a proxy for whether the manager is in the
++ start or stop state */
++ if (manager->priv->session == NULL) {
++ return NULL;
++ }
++
+ if (g_strcmp0 (property_name, "Icon") == 0) {
+ retval = engine_get_icon_property_variant (manager);
+ } else if (g_strcmp0 (property_name, "Tooltip") == 0) {
Modified: desktop/experimental/gnome-settings-daemon/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/series?rev=34874&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/series [utf-8] Tue May 15 07:23:31 2012
@@ -1,1 +1,5 @@
04_superP.patch
+10_smaller_syndaemon_timeout.patch
+git_keyring_environment.patch
+power-check-null-devices.patch
+power-ignore-bad-dbus-requests.patch
More information about the pkg-gnome-commits
mailing list