old

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

3 files changed, 6 insertions, 67 deletions

diff --git a/xfce-extra/xfce4-timer-plugin/ChangeLog b/xfce-extra/xfce4-timer-plugin/ChangeLog
index cac1471cecbd..b7b42b433c56 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-timer-plugin/ChangeLog,v 1.15 2012/01/06 11:04:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-timer-plugin/ChangeLog,v 1.16 2012/01/06 11:05:35 ssuominen Exp $
+
+  06 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -xfce4-timer-plugin-0.6.1.ebuild,
+  -files/xfce4-timer-plugin-0.6.1-segfault_with_48_panel.patch:
+  old
 
   06 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-timer-plugin-0.6.2.ebuild:
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
deleted file mode 100644
index 056023712726..000000000000
--- a/xfce-extra/xfce4-timer-plugin/files/xfce4-timer-plugin-0.6.1-segfault_with_48_panel.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
deleted file mode 100644
index 544777d9284b..000000000000
--- a/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-0.6.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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.4 2011/05/19 21:34:50 ssuominen Exp $
-
-EAPI=4
-inherit xfconf
-
-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"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=xfce-base/xfce4-panel-4.8
-	>=xfce-base/libxfcegui4-4.8
-	>=xfce-base/libxfce4util-4.8"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool"
-
-pkg_setup() {
-	PATCHES=( "${FILESDIR}"/${P}-segfault_with_48_panel.patch )
-	DOCS=( AUTHORS ChangeLog README TODO )
-}