4 files changed, 43 insertions, 46 deletions
diff --git a/desktop/xkblayout-state/README b/desktop/xkblayout-state/README
index fa61c79ff4b20..0db3ae3f0c7d5 100644
--- a/desktop/xkblayout-state/README
+++ b/desktop/xkblayout-state/README
@@ -1,4 +1,6 @@
+xkblayout-state (get/set the keyboard layout)
+
 A small command-line program to get/set the current keyboard layout.
 
-It's a thin wrapper around a slightly version of XKeyboard class by
-Jay Bromley
+It's a thin wrapper around a slightly modified version of the
+XKeyboard class, by Jay Bromley.
diff --git a/desktop/xkblayout-state/slack-desc b/desktop/xkblayout-state/slack-desc
index 63458820c960f..37b117c55fa9e 100644
--- a/desktop/xkblayout-state/slack-desc
+++ b/desktop/xkblayout-state/slack-desc
@@ -10,8 +10,8 @@ xkblayout-state: xkblayout-state (get/set the keyboard layout)
 xkblayout-state:
 xkblayout-state: A small command-line program to get/set the current keyboard layout.
 xkblayout-state:
-xkblayout-state: It's a thin wrapper around a slightly version of XKeyboard class by
-xkblayout-state: Jay Bromley
+xkblayout-state: It's a thin wrapper around a slightly modified version of the
+xkblayout-state: XKeyboard class, by Jay Bromley.
 xkblayout-state:
 xkblayout-state: Homepage: https://github.com/nonpop/xkblayout-state/
 xkblayout-state:
diff --git a/desktop/xkblayout-state/xkblayout-state.SlackBuild b/desktop/xkblayout-state/xkblayout-state.SlackBuild
index 8689149f4ef8b..2780545c03695 100644
--- a/desktop/xkblayout-state/xkblayout-state.SlackBuild
+++ b/desktop/xkblayout-state/xkblayout-state.SlackBuild
@@ -2,34 +2,25 @@
 
 # Slackware build script for xkblayout-state
 
-# Copyright 2016-2020, Alexander Verbovetsky, Moscow Russia
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Original author: Alexander Verbovetsky, Moscow, Russia
+# Now maintained by B. Watson <urchlay@slackware.uk>.
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20241008 bkw:
+# - take over maintenance.
+# - update for 1b_git20211006.
+# - relicense as WTFPL.
+# - strip binary.
+# - use standard SLKCFLAGS (they were missing).
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=xkblayout-state
-VERSION=${VERSION:-1b_git20200909}
+VERSION=${VERSION:-1b_git20211006}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
-HASH=${HASH:-9f9a4fd80bb1a506c039e703305f6d1e26c836c2}
+HASH=${HASH:-f311779ed95f43f1fdebed0f710ad84057e6fe19}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -39,9 +30,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
@@ -51,6 +39,18 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
 set -e
 
 rm -rf $PKG
@@ -60,23 +60,18 @@ rm -rf $PRGNAM-$HASH
 tar xvf $CWD/$PRGNAM-$HASH.tar.gz
 cd $PRGNAM-$HASH
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-make
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
-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
+make CXXFLAGS="$SLKCFLAGS"
 
 mkdir -p $PKG/usr/bin
-install -m 0755 -o root -g root xkblayout-state $PKG/usr/bin/
+install -s -m 0755 -o root -g root xkblayout-state $PKG/usr/bin/
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.md $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a README.md $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/desktop/xkblayout-state/xkblayout-state.info b/desktop/xkblayout-state/xkblayout-state.info
index 7c9b7fc38bf31..9b243f8160184 100644
--- a/desktop/xkblayout-state/xkblayout-state.info
+++ b/desktop/xkblayout-state/xkblayout-state.info
@@ -1,10 +1,10 @@
 PRGNAM="xkblayout-state"
-VERSION="1b_git20200909"
+VERSION="1b_git20211006"
 HOMEPAGE="https://github.com/nonpop/xkblayout-state/"
-DOWNLOAD="https://github.com/nonpop/xkblayout-state/archive/9f9a4fd80bb1a506c039e703305f6d1e26c836c2/xkblayout-state-9f9a4fd80bb1a506c039e703305f6d1e26c836c2.tar.gz"
-MD5SUM="1a352695514569d5a11e7ef5d153ceed"
+DOWNLOAD="https://github.com/nonpop/xkblayout-state/archive/f311779ed95f43f1fdebed0f710ad84057e6fe19/xkblayout-state-f311779ed95f43f1fdebed0f710ad84057e6fe19.tar.gz"
+MD5SUM="f76440a218d88b566e17d36781966f64"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Alexander Verbovetsky"
-EMAIL="alik@ejik.org"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"