summaryrefslogtreecommitdiff
path: root/community/gnome-panel
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-04-24 00:49:38 -0700
committerroot <root@rshg054.dnsready.net>2013-04-24 00:49:38 -0700
commit6e4a9ce4b0809e1eeb57f514f5ea71e2e77355bb (patch)
tree777883bcc66e4420c1eaf7aaea255326b46690e7 /community/gnome-panel
parentd1d93fafb9ef98fdd0c9a5a486c179c03cbbfb33 (diff)
Wed Apr 24 00:49:37 PDT 2013
Diffstat (limited to 'community/gnome-panel')
-rw-r--r--community/gnome-panel/PKGBUILD9
-rw-r--r--community/gnome-panel/logout-hang-workaround.patch15
2 files changed, 2 insertions, 22 deletions
diff --git a/community/gnome-panel/PKGBUILD b/community/gnome-panel/PKGBUILD
index e490594e4..a287972a4 100644
--- a/community/gnome-panel/PKGBUILD
+++ b/community/gnome-panel/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 88684 2013-04-21 22:16:57Z heftig $
+# $Id: PKGBUILD 88822 2013-04-23 02:28:34Z bgyorgy $
# Maintainer: Balló György <ballogyor+arch at gmail dot com>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgbase=gnome-panel
pkgname=('gnome-panel' 'gnome-flashback-session')
pkgver=3.6.2
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
license=('GPL')
pkgdesc="Legacy GNOME panel"
@@ -19,14 +19,12 @@ source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:3}/$pkgbase-$
gnome-desktop-3.8.patch
drop-gweather-xml-include.patch
18_fix_force_quit_applet.patch
- logout-hang-workaround.patch
0001-Add-the-GNOME-Flashback-session.patch
fix-autoconf.patch)
sha256sums=('a41c45c5512e796b8602ce50bf0d205993eab364c860aae31afa582d77b77079'
'3a67f4b07a7dd356fad6b40a43983f3945123ed40080eb153396a481b34efc0c'
'e3298c62bc577969817c5d6752be83a5129004fd344e4f7998a0d8aa61874305'
'9d742f675d9e09a032bfe00e0523a4ef7e234589a74a6086243bf335ce212775'
- 'e98391114fe618d3c9530cd5ad88e5d0d0e3b62890e4494f7db6a76ec3613a47'
'f313791d246749f18764ad4af13c4efe54483bc327fab371c47f9fbfc25b20a9'
'6828c097505d2dbbf465ed7ff694adbd646a0af2105c8dd864d1061bf0afea71')
@@ -42,9 +40,6 @@ build() {
# Fix force quit applet to avoid freeze
patch -Np1 -i "$srcdir/18_fix_force_quit_applet.patch"
- # Apply a workaround to avoid hang on logout for 15-20 sec
- patch -Np1 -i "$srcdir/logout-hang-workaround.patch"
-
# Add GNOME Flashback session
# https://bugzilla.gnome.org/show_bug.cgi?id=694625
patch -Np1 -i "$srcdir/0001-Add-the-GNOME-Flashback-session.patch"
diff --git a/community/gnome-panel/logout-hang-workaround.patch b/community/gnome-panel/logout-hang-workaround.patch
deleted file mode 100644
index 0b13e35b6..000000000
--- a/community/gnome-panel/logout-hang-workaround.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur gnome-panel-3.6.2.orig/gnome-panel/panel-session.c gnome-panel-3.6.2/gnome-panel/panel-session.c
---- gnome-panel-3.6.2.orig/gnome-panel/panel-session.c 2012-09-03 17:41:42.000000000 +0200
-+++ gnome-panel-3.6.2/gnome-panel/panel-session.c 2013-04-11 00:59:42.125864185 +0200
-@@ -69,11 +69,6 @@
-
- egg_sm_client_set_mode (mode);
-
-- client = egg_sm_client_get ();
--
-- g_signal_connect (client, "quit",
-- G_CALLBACK (panel_session_handle_quit), NULL);
--
- /* We don't want the WM to try and save/restore our
- * window position */
- gdk_x11_set_sm_client_id (NULL);