diff options
| -rw-r--r-- | office/abiword/abiword.SlackBuild | 27 | ||||
| -rw-r--r-- | office/abiword/abiword.info | 6 |
2 files changed, 18 insertions, 15 deletions
diff --git a/office/abiword/abiword.SlackBuild b/office/abiword/abiword.SlackBuild index 77fdffe278..15aea248f5 100644 --- a/office/abiword/abiword.SlackBuild +++ b/office/abiword/abiword.SlackBuild @@ -26,11 +26,14 @@ # work correctly on Slackware # Now maintained by Robby Workman <rworkman@slackbuilds.org> +# 20200622 bkw: updated for v3.0.4, which fixes the flickering issue. +# abiword-docs hasn't seen a new release, we're still on 3.0.2 there. + PRGNAM=abiword -VERSION=${VERSION:-3.0.2} -DOCSVER=$VERSION # version of abiword-docs +VERSION=${VERSION:-3.0.4} +DOCSVER=3.0.2 # version of abiword-docs DOCTAR=3.0.1 # sigh, the tarball contains abiword-docs-3.0.1 still -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -77,8 +80,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# https://bugs.archlinux.org/task/46659 -patch -p1 < $CWD/bug13815.patch +# 20200622 bkw: don't let abiword create /root/.config/abiword/profile +# during the build process. Don't break ccache in the process. +mkdir -p tmphome +export CCACHE_DIR=${CCACHE_DIR:-$HOME/.ccache} +export HOME=$( pwd )/tmphome CPPFLAGS="-I$TMP/$PRGNAM-$VERSION" \ CFLAGS="$SLKCFLAGS" \ @@ -98,7 +104,7 @@ CXXFLAGS="$SLKCFLAGS -std=c++11" \ --build=$ARCH-slackware-linux make -make install DESTDIR=$PKG +make install-strip DESTDIR=$PKG # Now install the separate abiword-docs cd abiword-docs-$DOCTAR @@ -118,16 +124,13 @@ cd abiword-docs-$DOCTAR make install DESTDIR=$PKG cd .. -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +# 20200622 bkw: Skip useless docs. NEWS and ChangeLog are 0-byte placeholders, +# INSTALL is generic GNU confgure instructions. mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - *.txt *.TXT AUTHORS COPYING ChangeLog INSTALL NEWS README \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a *.txt *.TXT AUTHORS COPYING README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/office/abiword/abiword.info b/office/abiword/abiword.info index 45f7615d73..bd7961e57c 100644 --- a/office/abiword/abiword.info +++ b/office/abiword/abiword.info @@ -1,9 +1,9 @@ PRGNAM="abiword" -VERSION="3.0.2" +VERSION="3.0.4" HOMEPAGE="http://www.abisource.com" -DOWNLOAD="http://abisource.com/downloads/abiword/3.0.2/source/abiword-3.0.2.tar.gz \ +DOWNLOAD="http://abisource.com/downloads/abiword/3.0.4/source/abiword-3.0.4.tar.gz \ http://abisource.com/downloads/abiword/3.0.2/source/abiword-docs-3.0.2.tar.gz" -MD5SUM="cda6dd58c747c133b421cc7eb18f5796 \ +MD5SUM="04e31887049a8c72297881bc153b77c4 \ c92c0e1e2081db20757231a53d80c338" DOWNLOAD_x86_64="" MD5SUM_x86_64="" |