summaryrefslogtreecommitdiffstats
path: root/desktop/xfce4-battery-plugin/xfce4-battery-plugin.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'desktop/xfce4-battery-plugin/xfce4-battery-plugin.SlackBuild')
-rw-r--r--desktop/xfce4-battery-plugin/xfce4-battery-plugin.SlackBuild20
1 files changed, 13 insertions, 7 deletions
diff --git a/desktop/xfce4-battery-plugin/xfce4-battery-plugin.SlackBuild b/desktop/xfce4-battery-plugin/xfce4-battery-plugin.SlackBuild
index 24167896cb..c06864a895 100644
--- a/desktop/xfce4-battery-plugin/xfce4-battery-plugin.SlackBuild
+++ b/desktop/xfce4-battery-plugin/xfce4-battery-plugin.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for xfce4-battery-plugin
-# Copyright 2006-2007 Robby Workman (http://rlworkman.net)
+# Copyright 2006-2008 Robby Workman, Northport, Alabama, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=xfce4-battery-plugin
-VERSION=0.5.0
+VERSION=0.5.1
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -37,6 +37,8 @@ if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
fi
set -e
@@ -54,21 +56,25 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Fix a build error due to wrong includes ordering
+# Submitted upstream: http://bugzilla.xfce.org/show_bug.cgi?id=4372
+patch -p1 < $CWD/libapm.h.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --docdir=/usr/doc/$PRGNAM-$VERSION \
--enable-shared=yes \
--enable-static=no \
- --enable-debug=no
+ --enable-debug=no \
+ --build=$ARCH-slackware-linux
make
make install DESTDIR=$PKG
-( cd $PKG
- find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
- find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \