From 1a5125ce565590bcb6fa0d0c4f4d2fc9994b6e4a Mon Sep 17 00:00:00 2001 From: Rene Ladan Date: Sat, 5 Nov 2011 00:12:39 +0000 Subject: [PATCH] - Fix build on FreeBSD 10 - Fix build with Clang --- x11/xfce4-clipman-plugin/Makefile | 2 ++ .../files/patch-panel-plugin__collector.c | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 x11/xfce4-clipman-plugin/files/patch-panel-plugin__collector.c diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile index 4df0e6e57d76..85ac576ff8a2 100644 --- a/x11/xfce4-clipman-plugin/Makefile +++ b/x11/xfce4-clipman-plugin/Makefile @@ -30,6 +30,8 @@ USE_XORG= xtst INSTALLS_ICONS= yes +WITH_FBSD10_FIX= yes + .include .if !defined(WITHOUT_UNIQUE) diff --git a/x11/xfce4-clipman-plugin/files/patch-panel-plugin__collector.c b/x11/xfce4-clipman-plugin/files/patch-panel-plugin__collector.c new file mode 100644 index 000000000000..d085f25b139b --- /dev/null +++ b/x11/xfce4-clipman-plugin/files/patch-panel-plugin__collector.c @@ -0,0 +1,11 @@ +--- panel-plugin/collector.c.orig 2011-10-20 14:42:39.000000000 +0200 ++++ panel-plugin/collector.c 2011-11-05 00:16:40.000000000 +0100 +@@ -154,7 +154,7 @@ + gchar *text; + static gchar *prev_text = NULL; + +- g_return_if_fail (GTK_IS_CLIPBOARD (collector->priv->default_clipboard) && GTK_IS_CLIPBOARD (collector->priv->primary_clipboard)); ++ g_return_val_if_fail (GTK_IS_CLIPBOARD (collector->priv->default_clipboard) && GTK_IS_CLIPBOARD (collector->priv->primary_clipboard), FALSE); + + /* Postpone until the selection is done */ + gdk_window_get_pointer (NULL, NULL, NULL, &state);