3 files changed, 26 insertions, 16 deletions
diff --git a/system/CPU-X/CPU-X.SlackBuild b/system/CPU-X/CPU-X.SlackBuild
index 8e55bb89ef..ea1763bcb1 100644
--- a/system/CPU-X/CPU-X.SlackBuild
+++ b/system/CPU-X/CPU-X.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for CPU-X
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=CPU-X
-VERSION=${VERSION:-4.1.0}
+VERSION=${VERSION:-5.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,9 +72,9 @@ cd $PRGNAM-$VERSION
 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 \
+  -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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 mkdir -p build
 cd build
@@ -77,13 +84,16 @@ cd build
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DCMAKE_BUILD_TYPE=Release ..
+
+  # 20220228 bkw: avoid writing to the real /usr:
+  sed -i \
+    's,/usr/bin/glib-compile-schemas,/bin/true,' \
+    data/cmake_install.cmake
+
   make
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd ..
 
-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
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ChangeLog.md COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -93,4 +103,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/CPU-X/CPU-X.info b/system/CPU-X/CPU-X.info
index 57c16b3b42..d2731bc84f 100644
--- a/system/CPU-X/CPU-X.info
+++ b/system/CPU-X/CPU-X.info
@@ -1,10 +1,10 @@
 PRGNAM="CPU-X"
-VERSION="4.1.0"
-HOMEPAGE="https://x0rg.github.io/CPU-X/"
-DOWNLOAD="https://github.com/X0rg/CPU-X/archive/v4.1.0/CPU-X-4.1.0.tar.gz"
-MD5SUM="8aba2bfe98c0dcd3da53d01b77e94036"
+VERSION="5.0.3"
+HOMEPAGE="https://github.com/x0rg/CPU-X/"
+DOWNLOAD="https://github.com/x0rg/CPU-X/archive/v5.0.3/CPU-X-5.0.3.tar.gz"
+MD5SUM="548d7a6a7b27a58221a3898c47041b64"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libcpuid"
+REQUIRES="glfw3 libcpuid libstatgrab"
 MAINTAINER="Cristiano Urban"
 EMAIL="cristiano.urban.slack@gmail.com"
diff --git a/system/CPU-X/slack-desc b/system/CPU-X/slack-desc
index 06f7f5051d..0444748a9c 100644
--- a/system/CPU-X/slack-desc
+++ b/system/CPU-X/slack-desc
@@ -12,7 +12,7 @@ CPU-X: Free software that gathers information on CPU, motherboard and more.
 CPU-X: CPU-X is similar to CPU-Z (Windows), but CPU-X is a Free and 
 CPU-X: Open Source software designed for GNU/Linux and FreeBSD.
 CPU-X:
-CPU-X: Homepage: https://x0rg.github.io/CPU-X/
+CPU-X: Homepage: https://github.com/x0rg/CPU-X/
 CPU-X:
 CPU-X:
 CPU-X: