aboutsummaryrefslogtreecommitdiff
path: root/development/icon/icon.SlackBuild
diff options
context:
space:
mode:
authorKyle Guinn <elyk03@gmail.com>2021-01-02 02:48:29 -0600
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2021-01-09 14:30:47 +0700
commitf78e9f1c06335604074bde54821f98d96ee0afed (patch)
treeb28248e905964f409391841a1003e5a5a275df5c /development/icon/icon.SlackBuild
parent128be70ecd79d430f8b65a9566980036bf5bef91 (diff)
development/icon: Updated for version 9.5.20i.
Signed-off-by: Kyle Guinn <elyk03@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'development/icon/icon.SlackBuild')
-rw-r--r--development/icon/icon.SlackBuild29
1 files changed, 14 insertions, 15 deletions
diff --git a/development/icon/icon.SlackBuild b/development/icon/icon.SlackBuild
index c444ae2fbe..6867d68aa9 100644
--- a/development/icon/icon.SlackBuild
+++ b/development/icon/icon.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for icon
-# Copyright 2010-2019 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2010-2021 Kyle Guinn <elyk03@gmail.com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,9 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=icon
-VERSION=${VERSION:-9.5.1}
-SRCVER=v$(echo $VERSION | tr -d .)src
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-9.5.20i}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -68,19 +67,19 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$SRCVER
-tar xvf $CWD/$PRGNAM-$SRCVER.tgz
-cd $PRGNAM-$SRCVER
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go-w,a+rX-st .
-# Cherry-picked bugfix and ftbfs patches from upstream
-# https://github.com/gtownsend/icon
-patch -p1 < $CWD/patches/display.patch
-patch -p1 < $CWD/patches/maxtype.patch
-patch -p1 < $CWD/patches/lexer.patch
-patch -p1 < $CWD/patches/implicit-defs.patch
-patch -p1 < $CWD/patches/glibc.patch
+# Use the system XPM. https://github.com/gtownsend/icon/pull/2
+sed -i -e 's|"../xpm/xpm.h"|<X11/xpm.h>|' src/common/xwindow.c src/h/sys.h
+# Neuter the $XL variable, replace with $XLIBS which includes -lXpm.
+# Set $XLIBS to empty if building without graphics (make Configure).
+sed -i -e 's|-lX11|-lXpm -lX11|' config/linux/Makedefs
+sed -i -e 's|XL=.*|XL= ;;|' config/setup.sh
+sed -i -e 's|XL|XLIBS|' src/runtime/Makefile
# Installation creates bin, lib, man, and doc dirs inside the "dest" dir.
# Edit the Install rule to avoid having to manually rearrange files.
@@ -112,7 +111,7 @@ find $PKG -exec file {} + | grep -e "executable" -e "shared object" | grep ELF \
find $PKG/usr/man -type f -exec gzip -9 {} +
mv $PKG/README $PKG/usr/doc/$PRGNAM-$VERSION
-rm $PKG/usr/doc/$PRGNAM-$VERSION/clnroff.sed
+rm $PKG/usr/doc/$PRGNAM-$VERSION/*.sed
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install