From 585befa2f22f396a89dfb23797bbbb425d7d71a6 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Fri, 27 May 2011 14:27:10 +0000 Subject: [PATCH] Fix a warning on startup when the cursor_size gconf key is not set. --- x11/gnome/metacity/Makefile | 4 ++-- x11/gnome/metacity/patches/patch-src_core_prefs_c | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 x11/gnome/metacity/patches/patch-src_core_prefs_c diff --git a/x11/gnome/metacity/Makefile b/x11/gnome/metacity/Makefile index 5679d284900..0e43a8a35bc 100644 --- a/x11/gnome/metacity/Makefile +++ b/x11/gnome/metacity/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.58 2011/05/27 12:47:42 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.59 2011/05/27 14:27:10 ajacoutot Exp $ SHARED_ONLY= Yes @@ -7,7 +7,7 @@ COMMENT= lightweight window manager GNOME_PROJECT= metacity GNOME_VERSION= 2.34.0 -REVISION= 4 +REVISION= 5 SHARED_LIBS += metacity-private 1.0 # .0.0 diff --git a/x11/gnome/metacity/patches/patch-src_core_prefs_c b/x11/gnome/metacity/patches/patch-src_core_prefs_c new file mode 100644 index 00000000000..a8e9a668fbf --- /dev/null +++ b/x11/gnome/metacity/patches/patch-src_core_prefs_c @@ -0,0 +1,15 @@ +$OpenBSD: patch-src_core_prefs_c,v 1.3 2011/05/27 14:27:10 ajacoutot Exp $ + +https://bugzilla.gnome.org/show_bug.cgi?id=651257 + +--- src/core/prefs.c.orig Fri May 27 16:13:11 2011 ++++ src/core/prefs.c Fri May 27 16:12:47 2011 +@@ -584,7 +584,7 @@ handle_preference_init_int (void) + &error); + cleanup_error (&error); + +- if (value < cursor->minimum || value > cursor->maximum) ++ if (value && (value < cursor->minimum || value > cursor->maximum)) + { + meta_warning (_("%d stored in GConf key %s is out of range %d to %d\n"), + value, cursor->key, cursor->minimum, cursor->maximum);