diff options
| author | Robby Workman <rworkman@slackbuilds.org> | 2010-05-23 00:40:14 -0500 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2010-05-23 23:21:43 -0500 |
| commit | 4d896df4cb05a24a1858f8f7a27c8db292be4609 (patch) | |
| tree | 42dacc582decde3e8fb7e1b3fa2915d539562371 /system/xfe | |
| parent | 9141ce8376408dc9b519023e4076bf367c3533cd (diff) | |
| download | slackbuilds-4d896df4cb05a24a1858f8f7a27c8db292be4609.tar.gz | |
system/xfe: Miscellaneous cleanups
Diffstat (limited to 'system/xfe')
| -rw-r--r-- | system/xfe/FXint-no_inline.diff (renamed from system/xfe/patch) | 9 | ||||
| -rw-r--r-- | system/xfe/xfe.SlackBuild | 23 |
2 files changed, 21 insertions, 11 deletions
diff --git a/system/xfe/patch b/system/xfe/FXint-no_inline.diff index 835f3873a6..a5c8b02cda 100644 --- a/system/xfe/patch +++ b/system/xfe/FXint-no_inline.diff @@ -1,7 +1,6 @@ -diff -pruN 1.32.1-2/src/xfeutils.cpp 1.32.1-2ubuntu1/src/xfeutils.cpp ---- 1.32.1-2/src/xfeutils.cpp 2009-11-09 16:17:17.000000000 +0000 -+++ 1.32.1-2ubuntu1/src/xfeutils.cpp 2010-01-26 21:33:35.000000000 +0000 -@@ -512,7 +512,7 @@ FXbool isUtf8(const FXchar* string, FXui +--- xfe-1.32.1_orig/src/xfeutils.cpp 2009-11-09 14:17:17.000000000 -0200 ++++ xfe-1.32.1/src/xfeutils.cpp 2010-02-17 00:39:22.000000000 -0200 +@@ -512,7 +512,7 @@ // Replacement of the stat function @@ -10,7 +9,7 @@ diff -pruN 1.32.1-2/src/xfeutils.cpp 1.32.1-2ubuntu1/src/xfeutils.cpp { #if defined(linux) -@@ -546,7 +546,7 @@ inline FXint statrep(const FXchar* filen +@@ -546,7 +546,7 @@ // Replacement of the lstat function diff --git a/system/xfe/xfe.SlackBuild b/system/xfe/xfe.SlackBuild index b2b9588086..cda33ce6be 100644 --- a/system/xfe/xfe.SlackBuild +++ b/system/xfe/xfe.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for xfe -# Copyright 2006-2010 Robby Workman, Northport, Alabama, USA +# Copyright 2006,2007,2008,2009,2010 Robby Workman, Northport, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,10 +24,19 @@ PRGNAM=xfe VERSION=1.32.1 -ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM @@ -42,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e @@ -59,6 +71,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +patch -p1 < $CWD/FXint-no_inline.diff + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -80,10 +94,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ mkdir -p $PKG/usr/share/applications cat $CWD/xfe.desktop > $PKG/usr/share/applications/xfe.desktop -( cd $PKG/usr/man || exit 1 - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) +find $PKG/usr/man -type f -exec gzip -9 {} \; mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ |