Fix tooltips with new dev-libs/glib and x11-libs/gtk+ wrt #274024.

Package-Manager: portage-2.2_rc41/cvs/Linux x86_64

4 files changed, 137 insertions, 2 deletions

diff --git a/xfce-extra/xfce4-netload-plugin/ChangeLog b/xfce-extra/xfce4-netload-plugin/ChangeLog
index 9db514c9a9cb..ddffee1970c0 100644
--- a/xfce-extra/xfce4-netload-plugin/ChangeLog
+++ b/xfce-extra/xfce4-netload-plugin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-extra/xfce4-netload-plugin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-netload-plugin/ChangeLog,v 1.1 2009/08/25 07:52:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-netload-plugin/ChangeLog,v 1.2 2009/09/22 20:28:05 ssuominen Exp $
+
+*xfce4-netload-plugin-0.4.0-r1 (22 Sep 2009)
+
+  22 Sep 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +xfce4-netload-plugin-0.4.0-r1.ebuild,
+  +files/xfce4-netload-plugin-0.4.0-fix-tooltips-gtk2.16.patch:
+  Fix tooltips with new dev-libs/glib and x11-libs/gtk+ wrt #274024.
 
 *xfce4-netload-plugin-0.4.0 (25 Aug 2009)
 
diff --git a/xfce-extra/xfce4-netload-plugin/Manifest b/xfce-extra/xfce4-netload-plugin/Manifest
index 491424917651..787acb3edd4b 100644
--- a/xfce-extra/xfce4-netload-plugin/Manifest
+++ b/xfce-extra/xfce4-netload-plugin/Manifest
@@ -1,5 +1,7 @@
 AUX xfce4-netload-plugin-0.4.0-asneeded.patch 549 RMD160 1df5c37d045b17c9986d933ce72e6bc27f88e368 SHA1 203831bf57c2b988b8afc1cbb80533d8a5a8ac0d SHA256 9e8893efa3dda39b099d542367aaa3e99e5e7c3fa3521a0a6f1777b314e6bbe8
+AUX xfce4-netload-plugin-0.4.0-fix-tooltips-gtk2.16.patch 3646 RMD160 cf7cad4ae00f359d2c775e6d90ae49ca440dd416 SHA1 bccd31d88623624d661fa2f523c5f72bd344f1a3 SHA256 c5ee9f480964a43a497e01808325b79bc208e981656d54e8da424f3cc7fab39c
 DIST xfce4-netload-plugin-0.4.0.tar.bz2 125046 RMD160 47d8183da3885b6a476504fd8d5762be7d4fffac SHA1 197231f99773f4e299c64125dd0d1a25bfb533bb SHA256 debcc2793b3f42556fc0a58e69bb46925880791eff60f3231f27ec5a5359a191
+EBUILD xfce4-netload-plugin-0.4.0-r1.ebuild 1011 RMD160 a9b3e79cb5197a5b94464596b0c1b205f3942037 SHA1 be08415364eda6a0631ba6ccfd5ff5f7906123b1 SHA256 7afdbeccec4a679a68bfb7f8ac82eb46666ca77be1789c743a93926b6f061c98
 EBUILD xfce4-netload-plugin-0.4.0.ebuild 951 RMD160 069791c9bf9e1b78c808f3aabfe2345fcd1cc024 SHA1 7deb0ecfaaf836b021c27b0a07af3f11e10e27f0 SHA256 3cd7cdf1576bcbd669cf926ce3910c7b85176d499c6cc20be50d3aba7fd08e0b
-MISC ChangeLog 474 RMD160 ba3a8b9bcb9972659824735763e44fbcd338f970 SHA1 7f8a5fadcb8e964a48bcc6a12d7b45e56044441b SHA256 c7c617d9a3f9c8e69e47fb7b2a6c534699a76221441c72f7c70dbad45ddf509a
+MISC ChangeLog 749 RMD160 39c154932afeb91b34e15271158868db7ddc6052 SHA1 44f509fb58c8271acf9f99a1cbe77fdebf18d759 SHA256 b1238a1342e84dfc6ef9728e036a5b39afd10e4e61ce26303b5d4030c51301e6
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
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
new file mode 100644
index 000000000000..95522393aa58
--- /dev/null
+++ b/xfce-extra/xfce4-netload-plugin/files/xfce4-netload-plugin-0.4.0-fix-tooltips-gtk2.16.patch
@@ -0,0 +1,90 @@
+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/xfce4-netload-plugin-0.4.0-r1.ebuild b/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..b48c4cfebda2
--- /dev/null
+++ b/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-0.4.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2009 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.1 2009/09/22 20:28:05 ssuominen Exp $
+
+EAUTORECONF=yes
+EINTLTOOLIZE=yes
+EAPI=2
+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"
+IUSE="debug"
+
+RDEPEND=">=xfce-base/xfce4-panel-4.3.20"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool"
+
+pkg_setup() {
+	PATCHES=( "${FILESDIR}/${P}-asneeded.patch"
+		"${FILESDIR}/${P}-fix-tooltips-gtk2.16.patch" )
+	DOCS="AUTHORS ChangeLog README"
+	XFCONF="--disable-dependency-tracking
+		$(use_enable debug)"
+}
+
+src_prepare() {
+	sed -i -e "/^AC_INIT/s/netload_version()/netload_version/" configure.ac \
+		|| die "sed failed"
+	xfconf_src_prepare
+}