Fix usage of GtkRequisition and tooltip

Package-Manager: portage-2.1.10.3/cvs/Linux i686

5 files changed, 79 insertions, 24 deletions

diff --git a/lxde-base/lxpanel/ChangeLog b/lxde-base/lxpanel/ChangeLog
index b0cb0718ddf0..3efbc6f25b91 100644
--- a/lxde-base/lxpanel/ChangeLog
+++ b/lxde-base/lxpanel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for lxde-base/lxpanel
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/ChangeLog,v 1.30 2011/07/26 22:34:58 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/ChangeLog,v 1.31 2011/07/27 16:34:07 vostorga Exp $
+
+*lxpanel-0.5.7-r1 (27 Jul 2011)
+
+  27 Jul 2011; <vostorga@gentoo.org> -lxpanel-0.5.7.ebuild,
+  +lxpanel-0.5.7-r1.ebuild, +files/lxpanel-0.5.7-requisition.patch,
+  +files/lxpanel-0.5.7-tooltip-netstatus.patch:
+  Fix usage of GtkRequisition and tooltip
 
 *lxpanel-0.5.7 (26 Jul 2011)
 
diff --git a/lxde-base/lxpanel/Manifest b/lxde-base/lxpanel/Manifest
index b4b9a3aedce4..b541e70100ea 100644
--- a/lxde-base/lxpanel/Manifest
+++ b/lxde-base/lxpanel/Manifest
@@ -1,29 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX lxpanel-0.5.1-sandbox.patch 833 RMD160 83957b8e65104c12c2220027faf24d846fe4b3b9 SHA1 24f5f2c737e56f5bc457fa49426c5115e9d15498 SHA256 1df1574a0faf8d02465f7673f7967b14b2d0bd33f8ac9c5769888ef6c4272489
 AUX lxpanel-0.5.6-broken-apps.patch 567 RMD160 628f01083f7c06476394447aacdc6fa542359bab SHA1 23ae82f23458596e1bb356cf897e5310cb05c080 SHA256 0b914f680f2dbaafb3a4966a9795e3d154839cb910eca9f58bdf18d41901eb25
 AUX lxpanel-0.5.6-symbol-alarm.patch 1461 RMD160 5ed09d071a349b7554400ea73d16f6aacdc4ad8d SHA1 6b111b32eb1ae9ee869df8ff0ac4c23b8ccbfbb8 SHA256 afafb59ea3e537147ff4d81feb5ec2a3a18eaa628f992c5a44321fa29b85e6af
+AUX lxpanel-0.5.7-requisition.patch 1003 RMD160 88d9b762099ed3cbebdf6ce9277720a70ea96ab2 SHA1 4ec1715f8fa00bcae92157ba2fb500f3852cb3e6 SHA256 cc25d00f4d9efc6be1ddb2adfb8f13dff37547632db5563528e68a78e3c2d36f
+AUX lxpanel-0.5.7-tooltip-netstatus.patch 1084 RMD160 323191b9177b50ff44ab61b91d0704afd0e798bb SHA1 511e3291cb60970864af10da87f65df12abf2174 SHA256 df6bbcdac99fa9a79b7329ec51b07ca3cccb05cf128d4d98ed8f65f57541a93f
 DIST lxpanel-0.5.6.tar.gz 1074786 RMD160 5e5ebdd185d06fe0d1965ec2ed12ffecf0984b7e SHA1 fc5483e6016ac52c38b38274cca7661f2aa828ab SHA256 9c04839e2d23feec8b107a1d76899aca645416862b4b6ca01f8db743944348e1
 DIST lxpanel-0.5.7.tar.gz 1166355 RMD160 489dc9515ab0f6bac5136a0c4c93fbcb26f48e97 SHA1 276168fb4560899e83a6a340448c961d63333717 SHA256 89d1b55b207e61b7b7433cb51302bdbee644fb78b5b57892d67cb19072f548a1
 EBUILD lxpanel-0.5.6.ebuild 1552 RMD160 cf840c62da5defd98dc1351c4b64b155671de0de SHA1 9b9e3f01b902e84dfbcbb1d347b693fbad4858e7 SHA256 ca22d268d0bc7a9acfdd0a1302f2e54cd6000d5b08baa9ad825318251e478fec
