r37335 - in /desktop/experimental/gnome-settings-daemon/debian: ./ patches/
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Wed Mar 27 15:48:16 UTC 2013
Author: pochu
Date: Wed Mar 27 15:48:16 2013
New Revision: 37335
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37335
Log:
+ d/p/11-cursor-add-error-quark.patch
d/p/12-cursor-set-an-error-if-we-can-t-create-a-monitor.patch
d/p/13-cursor-set-error-if-we-don-t-have-the-necessary-X-su.patch:
- New patches. The upstream fix to disable the cursor with
Xorg < 1.14 was incomplete. With these patches we gracefully
fail with Xorg < 1.14 and the cursor plugin will be enabled with
Xorg >= 1.14.
Added:
desktop/experimental/gnome-settings-daemon/debian/patches/11-cursor-add-error-quark.patch
desktop/experimental/gnome-settings-daemon/debian/patches/12-cursor-set-an-error-if-we-can-t-create-a-monitor.patch
desktop/experimental/gnome-settings-daemon/debian/patches/13-cursor-set-error-if-we-don-t-have-the-necessary-X-su.patch
Modified:
desktop/experimental/gnome-settings-daemon/debian/changelog
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=37335&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] Wed Mar 27 15:48:16 2013
@@ -8,6 +8,13 @@
- Bump libgnome-desktop3-dev requirement for the cursor fix.
+ debian/patches/05_disable_cursor_manager.patch:
- Dropped, fixed upstream in a different way.
+ + d/p/11-cursor-add-error-quark.patch
+ d/p/12-cursor-set-an-error-if-we-can-t-create-a-monitor.patch
+ d/p/13-cursor-set-error-if-we-don-t-have-the-necessary-X-su.patch:
+ - New patches. The upstream fix to disable the cursor with
+ Xorg < 1.14 was incomplete. With these patches we gracefully
+ fail with Xorg < 1.14 and the cursor plugin will be enabled with
+ Xorg >= 1.14.
-- Emilio Pozuelo Monfort <pochu at debian.org> Sun, 24 Mar 2013 21:57:44 +0100
Added: desktop/experimental/gnome-settings-daemon/debian/patches/11-cursor-add-error-quark.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/11-cursor-add-error-quark.patch?rev=37335&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/11-cursor-add-error-quark.patch (added)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/11-cursor-add-error-quark.patch [utf-8] Wed Mar 27 15:48:16 2013
@@ -1,0 +1,60 @@
+From 2a786f4a6d9fad954605fb85d1f7cbf20a7f7522 Mon Sep 17 00:00:00 2001
+From: Emilio Pozuelo Monfort <pochu27 at gmail.com>
+Date: Wed, 27 Mar 2013 14:33:58 +0100
+Subject: [PATCH 1/3] cursor: add error quark
+
+https://bugzilla.gnome.org/show_bug.cgi?id=696707
+---
+ plugins/cursor/gsd-cursor-manager.c | 9 +++++++++
+ plugins/cursor/gsd-cursor-manager.h | 7 +++++++
+ 2 files changed, 16 insertions(+)
+
+diff --git a/plugins/cursor/gsd-cursor-manager.c b/plugins/cursor/gsd-cursor-manager.c
+index 3384f6b..abfcc0f 100644
+--- a/plugins/cursor/gsd-cursor-manager.c
++++ b/plugins/cursor/gsd-cursor-manager.c
+@@ -70,6 +70,15 @@ static gboolean add_all_devices (GsdCursorManager *manager, GdkDevice *exception
+
+ typedef void (*ForeachScreenFunc) (GdkDisplay *display, GdkScreen *screen, GsdCursorManager *manager, gpointer user_data);
+
++GQuark
++gsd_cursor_manager_error_quark (void)
++{
++ static GQuark quark = 0;
++ if (!quark)
++ quark = g_quark_from_static_string ("gsd_cursor_manager_error");
++ return quark;
++}
++
+ static void
+ foreach_screen (GsdCursorManager *manager,
+ ForeachScreenFunc func,
+diff --git a/plugins/cursor/gsd-cursor-manager.h b/plugins/cursor/gsd-cursor-manager.h
+index 9bfed2d..e8ad266 100644
+--- a/plugins/cursor/gsd-cursor-manager.h
++++ b/plugins/cursor/gsd-cursor-manager.h
+@@ -31,6 +31,7 @@ G_BEGIN_DECLS
+ #define GSD_IS_CURSOR_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_CURSOR_MANAGER))
+ #define GSD_IS_CURSOR_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_CURSOR_MANAGER))
+ #define GSD_CURSOR_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_CURSOR_MANAGER, GsdCursorManagerClass))
++#define GSD_CURSOR_MANAGER_ERROR (gsd_cursor_manager_error_quark ())
+
+ typedef struct GsdCursorManagerPrivate GsdCursorManagerPrivate;
+
+@@ -45,7 +46,13 @@ typedef struct
+ GObjectClass parent_class;
+ } GsdCursorManagerClass;
+
++enum
++{
++ GSD_CURSOR_MANAGER_ERROR_FAILED
++};
++
+ GType gsd_cursor_manager_get_type (void);
++GQuark gsd_cursor_manager_error_quark (void);
+
+ GsdCursorManager * gsd_cursor_manager_new (void);
+ gboolean gsd_cursor_manager_start (GsdCursorManager *manager,
+--
+1.7.10.4
+
Added: desktop/experimental/gnome-settings-daemon/debian/patches/12-cursor-set-an-error-if-we-can-t-create-a-monitor.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/12-cursor-set-an-error-if-we-can-t-create-a-monitor.patch?rev=37335&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/12-cursor-set-an-error-if-we-can-t-create-a-monitor.patch (added)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/12-cursor-set-an-error-if-we-can-t-create-a-monitor.patch [utf-8] Wed Mar 27 15:48:16 2013
@@ -1,0 +1,33 @@
+From b81f2019f23b131bbe143b275a9eee16352b9738 Mon Sep 17 00:00:00 2001
+From: Emilio Pozuelo Monfort <pochu27 at gmail.com>
+Date: Wed, 27 Mar 2013 16:12:05 +0100
+Subject: [PATCH 2/3] cursor: set an error if we can't create a monitor
+
+Otherwise we crash in impl_activate()
+
+https://bugzilla.gnome.org/show_bug.cgi?id=696707
+---
+ plugins/cursor/gsd-cursor-manager.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/cursor/gsd-cursor-manager.c b/plugins/cursor/gsd-cursor-manager.c
+index abfcc0f..ddc6dc6 100644
+--- a/plugins/cursor/gsd-cursor-manager.c
++++ b/plugins/cursor/gsd-cursor-manager.c
+@@ -177,8 +177,12 @@ add_device (GdkDeviceManager *device_manager,
+
+ /* Create IdleMonitors for each pointer device */
+ monitor = gnome_idle_monitor_new_for_device (device);
+- if (!monitor)
++ if (!monitor) {
++ g_set_error (error, GSD_CURSOR_MANAGER_ERROR,
++ GSD_CURSOR_MANAGER_ERROR_FAILED,
++ "Per-device idletime monitor not available");
+ return FALSE;
++ }
+ g_hash_table_insert (manager->priv->monitors,
+ device,
+ monitor);
+--
+1.7.10.4
+
Added: desktop/experimental/gnome-settings-daemon/debian/patches/13-cursor-set-error-if-we-don-t-have-the-necessary-X-su.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/13-cursor-set-error-if-we-don-t-have-the-necessary-X-su.patch?rev=37335&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/13-cursor-set-error-if-we-don-t-have-the-necessary-X-su.patch (added)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/13-cursor-set-error-if-we-don-t-have-the-necessary-X-su.patch [utf-8] Wed Mar 27 15:48:16 2013
@@ -1,0 +1,39 @@
+From 1c7da1cf916ab953f84beb7515576ceba129f99c Mon Sep 17 00:00:00 2001
+From: Emilio Pozuelo Monfort <pochu27 at gmail.com>
+Date: Wed, 27 Mar 2013 16:16:08 +0100
+Subject: [PATCH 3/3] cursor: set error if we don't have the necessary X
+ support
+
+Otherwise we crash in impl_activate()
+
+https://bugzilla.gnome.org/show_bug.cgi?id=696707
+---
+ plugins/cursor/gsd-cursor-manager.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/cursor/gsd-cursor-manager.c b/plugins/cursor/gsd-cursor-manager.c
+index ddc6dc6..3e9727d 100644
+--- a/plugins/cursor/gsd-cursor-manager.c
++++ b/plugins/cursor/gsd-cursor-manager.c
+@@ -294,12 +294,16 @@ gsd_cursor_manager_start (GsdCursorManager *manager,
+ gnome_settings_profile_start (NULL);
+
+ if (supports_cursor_xfixes () == FALSE) {
+- g_debug ("XFixes cursor extension not available, will not hide the cursor");
++ g_set_error (error, GSD_CURSOR_MANAGER_ERROR,
++ GSD_CURSOR_MANAGER_ERROR_FAILED,
++ "XFixes cursor extension not available");
+ return FALSE;
+ }
+
+ if (supports_xinput_devices () == FALSE) {
+- g_debug ("XInput support not available, will not hide the cursor");
++ g_set_error (error, GSD_CURSOR_MANAGER_ERROR,
++ GSD_CURSOR_MANAGER_ERROR_FAILED,
++ "XInput support not available");
+ return FALSE;
+ }
+
+--
+1.7.10.4
+
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=37335&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/series [utf-8] Wed Mar 27 15:48:16 2013
@@ -1,2 +1,5 @@
04_superP.patch
08-Fix-build-on-non-Linux-platforms.patch
+11-cursor-add-error-quark.patch
+12-cursor-set-an-error-if-we-can-t-create-a-monitor.patch
+13-cursor-set-error-if-we-don-t-have-the-necessary-X-su.patch
More information about the pkg-gnome-commits
mailing list