Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=19c42042b6b0a4318ff4869c5a04bba42f6590c0
commit 19c42042b6b0a4318ff4869c5a04bba42f6590c0 Author: bouleetbil <bouleet...@frogdev.info> Date: Fri Jul 29 16:21:43 2011 +0200 lxpanel-0.5.8-1-x86_64 *version bump diff --git a/source/x11-extra/lxpanel/FrugalBuild b/source/x11-extra/lxpanel/FrugalBuild index 10c72ac..8b68dc7 100644 --- a/source/x11-extra/lxpanel/FrugalBuild +++ b/source/x11-extra/lxpanel/FrugalBuild @@ -2,10 +2,10 @@ # Maintainer: bouleetbil <bouleet...@frogdev.info> pkgname=lxpanel -pkgver=0.5.7 -pkgrel=2 +pkgver=0.5.8 +pkgrel=1 pkgdesc="lxpanel is a light-weight X11 desktop panel for lxde" -depends=('wireless_tools' 'gtk+2>=2.20.0-2' 'alsa-lib' 'libxpm' 'libxdamage' 'freetype2' \ +depends=('wireless_tools' 'gtk+2' 'alsa-lib' 'libxpm' 'libxdamage' 'freetype2' \ 'libxau' 'libxdmcp' 'libxext' 'libxml2' 'menu-cache>=0.3.2' 'lxmenu-data' 'xcb-util>=0.3.8') rodepends=('pcmanfm' 'lxsession-lite' 'gtk+2-engines' 'gtk+2-theme-frugalware') makedepends=('intltool') @@ -14,10 +14,7 @@ groups=('x11-extra' 'lxde-desktop') archs=('i686' 'x86_64' 'ppc') _F_sourceforge_dirname="lxde" Finclude sourceforge -source=($source gtk.diff tooltips.diff) url="http://lxde.org/" -sha1sums=('276168fb4560899e83a6a340448c961d63333717' \ - 'f851d82dae0a8edb465f98899858b48c92154fe2' \ - 'b1b35ca85850f466732a558dec02d7247456c759') +sha1sums=('a9d6bd9d15a3588fb959aa32880ad888c58359f7') # optimization OK diff --git a/source/x11-extra/lxpanel/gtk.diff b/source/x11-extra/lxpanel/gtk.diff deleted file mode 100644 index f3bd269..0000000 --- a/source/x11-extra/lxpanel/gtk.diff +++ /dev/null @@ -1,32 +0,0 @@ -From 200121f93d7c6ac9aadb53c58f45906ecd1e3b7a Mon Sep 17 00:00:00 2001 -From: Julien Lavergne <julien.laver...@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/source/x11-extra/lxpanel/tooltips.diff b/source/x11-extra/lxpanel/tooltips.diff deleted file mode 100644 index 066b145..0000000 --- a/source/x11-extra/lxpanel/tooltips.diff +++ /dev/null @@ -1,24 +0,0 @@ -X-Git-Url: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde%2Flxpanel;a=blobdiff_plain;f=src%2Fplugins%2Fnetstatus%2Fnetstatus-icon.c;h=b3bfc19fe203f9b469c82fbe9c09e585e8c6b90e;hp=2cd3ccbe2da8ded3f434e3056c101f2926beee5b;hb=c30911ee2846a7ab544552651e679786483f2168;hpb=200121f93d7c6ac9aadb53c58f45906ecd1e3b7a - -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)); - - _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git