-EBUILD lxpanel-0.5.7.ebuild 1466 RMD160 c6d4d9b6b5a2e04adcf3643badcee13835c2452f SHA1 6ad3077f504d8c01210bed8b59fe05410629e8e9 SHA256 d3dd4bee67d9cf8fe35ba28959ab9012f2990cb798fb5f8aa8b58fe561ae6e4c
-MISC ChangeLog 4260 RMD160 ccf597daaf79c8234673856190fe7006ad3d1a51 SHA1 ee3b7fffb360142de64333b93584a343bcaf2e0e SHA256 8e2219b0191cacd4b234da3046daca0dc7903500a629ad6e99402c69395891e8
+EBUILD lxpanel-0.5.7-r1.ebuild 1565 RMD160 a334922b4f3b0da28da4cf0ca1127e21e43792f5 SHA1 d17a2b45bce97069347a49160d5334e322f3bfcb SHA256 1e33c7068ac25935404a0fc5a1ad06af050e5fbcb5320ea2e327b102ce625c86
+MISC ChangeLog 4512 RMD160 de40777ddfaaa4ed467e0503e3eae40ad77cd19b SHA1 e1fee525ee3a1d9c840ad45891a0a36cd90b226d SHA256 8c2d4d6af8738be5250fb4976e3094933ac9bac04c053113f889ad0b2aae4f12
 MISC metadata.xml 159 RMD160 35036c133a5c9c7edccc3cdfed5789092f884048 SHA1 bdf1b7cc6ffbdd223b6f05aa072e857dfc981c4f SHA256 09574ccad15f69d5367ecbb1a491cd636fb88582f69987d2ec217109dfe8befb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJOL0EQAAoJEPqDWhW0r/LCraMQAJ7RYI/jIl6MF85QZr2i0Bus
