Fix segmentation fault with xfce4-panel >= 4.8 wrt #352988 by Johannes Geiss.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

4 files changed, 60 insertions, 10 deletions

diff --git a/xfce-extra/xfce4-timer-plugin/ChangeLog b/xfce-extra/xfce4-timer-plugin/ChangeLog
index 741ff6336e28..e7bb849fc13b 100644
--- a/xfce-extra/xfce4-timer-plugin/ChangeLog
+++ b/xfce-extra/xfce4-timer-plugin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-extra/xfce4-timer-plugin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-timer-plugin/ChangeLog,v 1.2 2009/10/08 17:47:35 darkside Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-timer-plugin/ChangeLog,v 1.3 2011/01/29 07:21:29 ssuominen Exp $
+
+  29 Jan 2011; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-timer-plugin-0.6.1.ebuild,
+  +files/xfce4-timer-plugin-0.6.1-segfault_with_48_panel.patch:
+  Fix segmentation fault with xfce4-panel >= 4.8 wrt #352988 by Johannes Geiss.
 
   08 Oct 2009; Jeremy Olexa <darkside@gentoo.org>
   xfce4-timer-plugin-0.6.1.ebuild:
diff --git a/xfce-extra/xfce4-timer-plugin/Manifest b/xfce-extra/xfce4-timer-plugin/Manifest
index 328e2164856b..bf95fbbfcc0f 100644
--- a/xfce-extra/xfce4-timer-plugin/Manifest
+++ b/xfce-extra/xfce4-timer-plugin/Manifest
@@ -1,4 +1,5 @@
+AUX xfce4-timer-plugin-0.6.1-segfault_with_48_panel.patch 1169 RMD160 bc235955376d265af740bfc415f6af7beba73ba7 SHA1 ae4b3c765e6f80a5c643cb1d6dbb43e6eaff9d61 SHA256 b885604994abfcb13e2f81de9e3457f1592ccea5707cc2d9f705710893f4ccce
 DIST xfce4-timer-plugin-0.6.1.tar.bz2 289074 RMD160 8f32b46b75be48b3e6ccd10bd6160b71523b9d2a SHA1 4e2409932247ad3bcfbd766effd99e3bf7c4b383 SHA256 280d5bb8f03e8f3b02b184049b61ed09e25a0966dec8b049fd60e54d5c7b4ff9
-EBUILD xfce4-timer-plugin-0.6.1.ebuild 814 RMD160 937976d74c27e0fe3f25162450ce251a99ce0f39 SHA1 f61479e07c0c001c243aa7df82be038cf32b4f9d SHA256 7fc80573fc3588c45e73025270affa61dd5056d47f916bf89eca3baa3f8a6fca
-MISC ChangeLog 546 RMD160 340bdcaad2d28f5959a3084be0ca24eef0984e99 SHA1 6a34b31d0d57c2e9b61864d8376954d22383df8d SHA256 7d3a826d68ad4dd11996caa0fad01afb54fd38628a87d0ddce87ba37f0a2c4cf
+EBUILD xfce4-timer-plugin-0.6.1.ebuild 956 RMD160 ab256b4218a2de15390109051a78fcaa3b003f9e SHA1 3ae57092e7e54dbff8d9ca80d713a8f140c2e70c SHA256 92f7b22b95259f10e3cbcaed995ab3e90972186991a659ca01d3803d1356f461
+MISC ChangeLog 781 RMD160 3900ac2e61809d74add52672733be18872c7e345 SHA1 20ef001a1af22dad9e5b79b681ee4e32f67a6f12 SHA256 a93fff8879913a6a641974b33018e010e25219235378aa76704cf727f773b790
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
diff --git a/xfce-extra/xfce4-timer-plugin/files/xfce4-timer-plugin-0.6.1-segfault_with_48_panel.patch b/xfce-extra/xfce4-timer-plugin/files/xfce4-timer-plugin-0.6.1-segfault_with_48_panel.patch
new file mode 100644
index 000000000000..056023712726
--- /dev/null
+++ b/xfce-extra/xfce4-timer-plugin/files/xfce4-timer-plugin-0.6.1-segfault_with_48_panel.patch
@@ -0,0 +1,39 @@
+From 03ff202f818fe3f075a6c864ab688b57b1bb1cb4 Mon Sep 17 00:00:00 2001
+From: Nick Schermer <nick@xfce.org>
+Date: Thu, 27 Jan 2011 21:18:45 +0000
+Subject: Fix segfault when creating plugin in 4.8 panel.
+
+Used invalid function type to construct the plugin.
+---
+diff --git a/src/xfcetimer.c b/src/xfcetimer.c
+index c27d37a..de7bd2b 100644
+--- a/src/xfcetimer.c
++++ b/src/xfcetimer.c
+@@ -42,7 +42,7 @@
+ 
+ #include "xfcetimer.h"
+ 
+-static gboolean create_plugin_control (XfcePanelPlugin *plugin);
++static void create_plugin_control (XfcePanelPlugin *plugin);
+ XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL(create_plugin_control);
+ 
+ void make_menu(plugin_data *pd);
+@@ -1366,7 +1366,7 @@ static void plugin_create_options (XfcePanelPlugin *plugin,plugin_data *pd) {
+  *
+  * Returns %TRUE on success, %FALSE on failure.
+  **/
+-static gboolean
++static void
+ create_plugin_control (XfcePanelPlugin *plugin)
+ {
+ 
+@@ -1461,7 +1461,6 @@ create_plugin_control (XfcePanelPlugin *plugin)
+   xfce_panel_plugin_menu_show_configure (plugin);
+   g_signal_connect (plugin, "configure-plugin",
+                       G_CALLBACK (plugin_create_options), pd);
+-  return(TRUE);
+ }
+ 
+ 
+--
+cgit v0.8.3.4
diff --git a/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-0.6.1.ebuild b/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-0.6.1.ebuild
index 3eb8ef8c6938..d4fe199dafb6 100644
--- a/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-0.6.1.ebuild
+++ b/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-0.6.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-0.6.1.ebuild,v 1.2 2009/10/08 17:47:35 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-0.6.1.ebuild,v 1.3 2011/01/29 07:21:29 ssuominen Exp $
 
-EAPI=2
+EAPI=3
 inherit xfconf
 
-DESCRIPTION="Timer plugin for Xfce4 panel"
-HOMEPAGE="http://www.xfce.org/"
+DESCRIPTION="A simple timer plug-in for the Xfce desktop environment"
+HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin"
 SRC_URI="mirror://xfce/src/panel-plugins/${PN}/0.6/${P}.tar.bz2"
 
 LICENSE="GPL-2"
@@ -22,6 +22,11 @@ DEPEND="${RDEPEND}
 	dev-util/intltool"
 
 pkg_setup() {
+	PATCHES=( "${FILESDIR}"/${P}-segfault_with_48_panel.patch )
+
+	XFCONF=(
+		--disable-dependency-tracking
+		)
+
 	DOCS="AUTHORS ChangeLog README TODO"
-	XFCONF="--disable-dependency-tracking"
 }