summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--desktop/lxpanel/config/panel6
-rw-r--r--desktop/lxpanel/lxpanel.SlackBuild5
-rw-r--r--desktop/lxpanel/lxpanel.info8
-rw-r--r--desktop/lxpanel/patches/0001-fix_crash_after_click_on_empty_part_of_panel.patch25
4 files changed, 36 insertions, 8 deletions
diff --git a/desktop/lxpanel/config/panel b/desktop/lxpanel/config/panel
index 52b8a6de69..a58450da8b 100644
--- a/desktop/lxpanel/config/panel
+++ b/desktop/lxpanel/config/panel
@@ -53,13 +53,13 @@ Plugin {
id=pcmanfm.desktop
}
Button {
- id=mozilla-firefox.desktop
+ id=id=menu://applications/Internet/mozilla-firefox.desktop
}
Button {
- id=mozilla-thunderbird.desktop
+ id=menu://applications/Internet/mozilla-thunderbird.desktop
}
Button {
- id=lxterminal.desktop
+ id=menu://applications/System/lxterminal.desktop
}
}
}
diff --git a/desktop/lxpanel/lxpanel.SlackBuild b/desktop/lxpanel/lxpanel.SlackBuild
index cb7aa7ff21..bc4f6cae32 100644
--- a/desktop/lxpanel/lxpanel.SlackBuild
+++ b/desktop/lxpanel/lxpanel.SlackBuild
@@ -24,7 +24,7 @@
# Modified by Matteo Bernardini <ponce@slackbuilds.org>
PRGNAM=lxpanel
-VERSION=${VERSION:-20140725_175f73d}
+VERSION=${VERSION:-0.7.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -72,6 +72,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# apply patches from upstream
+for i in $CWD/patches/* ; do patch -p1 < $i ; done
+
sh autogen.sh || true
CFLAGS="$SLKCFLAGS" \
diff --git a/desktop/lxpanel/lxpanel.info b/desktop/lxpanel/lxpanel.info
index 860040e485..037093fc1e 100644
--- a/desktop/lxpanel/lxpanel.info
+++ b/desktop/lxpanel/lxpanel.info
@@ -1,10 +1,10 @@
PRGNAM="lxpanel"
-VERSION="20140725_175f73d"
+VERSION="0.7.0"
HOMEPAGE="http://wiki.lxde.org/en/LXPanel"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxpanel-20140725_175f73d.tar.xz"
-MD5SUM="4201a36ce9b0a4396b8496bf0272843c"
+DOWNLOAD="http://downloads.sf.net/lxde/lxpanel-0.7.0.tar.xz"
+MD5SUM="39698de2c5eda2837607762c9f522cd0"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="lxmenu-data menu-cache"
+REQUIRES="lxmenu-data libfm"
MAINTAINER="Matteo Bernardini"
EMAIL="ponce@slackbuilds.org"
diff --git a/desktop/lxpanel/patches/0001-fix_crash_after_click_on_empty_part_of_panel.patch b/desktop/lxpanel/patches/0001-fix_crash_after_click_on_empty_part_of_panel.patch
new file mode 100644
index 0000000000..5da82482f4
--- /dev/null
+++ b/desktop/lxpanel/patches/0001-fix_crash_after_click_on_empty_part_of_panel.patch
@@ -0,0 +1,25 @@
+From d4943c80cded6325284be8b58003fe63dd6e8255 Mon Sep 17 00:00:00 2001
+From: Raimar <no@email.de>
+Date: Thu, 21 Aug 2014 23:21:28 +0200
+Subject: [PATCH] fix crash after click on empty part of panel
+
+---
+ src/panel.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/panel.c b/src/panel.c
+index 6b2ede6..87903d8 100644
+--- a/src/panel.c
++++ b/src/panel.c
+@@ -233,7 +233,7 @@ static gboolean lxpanel_button_press(GtkWidget *widget, GdkEventButton *event)
+ gtk_menu_popup(popup, NULL, NULL, NULL, NULL, event->button, event->time);
+ return TRUE;
+ }
+- return GTK_WIDGET_CLASS(lxpanel_parent_class)->button_press_event(widget, event);
++ return FALSE;
+ }
+
+ static void lxpanel_class_init(PanelToplevelClass *klass)
+--
+1.7.10.4
+