[Lunar-commits] <moonbase> xfce4-settings: add a patch to compile with libxklavier 5.0.

[Florin Braescu]

commit c78034680b21423b6d888acb81dcb0bb377c3827
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Sun Apr 4 21:09:21 2010 +0300

    xfce4-settings: add a patch to compile with libxklavier 5.0.
---
 xfce4/core/xfce4-settings/BUILD   |   14 ++++++++++----
 xfce4/core/xfce4-settings/DETAILS |   10 ++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/xfce4/core/xfce4-settings/BUILD b/xfce4/core/xfce4-settings/BUILD
index df25364..3bed1c8 100644
--- a/xfce4/core/xfce4-settings/BUILD
+++ b/xfce4/core/xfce4-settings/BUILD
@@ -1,14 +1,20 @@
 (
+
    [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
 
    # tchan added this patch to fix the incorrect pkg-config check for libXi.
    # This should be removed when the xfce4 devs get around to fixing this correctly
-   patch_it $SOURCE_CACHE/$SOURCE2 1  &&
-   autoconf &&
-   ./configure  --build=$BUILD             \
+  patch_it $SOURCE_CACHE/$SOURCE2 1  &&
+
+  patch_it $SOURCE_CACHE/$SOURCE3 1  &&
+
+  autoheader  &&
+  autoconf    &&
+
+  ./configure  --build=$BUILD              \
                 --prefix=${MODULE_PREFIX}  \
                 $OPTS                     &&
 
-   default_make
+  default_make
 
 ) > $C_FIFO 2>&1
diff --git a/xfce4/core/xfce4-settings/DETAILS b/xfce4/core/xfce4-settings/DETAILS
index cda4c5b..2ed8814 100644
--- a/xfce4/core/xfce4-settings/DETAILS
+++ b/xfce4/core/xfce4-settings/DETAILS
@@ -2,18 +2,20 @@
            MAJOR=4.6
          VERSION=4.6.4
           SOURCE=$MODULE-$VERSION.tar.bz2
-         SOURCE2=$MODULE-4.6.1-libxi-patch.diff
+         SOURCE2=$MODULE-4.6.1-libxi.patch.bz2
+         SOURCE3=$MODULE-4.6.4-libxklavier.patch.bz2
       SOURCE_URL=http://www.xfce.org/archive/src/xfce/$MODULE/$MAJOR
      SOURCE2_URL=$PATCH_URL
+     SOURCE3_URL=$PATCH_URL
       SOURCE_VFY=sha1:93dc4358de157bdf9885648ca15034016f39384d
-     SOURCE2_VFY=sha1:78672e11b205e388127f977f8b8e43991829abe3
+     SOURCE2_VFY=sha1:ab13d8f642390ec04828a61a7b8e45c21aa5d17f
+     SOURCE3_VFY=sha1:5f3f65df9589c82cf3b4db5dd82802614bbf87a1
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org
          ENTERED=20090227
-         UPDATED=20100215
+         UPDATED=20100404
            SHORT="Xfce settings manager"
 
 cat << EOF
 Xfce settings manager.
 EOF
-