summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2011-09-08 00:22:49 +0000
committerjoerg <joerg@pkgsrc.org>2011-09-08 00:22:49 +0000
commitbd5490b164a8f43b70a7c26c4cbdef8d84b5bee0 (patch)
tree0a58a1be5a56b89dccd97931f78e5ac3243381ba /x11
parent6d8e9aead1ae09ff0fc07e421f5356a7fd9017e6 (diff)
downloadpkgsrc-bd5490b164a8f43b70a7c26c4cbdef8d84b5bee0.tar.gz
Fix return without value in !void function. Bump revision.
Diffstat (limited to 'x11')
-rw-r--r--x11/xfce4-settings/Makefile4
-rw-r--r--x11/xfce4-settings/distinfo3
-rw-r--r--x11/xfce4-settings/patches/patch-dialogs-keyboard-settings-xfce-keyboard-settings.c15
3 files changed, 19 insertions, 3 deletions
diff --git a/x11/xfce4-settings/Makefile b/x11/xfce4-settings/Makefile
index f01e7d53859..d4c964a797a 100644
--- a/x11/xfce4-settings/Makefile
+++ b/x11/xfce4-settings/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2011/04/22 13:45:16 obache Exp $
+# $NetBSD: Makefile,v 1.10 2011/09/08 00:22:49 joerg Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -7,7 +7,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
XFCE4_VERSION= 4.6.5
DISTNAME= xfce4-settings-${XFCE4_VERSION}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11
COMMENT= Xfce settings manager
diff --git a/x11/xfce4-settings/distinfo b/x11/xfce4-settings/distinfo
index 583ecf90482..c1329617e82 100644
--- a/x11/xfce4-settings/distinfo
+++ b/x11/xfce4-settings/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2010/07/14 16:15:19 drochner Exp $
+$NetBSD: distinfo,v 1.4 2011/09/08 00:22:49 joerg Exp $
SHA1 (xfce4-settings-4.6.5.tar.bz2) = c036cc2f3100a46b2649e678dff7c0106b219263
RMD160 (xfce4-settings-4.6.5.tar.bz2) = a8155346285921f3087795598989df287be8abb4
Size (xfce4-settings-4.6.5.tar.bz2) = 522389 bytes
SHA1 (patch-aa) = 104e459ab5b7bd4ac821cacada43f2aa4da23f10
SHA1 (patch-ab) = 4f23e05cacd765b5be2e101dec29d3c6f5cd839f
+SHA1 (patch-dialogs-keyboard-settings-xfce-keyboard-settings.c) = e011c194084458c65a7f47e27fc03cb8927287b2
diff --git a/x11/xfce4-settings/patches/patch-dialogs-keyboard-settings-xfce-keyboard-settings.c b/x11/xfce4-settings/patches/patch-dialogs-keyboard-settings-xfce-keyboard-settings.c
new file mode 100644
index 00000000000..2315b0df45c
--- /dev/null
+++ b/x11/xfce4-settings/patches/patch-dialogs-keyboard-settings-xfce-keyboard-settings.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-dialogs-keyboard-settings-xfce-keyboard-settings.c,v 1.1 2011/09/08 00:22:49 joerg Exp $
+
+--- dialogs/keyboard-settings/xfce-keyboard-settings.c.orig 2011-09-07 12:45:30.000000000 +0000
++++ dialogs/keyboard-settings/xfce-keyboard-settings.c
+@@ -1082,8 +1082,8 @@ xfce_keyboard_settings_update_sensitive
+ GtkWidget *xkb_layout_frame;
+ gboolean active;
+
+- g_return_if_fail (XFCE_IS_KEYBOARD_SETTINGS (settings));
+- g_return_if_fail (GLADE_IS_XML (settings->priv->glade_xml));
++ g_return_val_if_fail (XFCE_IS_KEYBOARD_SETTINGS (settings), FALSE);
++ g_return_val_if_fail (GLADE_IS_XML (settings->priv->glade_xml), FALSE);
+
+ active = gtk_toggle_button_get_active (toggle);
+ xkb_model_frame = glade_xml_get_widget (settings->priv->glade_xml, "xkb_model_frame");