From 8c905ecc13f26c72b70cbe60034ff69409989a54 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Tue, 16 Apr 2024 13:18:32 -0400 Subject: [PATCH] system/vlock: Fix build with updated libcaca. Signed-off-by: B. Watson Signed-off-by: Willy Sudiarto Raharjo --- system/vlock/vlock.SlackBuild | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/system/vlock/vlock.SlackBuild b/system/vlock/vlock.SlackBuild index 24c1732b85..95ff35feed 100644 --- a/system/vlock/vlock.SlackBuild +++ b/system/vlock/vlock.SlackBuild @@ -27,6 +27,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20240416 bkw: BUILD=4, fix build with latest libcaca from 15.0's patches/. + # 20170716 bkw: switch to github homepage/download. # 20170621 bkw: fix build on -current. @@ -42,7 +44,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=vlock VERSION=${VERSION:-2.2.3} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -91,9 +93,9 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ -# recent libcaca in -current no longer has the compatibility symlink -# cucul.h => caca.h, so: -sed -i 's,,,' modules/caca.c +# 20240416 bkw: Sometime after Slackware 15.0 was released, a patched +# libcaca broke this. +sed -i -e 's,cucul,caca,g' -e 's,CUCUL,CACA,g' modules/caca.c # patch by B. Watson, fixes the shell script wrapper so it loads # the caca plugin when the -t/--timeout option is passed.