From a802619836c65f254468961d04eb7c46818b89aa Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Wed, 24 Apr 2024 14:45:16 +0200 Subject: system/lxinput: Switch to gtk+3 by default. Signed-off-by: Matteo Bernardini Signed-off-by: Willy Sudiarto Raharjo --- system/lxinput/README | 8 +++++--- system/lxinput/lxinput.SlackBuild | 16 ++++++++-------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/system/lxinput/README b/system/lxinput/README index 8e3ca14e80..513ca55203 100644 --- a/system/lxinput/README +++ b/system/lxinput/README @@ -1,4 +1,6 @@ -lxinput (input settings for LXDE) - -lxnput is part of the LXDE project. +lxinput is part of the LXDE project. It implements selectable input settings for LXDE. + +If you want to build this for gtk+2, pass to the script the switch + + GTK3=no diff --git a/system/lxinput/lxinput.SlackBuild b/system/lxinput/lxinput.SlackBuild index 3d33a83d7a..5e4a062e2f 100644 --- a/system/lxinput/lxinput.SlackBuild +++ b/system/lxinput/lxinput.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Slackware build script for lxinput -# Copyright 2010-2016 Matteo Bernardini , Pisa, Italy +# Copyright 2010-2024 Matteo Bernardini , Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=lxinput VERSION=${VERSION:-0.3.5} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -40,9 +40,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 @@ -66,6 +63,10 @@ else LIBDIRSUFFIX="" fi +WITHGTK3="--enable-gtk3" ; [ "${GTK3:-yes}" = "no" ] && WITHGTK3="--enable-gtk" + +DOCS="AUTHOR COPYING ChangeLog NEWS README TODO" + set -e rm -rf $PKG @@ -93,6 +94,7 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-man \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ + $WITHGTK3 \ --build=$ARCH-slackware-linux make @@ -102,9 +104,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHOR COPYING ChangeLog NEWS README TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION || true +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install -- cgit v1.2.3-65-gdbad