office/wordgrinder: Fix 15.0 build.

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

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 24 insertions, 21 deletions

diff --git a/office/wordgrinder/README b/office/wordgrinder/README
index edb1b46738..08ed511b93 100644
--- a/office/wordgrinder/README
+++ b/office/wordgrinder/README
@@ -1,7 +1,8 @@
-WordGrinder is a simple, Unicode-aware word processor that runs on the
-console. It's designed to get the hell out of your way and let you write;
-it does very little, but what it does it does well.
+WordGrinder is a simple, Unicode-aware word processor that runs on
+the console. It's designed to get the hell out of your way and let you
+write; it does very little, but what it does it does well.
 
-It supports basic paragraph styles, basic character styles, basic screen
-markup, a menu interface that means you don't have to remember complex
-key sequences, HTML import and export, and some other useful features.
+It supports basic paragraph styles, basic character styles, basic
+screen markup, a menu interface that means you don't have to remember
+complex key sequences, HTML import and export, and some other useful
+features.
diff --git a/office/wordgrinder/wordgrinder.SlackBuild b/office/wordgrinder/wordgrinder.SlackBuild
index cc30defe3a..eae751cac2 100644
--- a/office/wordgrinder/wordgrinder.SlackBuild
+++ b/office/wordgrinder/wordgrinder.SlackBuild
@@ -22,11 +22,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220218 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix 15.0 build.
+# - use correct icon path in .desktop file.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=wordgrinder
 VERSION=${VERSION:-0.7.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -38,9 +42,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -75,22 +76,23 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # Fix of paths for Slackware
 sed -i '7s!$(HOME)!'$PKG'/usr!' Makefile
 sed -i 's!share\/!!' Makefile
 
-make
-make install DESTDIR=$PKG
+# 20220218 bkw: Slackware 15.0's ncurses headers don't define KEY_EVENT,
+# and wordgrinder doesn't seem to actually use it anyway.
+sed -i '/KEY_EVENT/d' src/c/arch/unix/cursesw/dpy.c
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make CFLAGS="$SLKCFLAGS"
+make install DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
-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
+# 20220218 bkw: binaries are stripped by default
 
 mkdir -p $PKG/usr/share/applications
 install -D -m644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
diff --git a/office/wordgrinder/wordgrinder.desktop b/office/wordgrinder/wordgrinder.desktop
index 0c75cfee95..17037fea81 100644
--- a/office/wordgrinder/wordgrinder.desktop
+++ b/office/wordgrinder/wordgrinder.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=WordGrinder 
-Comment= A word processor for processing words
+Name=WordGrinder
+Comment=A word processor for processing words
 Exec=xwordgrinder
-Icon=wordgrinder
+Icon=/usr/share/pixmaps/wordgrinder.png
 Terminal=false
 Type=Application
 Categories=Office;