summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xfce4-panel/.md5sum1
-rw-r--r--xfce4-panel/Pkgfile5
-rw-r--r--xfce4-panel/fix-panel-autohide.patch36
3 files changed, 1 insertions, 41 deletions
diff --git a/xfce4-panel/.md5sum b/xfce4-panel/.md5sum
index ae29749..45bc172 100644
--- a/xfce4-panel/.md5sum
+++ b/xfce4-panel/.md5sum
@@ -1,2 +1 @@
-fafe2306f350a3f81f2de3772b40899f fix-panel-autohide.patch
5a333af704e386c90ad829b6baf1a758 xfce4-panel-4.12.0.tar.bz2
diff --git a/xfce4-panel/Pkgfile b/xfce4-panel/Pkgfile
index 5f37675..55b19e5 100644
--- a/xfce4-panel/Pkgfile
+++ b/xfce4-panel/Pkgfile
@@ -8,14 +8,11 @@
name=xfce4-panel
version=4.12.0
release=1
-source=(http://archive.xfce.org/src/xfce/$name/${version%.*}/$name-$version.tar.bz2 \
- fix-panel-autohide.patch)
+source=(http://archive.xfce.org/src/xfce/$name/${version%.*}/$name-$version.tar.bz2)
build () {
cd $name-$version
- patch -p1 -i $SRC/fix-panel-autohide.patch
-
./configure --prefix=/usr \
--libexecdir=/usr/lib \
--disable-debug
diff --git a/xfce4-panel/fix-panel-autohide.patch b/xfce4-panel/fix-panel-autohide.patch
deleted file mode 100644
index 341dbe9..0000000
--- a/xfce4-panel/fix-panel-autohide.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 2b03d8ed2f33e125d08908ff6122db542fba773f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Gajd=C5=AF=C5=A1ek?= <gajdusek.petr@centrum.cz>
-Date: Sun, 14 Oct 2012 07:49:28 +0200
-Subject: [PATCH] Actions: Fix panel autohide broken by the actions menu (bug
- #8960)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Check the button toggle status in actions_plugin_menu() and avoid to popup
-the menu if the button is not pressed.
-
-Signed-off-by: Petr Gajdůšek <gajdusek.petr@centrum.cz>
----
- plugins/actions/actions.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/plugins/actions/actions.c b/plugins/actions/actions.c
-index 53ff8d0..7e24806 100644
---- a/plugins/actions/actions.c
-+++ b/plugins/actions/actions.c
-@@ -1248,6 +1248,11 @@ actions_plugin_menu (GtkWidget *button,
-
- panel_return_if_fail (XFCE_IS_ACTIONS_PLUGIN (plugin));
-
-+ // do not popup the menu if the button is being toggled off
-+ if (button != NULL
-+ && !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (button)))
-+ return;
-+
- if (plugin->menu == NULL)
- {
- plugin->menu = gtk_menu_new ();
---
-1.7.10.4
-

Generated by cgit