diff options
| -rw-r--r-- | desktop/xfce4-battery-plugin/libapm.h.patch | 13 | ||||
| -rw-r--r-- | desktop/xfce4-battery-plugin/slack-desc | 4 | ||||
| -rw-r--r-- | desktop/xfce4-battery-plugin/xfce4-battery-plugin.SlackBuild | 20 | ||||
| -rw-r--r-- | desktop/xfce4-battery-plugin/xfce4-battery-plugin.info | 6 |
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 0000000000..3c29a2b476 --- /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 fbe9405132..666ff349b0 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 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 \ diff --git a/desktop/xfce4-battery-plugin/xfce4-battery-plugin.info b/desktop/xfce4-battery-plugin/xfce4-battery-plugin.info index e343af3877..041f88c7fa 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" |