[Lunar-commits] <moonbase> xfce4-panel: prevent zombie panel entries

[Paul Bredbury]

commit e7c566c099aa183d4a63cfbf6f7ce65875d01bde
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Sat Jan 22 20:35:07 2011 +0700

    xfce4-panel: prevent zombie panel entries
---
 xfce4/core/xfce4-panel/BUILD   |   14 ++++++++++----
 xfce4/core/xfce4-panel/DETAILS |    9 ++++++---
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/xfce4/core/xfce4-panel/BUILD b/xfce4/core/xfce4-panel/BUILD
index 24c12b9..ba09587 100644
--- a/xfce4/core/xfce4-panel/BUILD
+++ b/xfce4/core/xfce4-panel/BUILD
@@ -1,9 +1,15 @@
 (
-   [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
 
-   # make sure proper PKG_CONFIG_PATH is set
-   export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}"  &&
+  if [ -f /etc/profile.d/xfce4.rc ] ; then
+    . /etc/profile.d/xfce4.rc
+  fi &&
 
-   default_build
+  # Stop zombie entries in panel
+  patch_it $SOURCE2 1 &&
+
+  # Make sure proper PKG_CONFIG_PATH is set
+  export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+
+  default_build
 
 ) > $C_FIFO 2>&1
diff --git a/xfce4/core/xfce4-panel/DETAILS b/xfce4/core/xfce4-panel/DETAILS
index 9630133..0e878af 100644
--- a/xfce4/core/xfce4-panel/DETAILS
+++ b/xfce4/core/xfce4-panel/DETAILS
@@ -1,17 +1,20 @@
           MODULE=xfce4-panel
          VERSION=4.8.0
           SOURCE=$MODULE-$VERSION.tar.bz2
+         SOURCE2=xfce4-panel-4.8.0-zombies.patch.bz2
       SOURCE_URL=http://archive.xfce.org/xfce/4.8/src/
+     SOURCE2_URL=$PATCH_URL
       SOURCE_VFY=sha1:ebdaff1d0f37e9424b483ba1e496b87fd82d81cb
+     SOURCE2_VFY=sha1:1fd703fedaf478f2c9c7c14d259f8b025b21c3c0
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
-        WEB_SITE=http://www.xfce.org
+        WEB_SITE=http://www.xfce.org/projects/xfce4-panel
          ENTERED=20030715
-         UPDATED=20110118
+         UPDATED=20110120
            SHORT="Xfce4 panel"
 
 cat << EOF
 xfce4-panel -- The panel for the Xfce4 desktop environment. Provides
-program lauchers, menus, and several plugins like a clock a pager and
+program lauchers, menus, and several plugins like a clock, a pager and
 a mail checker. Allows external plugins to be written and installed
 separately.
 EOF