diff options
Diffstat (limited to 'development/icon/icon.SlackBuild')
| -rw-r--r-- | development/icon/icon.SlackBuild | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/development/icon/icon.SlackBuild b/development/icon/icon.SlackBuild index 5f11d22f27..4dafa350f4 100644 --- a/development/icon/icon.SlackBuild +++ b/development/icon/icon.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for icon -# Copyright 2010-2021 Kyle Guinn <elyk03@gmail.com> +# Copyright 2010-2024 Kyle Guinn <elyk03@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=icon -VERSION=${VERSION:-9.5.20i} +VERSION=${VERSION:-9.5.23a} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,34 +38,26 @@ 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 fi TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM-$VERSION +PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -# At one point, enabling "-O2" appeared to cause -# "Run-time error 302", "memory violation" (from the SIGSEGV trap) -# whenever running icon programs. I can't reproduce it. -# However, one of the tests fails with "-O2". Use "-O" instead -# since it is the default in config/linux/Makedefs. if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O -march=i586 -mtune=i686" + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O -march=i686 -mtune=i686" + SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O -fPIC" + SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" else - SLKCFLAGS="-O" + SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi @@ -80,14 +72,6 @@ cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go-w,a+rX-st . -# 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. # The bin and lib dirs need to share a parent directory, but we don't want |