summaryrefslogtreecommitdiffstats
path: root/graphics/qiv/qiv.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/qiv/qiv.SlackBuild')
-rw-r--r--graphics/qiv/qiv.SlackBuild52
1 files changed, 31 insertions, 21 deletions
diff --git a/graphics/qiv/qiv.SlackBuild b/graphics/qiv/qiv.SlackBuild
index 03349c055d..6933f0602d 100644
--- a/graphics/qiv/qiv.SlackBuild
+++ b/graphics/qiv/qiv.SlackBuild
@@ -2,16 +2,28 @@
# Slackware build script for qiv
-# Written by Pablo Santamaria (pablosantamaria@gmail.com)
+# Written by Pablo Santamaria (email removed)
+
+# Modified & now maintained by B. Watson <yalhcru@gmail.com>. Original
+# version had no license, modified version released under the WTFPL. See
+# http://www.wtfpl.net/txt/copying/ for details.
+
+# 20170209 bkw:
+# - Take over maintenance
+# - i486 => i586
+# - Add latest fixes from upstream's git
+# - Get rid of redundant stripping of binaries and gzipping
+# of man pages (upstream's 'make install' already does it)
+# - Don't install README.INSTALL
PRGNAM=qiv
-VERSION=${VERSION:-2.3.1}
+VERSION=${VERSION:-2.3.2pre20160530}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -22,8 +34,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -38,12 +50,14 @@ fi
set -e
+OLDVER=2.3.1
+
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$OLDVER
+tar xvf $CWD/$PRGNAM-$OLDVER.tgz
+cd $PRGNAM-$OLDVER
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -51,26 +65,22 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# bugfixes from upstream's git repo.
+patch -p1 < $CWD/648ed5a.diff
+
sed -i "s/-O2 -Wall/$SLKCFLAGS/" Makefile
sed -i "s|\./qiv|echo &|" Makefile # remove test
-make
-
-make install PREFIX=$PKG/usr || true
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make
+make install PREFIX=$PKG/usr
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+# binary already stripped, man pages already gzipped
+rm -f README.INSTALL # don't need this in a binary package
+chmod 644 contrib/* # docs shouldn't be executable even if they're scripts
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- Changelog README* intro.jpg contrib/ \
- $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changelog README* intro.jpg contrib/ $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc