1 files changed, 9 insertions, 16 deletions
diff --git a/desktop/lxpanel/lxpanel.SlackBuild b/desktop/lxpanel/lxpanel.SlackBuild
index c014a4bcd0..e4d87eaa1c 100644
--- a/desktop/lxpanel/lxpanel.SlackBuild
+++ b/desktop/lxpanel/lxpanel.SlackBuild
@@ -24,16 +24,14 @@
 # Modified by ponce <matteo.bernardini@gmail.com>
 
 PRGNAM=lxpanel
-VERSION=0.5.6
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-20111223_ef3cf14}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -74,10 +72,7 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# fix a battery applet issue:
-patch -p1 < $CWD/battery-applet.patch
-# fix redefinition of alarm
-patch -p1 < $CWD/lxpanel-0.5.6-symbol-alarm.patch
+sh autogen.sh || true
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -98,6 +93,12 @@ make install-strip DESTDIR=$PKG
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
+# use some sane defaults
+install -m 0644 $CWD/config/config \
+  $PKG/usr/share/$PRGNAM/profile/default/config
+install -m 0644 $CWD/config/panel \
+  $PKG/usr/share/$PRGNAM/profile/default/panels/panel
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -105,14 +106,6 @@ chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/*
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-# Patch panel to use programs included in Slackware and slight default config
-patch -p0 < $CWD/panel.patch
-# Don't overwrite the default configuration files.
-for i in config panels/panel; do
-  mv $PKG/usr/share/$PRGNAM/profile/default/$i $PKG/usr/share/$PRGNAM/profile/default/$i.new
-done
-
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}