From 3a43699fb6efb02d574756e0bf226c41fac9dc7c Mon Sep 17 00:00:00 2001 From: Petar Petrov Date: Tue, 26 Nov 2013 10:30:28 -0600 Subject: [PATCH] desktop/xmms-status-plugin: Use system-provided libtool binary Signed-off-by: Robby Workman --- desktop/xmms-status-plugin/README | 2 ++ .../xmms-status-plugin/xmms-status-plugin.SlackBuild | 11 +++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/desktop/xmms-status-plugin/README b/desktop/xmms-status-plugin/README index dd0083d3b4..bb4a8d1a3c 100644 --- a/desktop/xmms-status-plugin/README +++ b/desktop/xmms-status-plugin/README @@ -1,2 +1,4 @@ This is a general plugin for XMMS, that provides a status docklet for the application. + +NOTE: This may not work properly in KDE. diff --git a/desktop/xmms-status-plugin/xmms-status-plugin.SlackBuild b/desktop/xmms-status-plugin/xmms-status-plugin.SlackBuild index ac2da6f051..ab0e9a9c0d 100644 --- a/desktop/xmms-status-plugin/xmms-status-plugin.SlackBuild +++ b/desktop/xmms-status-plugin/xmms-status-plugin.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for xmms-status-plugin -# Copyright 2012 Petar Petrov, ppetrov@paju.oulu.fi +# Copyright 2012-2013 Petar Petrov, petar.petrov@student.oulu.fi # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=xmms-status-plugin VERSION=${VERSION:-1.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -69,6 +69,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Force the Makefile to use the installed version of libtool. +# Thanks to Larry Hajali for the fix. +sed -i 's|^LIBTOOL =.*|LIBTOOL = /usr/bin/libtool|' $(find . -iname "Makefile.*") + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -84,6 +88,9 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG +# Remove the static library. +rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/xmms/General/libstatusdocklet.a + 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