aboutsummaryrefslogtreecommitdiff
path: root/desktop/xfce4-battery-plugin
diff options
context:
space:
mode:
authorRobby Workman <rw@rlworkman.net>2010-05-11 22:22:07 +0200
committerErik Hanson <erik@slackbuilds.org>2010-05-11 22:22:07 +0200
commit090884ae6d0177431b51528024a1c2e6265a9cae (patch)
treefaab6e450f0a4c0ef41e02b523ed968af15e14f7 /desktop/xfce4-battery-plugin
parent07a93b457868b05e1432e81be694dcf63ab2bf09 (diff)
desktop/xfce4-battery-plugin: Updated for version 0.5.1
Diffstat (limited to 'desktop/xfce4-battery-plugin')
-rw-r--r--desktop/xfce4-battery-plugin/libapm.h.patch13
-rw-r--r--desktop/xfce4-battery-plugin/slack-desc4
-rw-r--r--desktop/xfce4-battery-plugin/xfce4-battery-plugin.SlackBuild20
-rw-r--r--desktop/xfce4-battery-plugin/xfce4-battery-plugin.info6
4 files changed, 31 insertions, 12 deletions
diff --git a/desktop/xfce4-battery-plugin/libapm.h.patch b/desktop/xfce4-battery-plugin/libapm.h.patch
new file mode 100644
index 0000000000000..3c29a2b476e32
--- /dev/null
+++ b/desktop/xfce4-battery-plugin/libapm.h.patch
@@ -0,0 +1,13 @@
+diff -Nur xfce4-battery-plugin-0.5.1.orig/panel-plugin/libapm.h xfce4-battery-plugin-0.5.1/panel-plugin/libapm.h
+--- xfce4-battery-plugin-0.5.1.orig/panel-plugin/libapm.h 2008-09-04 15:53:40.000000000 -0500
++++ xfce4-battery-plugin-0.5.1/panel-plugin/libapm.h 2008-09-09 22:39:46.536365973 -0500
+@@ -17,8 +17,8 @@
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+-#include <linux/apm_bios.h>
+ #include <sys/types.h>
++#include <linux/apm_bios.h>
+
+ #define APM_PROC "/proc/apm"
+ #define APM_DEVICE "/dev/apm_bios"
diff --git a/desktop/xfce4-battery-plugin/slack-desc b/desktop/xfce4-battery-plugin/slack-desc
index fbe940513288c..666ff349b0247 100644
--- a/desktop/xfce4-battery-plugin/slack-desc
+++ b/desktop/xfce4-battery-plugin/slack-desc
@@ -5,8 +5,8 @@
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
- |-----handy-ruler------------------------------------------------------|
-xfce4-battery-plugin: xfce4-battery-plugin (battery monitor plugin for the Xfce panel)
+ |-----handy-ruler-----------------------------------------|
+xfce4-battery-plugin: xfce4-battery-plugin (battery monitor for the Xfce panel)
xfce4-battery-plugin:
xfce4-battery-plugin: The battery plugin lets you monitor the battery level
xfce4-battery-plugin: on your laptop and configure custom actions to take
diff --git a/desktop/xfce4-battery-plugin/xfce4-battery-plugin.SlackBuild b/desktop/xfce4-battery-plugin/xfce4-battery-plugin.SlackBuild
index 24167896cbee0..c06864a8958f3 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 \
diff --git a/desktop/xfce4-battery-plugin/xfce4-battery-plugin.info b/desktop/xfce4-battery-plugin/xfce4-battery-plugin.info
index e343af38774be..041f88c7fa04b 100644
--- a/desktop/xfce4-battery-plugin/xfce4-battery-plugin.info
+++ b/desktop/xfce4-battery-plugin/xfce4-battery-plugin.info
@@ -1,8 +1,8 @@
PRGNAM="xfce4-battery-plugin"
-VERSION="0.5.0"
+VERSION="0.5.1"
HOMEPAGE="http://goodies.xfce.org/"
-DOWNLOAD="http://goodies.xfce.org/releases/xfce4-battery-plugin/xfce4-battery-plugin-0.5.0.tar.bz2"
-MD5SUM="c1d923bb90b79087ca7044bcc24bab5a"
+DOWNLOAD="http://goodies.xfce.org/releases/xfce4-battery-plugin/xfce4-battery-plugin-0.5.1.tar.bz2"
+MD5SUM="d8a666d85bb3c1dd007b547de4dd7037"
MAINTAINER="Robby Workman"
EMAIL="rw@rlworkman.net"
APPROVED="Erik Hanson"