From 49a9c6d416a9bcbdac1bf17c8cb37b4989b3534f Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Mon, 22 Jun 2020 17:18:43 -0400
Subject: office/abiword: Updated for version 3.0.4.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 office/abiword/abiword.SlackBuild | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'office/abiword/abiword.SlackBuild')

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
-- 
cgit v1.2.3