-VnGsCXehJlAd48kj8+OdutIDD0JTL/SF/w04VYUEwb4JWiAdWhyoRj25CNnjJYqf
-2pfc4cx7vVpJuJsm3PjeBVuXTGbAGfIwVF6U/5M3V5kcx1lzFdjmezqILUcaTR3s
-Z92L+D7nxtImuoSNHXIZyCgCQGqmMOX/+oAzel2EvA8jp/kuSNGjZFYypOw54xJT
-NqN9Zu6DUIKLjc5SJPw223wKCScsR4J+cDDJ08U/pQRUv4LfsuAtHWafRepWcCys
-RdZ25uWZQPLw7Z8EoX2xhovodjbhLYS5bf2VKjfmGkYwVHLXOEMLo9fco5FGBEJU
-xIZ/pPPcgbiqthiVOfTo0BuxVTwF9kT+yGYp9vnIg6duYcQ0fOn8yEeFB1d+0Ws0
-YVnd6kyo0hAH4JDq/u/03hqcGw/LUsXoJaj6bs6PdZEOGr8byTgBA9bJhmObnWXV
-U/zdEa3h2EstzYtabkz3Kp+S7jUTHhilfsx7boU/CPhInyaswc1cgxhOeD1vJjEF
-jL0Fae+vIRnOTEjzoQBuXhGNV5rJTusTnXgBoDV6DApyTuvLZvXLRqsuiAi8F8Nq
-cH2yRcZ5CWs+CdDBvbrE8H/gYeM2jNEGN01Ej5JaxixJfIcsUKtJqiaZbvdxNsgJ
-6G34S4Vo5t8nAsSsVN+1
-=soHc
------END PGP SIGNATURE-----
diff --git a/lxde-base/lxpanel/files/lxpanel-0.5.7-requisition.patch b/lxde-base/lxpanel/files/lxpanel-0.5.7-requisition.patch
new file mode 100644
index 000000000000..b52cf991af34
--- /dev/null
+++ b/lxde-base/lxpanel/files/lxpanel-0.5.7-requisition.patch
@@ -0,0 +1,31 @@
+From 200121f93d7c6ac9aadb53c58f45906ecd1e3b7a Mon Sep 17 00:00:00 2001
+From: Julien Lavergne <julien.lavergne@gmail.com>
+Date: Sun, 24 Jul 2011 15:43:24 +0200
+Subject: [PATCH] Fix usage of GtkRequisition
+
+---
+ src/plugins/menu.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/plugins/menu.c b/src/plugins/menu.c
+index 59a8dad..6d0ad9c 100644
+--- a/src/plugins/menu.c
++++ b/src/plugins/menu.c
+@@ -142,10 +142,10 @@ menu_pos(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, GtkWidget *widget)
+     gdk_window_get_origin(widget->window, &ox, &oy);
+ #endif
+ #if GTK_CHECK_VERSION(2,20,0)
+-    GtkRequisition *requisition;
+-    gtk_widget_get_requisition(GTK_WIDGET(menu),requisition);
+-    w = requisition->width;
+-    h = requisition->height;
++    GtkRequisition requisition;
++    gtk_widget_get_requisition(GTK_WIDGET(menu), &requisition);
++    w = requisition.width;
++    h = requisition.height;
+ 
+ #else
+     w = GTK_WIDGET(menu)->requisition.width;
+-- 
+1.7.0.1
+
diff --git a/lxde-base/lxpanel/files/lxpanel-0.5.7-tooltip-netstatus.patch b/lxde-base/lxpanel/files/lxpanel-0.5.7-tooltip-netstatus.patch
new file mode 100644
index 000000000000..a92732783ac2
--- /dev/null
+++ b/lxde-base/lxpanel/files/lxpanel-0.5.7-tooltip-netstatus.patch
@@ -0,0 +1,33 @@
+From c30911ee2846a7ab544552651e679786483f2168 Mon Sep 17 00:00:00 2001
+From: Andrea Florio <andrea@opensuse.org>
+Date: Mon, 25 Jul 2011 00:55:29 +0200
+Subject: [PATCH] fixed error in tooltipS function call
+
+---
+ src/plugins/netstatus/netstatus-icon.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/src/plugins/netstatus/netstatus-icon.c b/src/plugins/netstatus/netstatus-icon.c
+index 2cd3ccb..b3bfc19 100644
+--- a/src/plugins/netstatus/netstatus-icon.c
++++ b/src/plugins/netstatus/netstatus-icon.c
+@@ -26,6 +26,7 @@
+ 
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
++#include <gtk/gtktooltips.h>
+ 
+ #include "netstatus-util.h"
+ #include "netstatus-enums.h"
+@@ -899,7 +900,7 @@ netstatus_icon_instance_init (NetstatusIcon      *icon,
+   gtk_container_add (GTK_CONTAINER (icon), icon->priv->signal_image);
+   gtk_widget_hide (icon->priv->signal_image);
+ 
+-  icon->priv->tooltips = gtk_tooltip_new ();
++  icon->priv->tooltips = gtk_tooltips_new ();
+   g_object_ref (icon->priv->tooltips);
+   gtk_object_sink (GTK_OBJECT (icon->priv->tooltips));
+ 
+-- 
+1.7.0.1
+
diff --git a/lxde-base/lxpanel/lxpanel-0.5.7.ebuild b/lxde-base/lxpanel/lxpanel-0.5.7-r1.ebuild
index 32e9f64db036..d6fb5e07c876 100644
--- a/lxde-base/lxpanel/lxpanel-0.5.7.ebuild
+++ b/lxde-base/lxpanel/lxpanel-0.5.7-r1.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/lxde-base/lxpanel/lxpanel-0.5.7.ebuild,v 1.1 2011/07/26 22:34:58 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.5.7-r1.ebuild,v 1.1 2011/07/27 16:34:07 vostorga Exp $
 
 EAPI="4"
 
@@ -29,6 +29,8 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.5.1-sandbox.patch
 	epatch "${FILESDIR}"/${PN}-0.5.6-broken-apps.patch
+	epatch "${FILESDIR}"/${P}-requisition.patch
+	epatch "${FILESDIR}"/${P}-tooltip-netstatus.patch
 	eautoreconf
 }