diff options
| author | B. Watson <urchlay@slackware.uk> | 2024-10-06 05:36:43 -0400 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2024-10-12 11:34:42 +0700 |
| commit | a65524d774e7d8e58245996b63c7394ca034fc55 (patch) | |
| tree | cb87ead008589a4c40ad9b9ff498e75ffcba89fa | |
| parent | 93bc54b15ac4f23018787a11c77297ff17a60b65 (diff) | |
development/tklib: Fix conflict with graphics/dia.
Signed-off-by: B. Watson <urchlay@slackware.uk>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | development/tklib/tklib.SlackBuild | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/development/tklib/tklib.SlackBuild b/development/tklib/tklib.SlackBuild index 75d1db83d190..97e3b6bef215 100644 --- a/development/tklib/tklib.SlackBuild +++ b/development/tklib/tklib.SlackBuild @@ -4,11 +4,15 @@ # Based on slackbuild script written by Paul Wisehart wise@lupulin.net +# 20241006 bkw: Modified by SlackBuilds.org, v0.6 BUILD=2: +# - remove /usr/bin/dia from the package. see comments below +# for explanation. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=tklib VERSION=${VERSION:-0.6} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -20,9 +24,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 @@ -73,6 +74,14 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG +# 20241006 bkw: The 'dia' script conflicts with /usr/bin/dia from the +# graphics/dia package. Also, it doesn't even run (has #!bin/bash at +# the top, which causes a 'bad interpreter' error). Whatever it does, +# obviously nobody has ever needed to do it, or else we would have +# gotten a bug report about it sometime in the last 10 years. +# Thanks to samtux on libera #slackbuilds for finding this issue. +rm -f $PKG/usr/bin/dia + 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 |