Fix tooltips with GTK+ >= 2.16 wrt #316685 by Ivan Ponomarev.

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

diff --git a/xfce-extra/xfce4-systemload-plugin/ChangeLog b/xfce-extra/xfce4-systemload-plugin/ChangeLog
index ef8cfc72533bf2bcf5b347514ac3d870d8a60de9..adbc3910a1f2853f015755a02289f01ca0fd1b6e 100644 (file)
--- a/xfce-extra/xfce4-systemload-plugin/ChangeLog
+++ b/xfce-extra/xfce4-systemload-plugin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-extra/xfce4-systemload-plugin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systemload-plugin/ChangeLog,v 1.2 2009/10/08 17:44:58 darkside Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systemload-plugin/ChangeLog,v 1.3 2010/04/22 16:32:19 ssuominen Exp $
+
+*xfce4-systemload-plugin-0.4.2-r1 (22 Apr 2010)
+
+  22 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +xfce4-systemload-plugin-0.4.2-r1.ebuild,
+  +files/xfce4-systemload-plugin-0.4.2-fix-tooltip-gtk2.12.patch:
+  Fix tooltips with GTK+ >= 2.16 wrt #316685 by Ivan Ponomarev.
 
   08 Oct 2009; Jeremy Olexa <darkside@gentoo.org>
   xfce4-systemload-plugin-0.4.2.ebuild:

diff --git a/xfce-extra/xfce4-systemload-plugin/Manifest b/xfce-extra/xfce4-systemload-plugin/Manifest
index 5fd22a9b42ae3fdbf68dd5edd3ae57ffe6325c49..12c483bb14dd35862aee5527c2b9c1483489ade7 100644 (file)
--- a/xfce-extra/xfce4-systemload-plugin/Manifest
+++ b/xfce-extra/xfce4-systemload-plugin/Manifest
@@ -1,5 +1,7 @@
+AUX xfce4-systemload-plugin-0.4.2-fix-tooltip-gtk2.12.patch 893 RMD160 82629579b35b29643f806b91d82d4aed6c448263 SHA1 8c940efc3ba676c1c2a38b443649e86ba8f2a006 SHA256 9e1554ddcb01f2392c3784a38f1ecb2b3ef93b531bd0bfce4e9ed1b6caa77d07
 AUX xfce4-systemload-plugin-0.4.2-libtool.patch 320 RMD160 e7b9281e27cd03d1fb0c3ec7aa5c458a0cb590ba SHA1 7ca21f3a9c7fe8407bb68f8b243a4c838b85bc58 SHA256 5be268498ebaefedfca1542ec7a89b23c14ea78e4bcf4e0e4afcf3367b4b56f6
 DIST xfce4-systemload-plugin-0.4.2.tar.bz2 184575 RMD160 228ad33b12a6a1151be6d079bd4c5a18fd50ba76 SHA1 517cc051633cc6f28147d5adeaf5db56219dddfb SHA256 0ca193fd7a21403566b452e42951e5ab816dcc69cfcca816b245da00f41ffc55
+EBUILD xfce4-systemload-plugin-0.4.2-r1.ebuild 1229 RMD160 cd1ef74fea4ea55858cd0be5444b473b89d418cb SHA1 fe759fe5aef732026742f7f3edc399df870a83c7 SHA256 677b8ec0df8e808de3a1bd732b9413db32eb3dafa77fb6d9b24b7352ce9468d5
 EBUILD xfce4-systemload-plugin-0.4.2.ebuild 1169 RMD160 65b4af2e28cddd7756f1887ac8b680f00cf55f72 SHA1 5236c59524d2e9ebc9e57377455e0c61594bbe4d SHA256 97400096edba540f2c7ebc2a2627cb698de2d2830bdad2e3de499b24a22a15cd
-MISC ChangeLog 635 RMD160 445502eb3c401aa49df6257803e922ee7d8dc20b SHA1 66c865254cd63d4953df30e7858425d8c568b900 SHA256 fbaeea9c40c4a163ecd268d8ef68199bb11ac7d0376f2baf4825ffc4537676cf
+MISC ChangeLog 914 RMD160 70052dfa86a52d8f906810701f330d830f9b517c SHA1 39ad29684ee17baa4982fced657929e24c15d7cc SHA256 edeac85806e9eed5112eccaad0daf22ffcc903eb66ba1f7bb59e3c2b17c06afd
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63

diff --git a/xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-0.4.2-fix-tooltip-gtk2.12.patch b/xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-0.4.2-fix-tooltip-gtk2.12.patch
new file mode 100644 (file)
index 0000000..d407678
--- /dev/null
+++ b/xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-0.4.2-fix-tooltip-gtk2.12.patch
@@ -0,0 +1,23 @@
+diff --git a/panel-plugin/systemload.c b/panel-plugin/systemload.c
+index cc96ec4..027e8fe 100644
+--- a/panel-plugin/systemload.c
++++ b/panel-plugin/systemload.c
+@@ -315,11 +315,18 @@ monitor_control_new(XfcePanelPlugin *plugin)
+ {
+     int count;
+     t_global_monitor *global;
++    GtkSettings *settings;
+ 
+     tooltips = gtk_tooltips_new ();
+     g_object_ref (tooltips);
+     gtk_object_sink (GTK_OBJECT (tooltips));
+     
++    /* reduce the default tooltip timeout to be smaller than the update
++     * interval otherwise we won't see tooltips on GTK 2.16 or newer */
++    settings = gtk_settings_get_default();
++    if (g_object_class_find_property(G_OBJECT_GET_CLASS(settings), "gtk-tooltip-timeout"))
++      g_object_set(settings, "gtk-tooltip-timeout", UPDATE_TIMEOUT - 10, NULL);
++
+     global = g_new(t_global_monitor, 1);
+     global->plugin = plugin;
+     global->timeout_id = 0;

diff --git a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-0.4.2-r1.ebuild b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-0.4.2-r1.ebuild
new file mode 100644 (file)
index 0000000..c11e8d0
--- /dev/null
+++ b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-0.4.2-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-0.4.2-r1.ebuild,v 1.1 2010/04/22 16:32:19 ssuominen Exp $
+
+EAUTORECONF=yes
+EINTLTOOLIZE=yes
+EAPI=2
+inherit xfconf
+
+DESCRIPTION="System load monitor panel plugin"
+HOMEPAGE="http://www.xfce.org/"
+SRC_URI="http://www.us.xfce.org/archive/src/panel-plugins/xfce4-systemload-plugin/0.4/xfce4-systemload-plugin-0.4.2.tar.bz2"
+
+LICENSE="BSD"
+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=">=x11-libs/gtk+-2.6:2
+       >=xfce-base/xfce4-panel-4.3.99.1
+       >=xfce-base/libxfcegui4-4.3.99.1
+       >=xfce-base/libxfce4util-4.3.99.1"
+DEPEND="${RDEPEND}
+       dev-util/pkgconfig
+       dev-util/intltool"
+
+pkg_setup() {
+       PATCHES=( "${FILESDIR}/${P}-libtool.patch"
+               "${FILESDIR}/${P}-fix-tooltip-gtk2.12.patch" )
+       DOCS="AUTHORS ChangeLog NEWS README"
+       XFCONF="--disable-dependency-tracking
+               $(use_enable debug)"
+}
+
+src_prepare() {
+       sed -i -e "/^AC_INIT/s/systemload_version()/systemload_version/" \
+               configure.in || die "sed failed"
+       xfconf_src_prepare
+}