diff options
6 files changed, 7 insertions, 183 deletions
diff --git a/xfce-extra/xfce4-netload-plugin/ChangeLog b/xfce-extra/xfce4-netload-plugin/ChangeLog index 578cfe353d5d..786cb04618d1 100644 --- a/xfce-extra/xfce4-netload-plugin/ChangeLog +++ b/xfce-extra/xfce4-netload-plugin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for xfce-extra/xfce4-netload-plugin # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-netload-plugin/ChangeLog,v 1.17 2011/03/29 13:14:32 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-netload-plugin/ChangeLog,v 1.18 2011/04/23 17:40:07 ssuominen Exp $ + + 23 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> + xfce4-netload-plugin-1.0.0.ebuild: + alpha/ia64/sparc stable wrt #358407 29 Mar 2011; Jeroen Roovers <jer@gentoo.org> xfce4-netload-plugin-1.0.0.ebuild: diff --git a/xfce-extra/xfce4-netload-plugin/files/xfce4-netload-plugin-0.4.0-asneeded.patch b/xfce-extra/xfce4-netload-plugin/files/xfce4-netload-plugin-0.4.0-asneeded.patch deleted file mode 100644 index 190b39fb8593..000000000000 --- a/xfce-extra/xfce4-netload-plugin/files/xfce4-netload-plugin-0.4.0-asneeded.patch +++ /dev/null @@ -1,15 +0,0 @@ -http://bugzilla.xfce.org/show_bug.cgi?id=6466 -http://git.xfce.org/panel-plugins/xfce4-netload-plugin/commit/?id=3d15b6fb40900b043dc3863d3ad5571029e45c3d -http://bugs.gentoo.org/show_bug.cgi?id=331497 - ---- panel-plugin/Makefile.am -+++ panel-plugin/Makefile.am -@@ -18,7 +18,7 @@ - -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ - @LIBXFCE4PANEL_CFLAGS@ - --xfce4_netload_plugin_LDFLAGS = \ -+xfce4_netload_plugin_LDADD = \ - @SOLLIBS@ \ - @LIBXFCE4PANEL_LIBS@ - diff --git a/xfce-extra/xfce4-netload-plugin/files/xfce4-netload-plugin-0.4.0-fix-tooltips-gtk2.16.patch b/xfce-extra/xfce4-netload-plugin/files/xfce4-netload-plugin-0.4.0-fix-tooltips-gtk2.16.patch deleted file mode 100644 index 95522393aa58..000000000000 --- a/xfce-extra/xfce4-netload-plugin/files/xfce4-netload-plugin-0.4.0-fix-tooltips-gtk2.16.patch +++ /dev/null @@ -1,90 +0,0 @@ -http://bugzilla.xfce.org/show_bug.cgi?id=5175 -http://bugs.gentoo.org/show_bug.cgi?id=274024 - -diff -ur xfce4-netload-plugin-0.4.0.orig/panel-plugin/netload.c xfce4-netload-plugin-0.4.0/panel-plugin/netload.c ---- xfce4-netload-plugin-0.4.0.orig/panel-plugin/netload.c 2005-10-09 12:08:01.000000000 +0300 -+++ xfce4-netload-plugin-0.4.0/panel-plugin/netload.c 2009-09-22 23:27:12.000000000 +0300 -@@ -30,8 +30,6 @@ - #include <libxfce4panel/xfce-panel-plugin.h> - - --static GtkTooltips *tooltips = NULL; -- - #define BORDER 8 - - /* Defaults */ -@@ -219,7 +217,7 @@ - "Incoming: %s kByte/s\nOutgoing: %s kByte/s\nTotal: %s kByte/s"), - get_name(&(global->monitor->data)), ip ? ip : _("no IP address"), - HISTSIZE_CALCULATE, buffer[IN], buffer[OUT], buffer[TOT]); -- gtk_tooltips_set_tip(tooltips, GTK_WIDGET(global->ebox), caption, NULL); -+ gtk_widget_set_tooltip_text(GTK_WIDGET(global->ebox), caption); - } - - return TRUE; -@@ -237,6 +235,14 @@ - - if (global->monitor->options.update_interval > 0) - { -+#if GLIB_CHECK_VERSION( 2,14,0 ) -+ if (global->monitor->options.update_interval % 1000 == 0) -+ { -+ global->timeout_id = g_timeout_add_seconds(global->monitor-> -+ options.update_interval / 1000, (GtkFunction)update_monitors, global); -+ } -+ else -+#endif - global->timeout_id = g_timeout_add( global->monitor->options.update_interval, - (GtkFunction)update_monitors, global); - } -@@ -368,11 +374,6 @@ - global->plugin = plugin; - xfce_panel_plugin_add_action_widget (plugin, global->ebox); - -- if (!tooltips) -- { -- tooltips = gtk_tooltips_new(); -- } -- - global->monitor = g_new(t_monitor, 1); - global->monitor->options.label_text = g_strdup(DEFAULT_TEXT); - global->monitor->options.network_device = g_strdup(""); -@@ -819,6 +820,10 @@ - GtkWidget *sep1, *sep2; - GtkBox *update_hbox; - GtkWidget *update_label, *update_unit_label; -+#if GLIB_CHECK_VERSION( 2,14,0 ) -+ GtkBox *update_hint_hbox; -+ GtkWidget *update_hint_label; -+#endif - GtkWidget *color_label[SUM]; - GtkWidget *align; - GtkBox *color_hbox[SUM]; -@@ -935,7 +940,7 @@ - gtk_misc_set_alignment(GTK_MISC(update_label), 0, 0.5); - gtk_box_pack_start(GTK_BOX(update_hbox), GTK_WIDGET(update_label), FALSE, FALSE, 0); - -- global->monitor->update_spinner = gtk_spin_button_new_with_range (0.1, 10.0, 0.05); -+ global->monitor->update_spinner = gtk_spin_button_new_with_range (1.0, 10.0, 0.25); - gtk_spin_button_set_digits( GTK_SPIN_BUTTON(global->monitor->update_spinner), 2 ); - gtk_spin_button_set_value( GTK_SPIN_BUTTON(global->monitor->update_spinner), - global->monitor->options.update_interval / 1000.0 ); -@@ -948,6 +953,18 @@ - - gtk_widget_show_all(GTK_WIDGET(update_hbox)); - gtk_size_group_add_widget(sg, update_label); -+ -+#if GLIB_CHECK_VERSION( 2,14,0 ) -+ /* Update interval hint */ -+ update_hint_hbox = GTK_BOX(gtk_hbox_new(FALSE, 5)); -+ update_hint_label = gtk_label_new(_("Note: Whole seconds are more power-efficient")); -+ gtk_label_set_line_wrap(GTK_LABEL(update_hint_label), TRUE); -+ gtk_box_pack_start(GTK_BOX(update_hint_hbox), GTK_WIDGET(update_hint_label), -+ FALSE, FALSE, 0); -+ gtk_box_pack_start(GTK_BOX(global->monitor->opt_vbox), -+ GTK_WIDGET(update_hint_hbox), FALSE, FALSE, 0); -+ gtk_widget_show_all(GTK_WIDGET(update_hint_hbox)); -+#endif - - - sep1 = gtk_hseparator_new(); diff --git a/xfce-extra/xfce4-netload-plugin/files/xfce4-netload-plugin-0.4.0-link_to_libxfcegui4.patch b/xfce-extra/xfce4-netload-plugin/files/xfce4-netload-plugin-0.4.0-link_to_libxfcegui4.patch deleted file mode 100644 index e92f1ece53d2..000000000000 --- a/xfce-extra/xfce4-netload-plugin/files/xfce4-netload-plugin-0.4.0-link_to_libxfcegui4.patch +++ /dev/null @@ -1,32 +0,0 @@ -http://bugzilla.xfce.org/show_bug.cgi?id=6466 -http://git.xfce.org/panel-plugins/xfce4-netload-plugin/commit/?id=3d15b6fb40900b043dc3863d3ad5571029e45c3d -http://bugs.gentoo.org/show_bug.cgi?id=331497 - ---- configure.ac -+++ configure.ac -@@ -53,6 +53,7 @@ - - dnl configure the panel plugin - XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20]) -+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.20]) - - dnl Check for i18n support - XDT_I18N([ca de fr ko lt pl uk]) ---- panel-plugin/Makefile.am -+++ panel-plugin/Makefile.am -@@ -16,11 +16,13 @@ - - xfce4_netload_plugin_CFLAGS = \ - -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ -- @LIBXFCE4PANEL_CFLAGS@ -+ @LIBXFCE4PANEL_CFLAGS@ \ -+ @LIBXFCEGUI4_CFLAGS@ - - xfce4_netload_plugin_LDADD = \ - @SOLLIBS@ \ -- @LIBXFCE4PANEL_LIBS@ -+ @LIBXFCE4PANEL_LIBS@ \ -+ @LIBXFCEGUI4_LIBS@ - - # .desktop file - # diff --git a/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-0.4.0-r1.ebuild b/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-0.4.0-r1.ebuild deleted file mode 100644 index 91030c579feb..000000000000 --- a/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-0.4.0-r1.ebuild +++ /dev/null @@ -1,43 +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-netload-plugin/xfce4-netload-plugin-0.4.0-r1.ebuild,v 1.11 2011/01/30 00:04:20 ssuominen Exp $ - -EAPI=3 -EAUTORECONF=yes -EINTLTOOLIZE=yes -inherit xfconf - -DESCRIPTION="Netload plugin for Xfce4 panel" -HOMEPAGE="http://www.xfce.org/" -SRC_URI="mirror://xfce/src/panel-plugins/${PN}/0.4/${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="debug" - -RDEPEND=">=xfce-base/libxfcegui4-4.3.20 - >=xfce-base/xfce4-panel-4.3.20" -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-util/intltool" - -pkg_setup() { - PATCHES=( - "${FILESDIR}"/${P}-asneeded.patch - "${FILESDIR}"/${P}-link_to_libxfcegui4.patch - "${FILESDIR}"/${P}-fix-tooltips-gtk2.16.patch - ) - XFCONF=( - --disable-dependency-tracking - $(xfconf_use_debug) - ) - DOCS="AUTHORS ChangeLog README" -} - -src_prepare() { - sed -i \ - -e '/^AC_INIT/s/netload_version()/netload_version/' \ - configure.ac || die - xfconf_src_prepare -} diff --git a/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.0.0.ebuild b/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.0.0.ebuild index d8ebc7226ff6..0cd90ea9cd9a 100644 --- a/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.0.0.ebuild +++ b/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.0.0.ebuild,v 1.7 2011/03/29 13:14:32 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.0.0.ebuild,v 1.8 2011/04/23 17:40:07 ssuominen Exp $ EAPI=3 inherit xfconf @@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/1.0/${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" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux" IUSE="debug" RDEPEND=">=xfce-base/libxfcegui4-4.4.0 |