summaryrefslogtreecommitdiffstats
path: root/development/gtkdialog/gtkdialog.SlackBuild
diff options
context:
space:
mode:
author slakmagik2010-05-13 00:24:44 +0200
committer David Somero2010-05-13 00:24:44 +0200
commitf4b4caabaf5060c53994eac467f0c70bd2b5e2c8 (patch)
treedd48e97ad0e89dd6aed43489bc548e526cf8c79b /development/gtkdialog/gtkdialog.SlackBuild
parentfec388f0d1fc617a3914875fb57fc3b9db91c087 (diff)
downloadslackbuilds-f4b4caabaf5060c53994eac467f0c70bd2b5e2c8.tar.gz
development/gtkdialog: Updated for version 0.7.20
Diffstat (limited to 'development/gtkdialog/gtkdialog.SlackBuild')
-rw-r--r--development/gtkdialog/gtkdialog.SlackBuild12
1 files changed, 9 insertions, 3 deletions
diff --git a/development/gtkdialog/gtkdialog.SlackBuild b/development/gtkdialog/gtkdialog.SlackBuild
index 98a2ec5cfd..d0b30b51dc 100644
--- a/development/gtkdialog/gtkdialog.SlackBuild
+++ b/development/gtkdialog/gtkdialog.SlackBuild
@@ -5,9 +5,9 @@
# Released under the WTFPL
PRGNAM=gtkdialog
-VERSION=0.7.20
+VERSION=${VERSION:-0.7.20}
ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
CWD=$(pwd)
@@ -17,10 +17,13 @@ OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
fi
set -e
@@ -41,6 +44,8 @@ find . \
# Fix an infinite loop caused by a pair of statements not being contained in
# braces. Thanks to David B. Cortarello
patch -p1 < $CWD/gtkdialog-0.7.20-variables-export-fix.patch
+# Fix a redeclaration error/namespace issue
+patch -p1 < $CWD/redeclaration.patch
CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./configure --prefix=/usr
make
@@ -53,10 +58,11 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
find $PKG/usr/doc -name "Makefile*" -exec rm -f {} \;
find $PKG/usr/doc -type f -exec chmod 0644 {} \;
+rm -f $PKG/usr/info/dir
gzip -9 $PKG/usr/info/$PRGNAM.info
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}