system/lbench: Fix 15.0 build.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 24 insertions, 15 deletions

diff --git a/system/lbench/README b/system/lbench/README
index dc6e23b2b3..690ffc5d2f 100644
--- a/system/lbench/README
+++ b/system/lbench/README
@@ -1,4 +1,6 @@
-Lbench was written to satisfy a personal desire to better understand some
-obscure performance issues. The performance increase from using multiple
-processor cores can be nearly 100% per core in some cases, and negative (an
-overall slowdown) in others.
+lbench (simple Linux multithread benchmarking tool)
+
+Lbench was written to satisfy a personal desire to better understand
+some obscure performance issues. The performance increase from using
+multiple processor cores can be nearly 100% per core in some cases,
+and negative (an overall slowdown) in others.
diff --git a/system/lbench/lbench.SlackBuild b/system/lbench/lbench.SlackBuild
index 95aa1a7751..52601f7d69 100644
--- a/system/lbench/lbench.SlackBuild
+++ b/system/lbench/lbench.SlackBuild
@@ -25,6 +25,17 @@
 #
 # Maintained by David Spencer <baildon.research@googlemail.com>
 
+# 20220211 bkw: Modified by SlackBuilds.org
+# - fix build for 15.0.
+# - fix homepage.
+# - leave the full path to the icon in the .desktop file. please, before
+#   you complain about this, go and actually read the freedesktop
+#   standard for .desktop files.
+# - thought about updating to latest lbench (5.0) but it has a couple
+#   new deps that aren't on SBo. also thought about updating to a newer
+#   3.x or 4.x, but upstream disappears the tarballs when new releases
+#   are made. maintainer can worry about this.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=lbench
@@ -41,9 +52,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
@@ -78,9 +86,12 @@ 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 {} \+
+
+# 20220211 bkw: fix for modern gcc
+sed -i '/int popup_report_timeout/s,int,void,' zfuncs.cc
 
 CXXFLAGS="$SLKCFLAGS" \
 PREFIX=/usr \
@@ -103,11 +114,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-mkdir -p $PKG/usr/share/{applications,pixmaps}
-sed -i \
-  -e "s|/usr/bin/lbench|lbench|" \
-  -e "s|/usr/share/lbench/icons/lbench.png|lbench|" \
-  $PKG/usr/share/applications/$PRGNAM.desktop
+mkdir -p $PKG/usr/share/pixmaps
 cp $PRGNAM.png $PKG/usr/share/pixmaps/
 
 mkdir -p $PKG/install
diff --git a/system/lbench/lbench.info b/system/lbench/lbench.info
index 39c6d2d16d..2604dabb21 100644
--- a/system/lbench/lbench.info
+++ b/system/lbench/lbench.info
@@ -1,6 +1,6 @@
 PRGNAM="lbench"
 VERSION="3.7"
-HOMEPAGE="http://kornelix.net/lbench/lbench.html"
+HOMEPAGE="https://kornelix.net/"
 DOWNLOAD="http://ponce.cc/slackware/sources/repo/lbench-3.7.tar.gz"
 MD5SUM="ba1cf6181d3748489ebe68b3c98d3565"
 DOWNLOAD_x86_64=""