[Lunar-commits] <moonbase> xfce4: include fixes from git

[Paul Bredbury]

commit 13856a08dd6907dffda1517532ef1da2a8bafc35
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Tue Jan 25 18:16:46 2011 +0700

    xfce4: include fixes from git
    
    For xfdesktop, xfwm4 and xfce4-panel.
    
    Because there's a lot of bugs fixed.
---
 xfce4/core/xfce4-panel/BUILD   |    5 ++---
 xfce4/core/xfce4-panel/DETAILS |    6 +++---
 xfce4/core/xfdesktop/BUILD     |   13 +++++++++----
 xfce4/core/xfdesktop/DETAILS   |    5 ++++-
 xfce4/core/xfwm4/BUILD         |   14 +++++++-------
 xfce4/core/xfwm4/DETAILS       |    5 ++++-
 6 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/xfce4/core/xfce4-panel/BUILD b/xfce4/core/xfce4-panel/BUILD
index 5aaffc3..b0e065e 100644
--- a/xfce4/core/xfce4-panel/BUILD
+++ b/xfce4/core/xfce4-panel/BUILD
@@ -1,12 +1,11 @@
 (
 
+  patch_it $SOURCE2 1 &&
+
   if [ -f /etc/profile.d/xfce4.rc ] ; then
     . /etc/profile.d/xfce4.rc
   fi &&
 
-  # 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}" &&
 
diff --git a/xfce4/core/xfce4-panel/DETAILS b/xfce4/core/xfce4-panel/DETAILS
index 0e878af..d2bb4ab 100644
--- a/xfce4/core/xfce4-panel/DETAILS
+++ b/xfce4/core/xfce4-panel/DETAILS
@@ -1,15 +1,15 @@
           MODULE=xfce4-panel
          VERSION=4.8.0
           SOURCE=$MODULE-$VERSION.tar.bz2
-         SOURCE2=xfce4-panel-4.8.0-zombies.patch.bz2
+         SOURCE2=xfce4-panel-4.8.0-git-20110125.patch.bz2
       SOURCE_URL=http://archive.xfce.org/xfce/4.8/src/
      SOURCE2_URL=$PATCH_URL
       SOURCE_VFY=sha1:ebdaff1d0f37e9424b483ba1e496b87fd82d81cb
-     SOURCE2_VFY=sha1:1fd703fedaf478f2c9c7c14d259f8b025b21c3c0
+     SOURCE2_VFY=sha1:dd1cd16b3603c6b70b847f7e473ab92aa3bb2166
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org/projects/xfce4-panel
          ENTERED=20030715
-         UPDATED=20110120
+         UPDATED=20110123
            SHORT="Xfce4 panel"
 
 cat << EOF
diff --git a/xfce4/core/xfdesktop/BUILD b/xfce4/core/xfdesktop/BUILD
index 24c12b9..6108fb1 100644
--- a/xfce4/core/xfdesktop/BUILD
+++ b/xfce4/core/xfdesktop/BUILD
@@ -1,9 +1,14 @@
 (
-   [ -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}"  &&
+  patch_it $SOURCE2 1 &&
 
-   default_build
+  if [ -f /etc/profile.d/xfce4.rc ] ; then
+    . /etc/profile.d/xfce4.rc
+  fi &&
+
+  # 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/xfdesktop/DETAILS b/xfce4/core/xfdesktop/DETAILS
index 02d0989..6b6a522 100644
--- a/xfce4/core/xfdesktop/DETAILS
+++ b/xfce4/core/xfdesktop/DETAILS
@@ -1,12 +1,15 @@
           MODULE=xfdesktop
          VERSION=4.8.0
           SOURCE=$MODULE-$VERSION.tar.bz2
+         SOURCE2=xfdesktop-4.8.0-git-20110125.patch.bz2
       SOURCE_URL=http://archive.xfce.org/xfce/4.8/src/
+     SOURCE2_URL=$PATCH_URL
       SOURCE_VFY=sha1:fab01f7e01c5906c651db83091bd7696c3cd7a5b
+     SOURCE2_VFY=sha1:1a7faafe2f2fe15c500f04ab028f43a02561e366
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org
          ENTERED=20030715
-         UPDATED=20110118
+         UPDATED=20110123
            SHORT="Desktop manager for Xfce4"
 
 cat << EOF
diff --git a/xfce4/core/xfwm4/BUILD b/xfce4/core/xfwm4/BUILD
index bb4d418..6108fb1 100644
--- a/xfce4/core/xfwm4/BUILD
+++ b/xfce4/core/xfwm4/BUILD
@@ -1,14 +1,14 @@
 (
 
-  [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+  patch_it $SOURCE2 1 &&
 
-  # 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 &&
 
-  ./configure  --build=$BUILD             \
-               --prefix=${MODULE_PREFIX}  \
-               $OPTS                     &&
+  # Make sure proper PKG_CONFIG_PATH is set
+  export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
 
-  default_make
+  default_build
 
 ) > $C_FIFO 2>&1
diff --git a/xfce4/core/xfwm4/DETAILS b/xfce4/core/xfwm4/DETAILS
index 331a7d8..164908a 100644
--- a/xfce4/core/xfwm4/DETAILS
+++ b/xfce4/core/xfwm4/DETAILS
@@ -1,12 +1,15 @@
           MODULE=xfwm4
          VERSION=4.8.0
           SOURCE=$MODULE-$VERSION.tar.bz2
+         SOURCE2=xfwm4-4.8.0-git-20110125.patch.bz2
       SOURCE_URL=http://archive.xfce.org/xfce/4.8/src/
+     SOURCE2_URL=$PATCH_URL
       SOURCE_VFY=sha1:d3288cdf327c7c003f1af64798d887b805b5f679
+     SOURCE2_VFY=sha1:11dcf6a25095406470a15dfa88e76dd77007ced9
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org
          ENTERED=20030715
-         UPDATED=20110118
+         UPDATED=20110123
            SHORT="Window manager for Xfce4"
 
 cat << EOF