cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better patches.

Browse Source
This commit is contained in:
ajacoutot 2013-04-04 13:51:30 +00:00
parent 0a90ec6050
commit ad546fa526
3 changed files with 10 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/gnome/settings-daemon/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.100 2013/04/02 16:16:47 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.101 2013/04/04 13:51:30 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ COMMENT= GNOME settings daemon
GNOME_PROJECT= gnome-settings-daemon
GNOME_VERSION= 3.8.0
REVISION= 4
REVISION= 5
# GPLv3
PERMIT_PACKAGE_CDROM= Yes

35
x11/gnome/settings-daemon/patches/patch-plugins_cursor_gsd-cursor-manager_c
View File

@ -1,54 +1,35 @@
$OpenBSD: patch-plugins_cursor_gsd-cursor-manager_c,v 1.1 2013/04/01 19:29:16 ajacoutot Exp $
$OpenBSD: patch-plugins_cursor_gsd-cursor-manager_c,v 1.2 2013/04/04 13:51:30 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=696707
--- plugins/cursor/gsd-cursor-manager.c.orig Tue Mar 26 07:59:38 2013
+++ plugins/cursor/gsd-cursor-manager.c Mon Apr 1 21:19:29 2013
@@ -70,6 +70,15 @@ static gboolean add_all_devices (GsdCursorManager *man
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,
@@ -168,8 +177,12 @@ add_device (GdkDeviceManager *device_manager,
--- plugins/cursor/gsd-cursor-manager.c.orig Thu Apr 4 15:38:46 2013
+++ plugins/cursor/gsd-cursor-manager.c Thu Apr 4 15:38:50 2013
@@ -168,8 +168,11 @@ 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,
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+ "Per-device idletime monitor not available");
return FALSE;
+ }
g_hash_table_insert (manager->priv->monitors,
device,
monitor);
@@ -281,12 +294,16 @@ gsd_cursor_manager_start (GsdCursorManager *manager,
@@ -281,12 +284,14 @@ 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,
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+ "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,
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+ "XInput support not available");
return FALSE;
}

28
x11/gnome/settings-daemon/patches/patch-plugins_cursor_gsd-cursor-manager_h
View File

@ -1,28 +0,0 @@
$OpenBSD: patch-plugins_cursor_gsd-cursor-manager_h,v 1.1 2013/04/01 19:29:16 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=696707
--- plugins/cursor/gsd-cursor-manager.h.orig Mon Oct 17 19:36:56 2011
+++ plugins/cursor/gsd-cursor-manager.h Mon Apr 1 21:19:29 2013
@@ -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,