system/herculesstudio: Fix 15.0 build, new-style icons.

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

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

11 files changed, 44 insertions, 27 deletions

diff --git a/system/herculesstudio/README b/system/herculesstudio/README
index 07c371fb8e..db67dd5bf9 100644
--- a/system/herculesstudio/README
+++ b/system/herculesstudio/README
@@ -1 +1,5 @@
-Hercules Studio is a GUI front-end for Linux to the Hercules Emulator.
+herculesstudio (Hercules GUI for Linux)
+
+Hercules Studio is a GUI front-end to the Hercules Emulator. As such,
+it requires the actual emulator to be installed and operational in
+order for Hercules Studio to be functional.
diff --git a/system/herculesstudio/doinst.sh b/system/herculesstudio/doinst.sh
index 4e8ba7071d..3e5691a052 100644
--- a/system/herculesstudio/doinst.sh
+++ b/system/herculesstudio/doinst.sh
@@ -2,3 +2,8 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/herculesstudio/herculesstudio.SlackBuild b/system/herculesstudio/herculesstudio.SlackBuild
index a874bf74d2..dbed3a8a96 100644
--- a/system/herculesstudio/herculesstudio.SlackBuild
+++ b/system/herculesstudio/herculesstudio.SlackBuild
@@ -23,13 +23,16 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# revision date 2013/03/25
+# 20220211 bkw: Modified by SlackBuilds.org, BUILD=2.
+# - fix build on 15.0: add qt4 as a dep now that we have it.
+# - new-style icons.
+# - i486 => i586.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=herculesstudio
 VERSION=${VERSION:-1.4.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -37,15 +40,12 @@ PRGUNTARRED=HerculesStudio
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   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
@@ -55,8 +55,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -80,11 +80,12 @@ cd $PRGUNTARRED
 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 \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
 
-qmake
+# 20220211 bkw: this is all we needed to make it use qt4 instead of qt5.
+qmake-qt4
 
 # Accept our CXXFLAGS
 sed -i "/^CXXFLAGS/s/=/+=/" Makefile.Release
@@ -93,19 +94,26 @@ sed -i "/^CXXFLAGS/s/=/+=/" Makefile.Release
 CXXFLAGS="$SLKCFLAGS" \
   make CXX=g++
 make install INSTALL_ROOT=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-# Copy icon & desktop file to package
-mkdir -p $PKG/usr/share/{applications,pixmaps}
+strip $PKG/usr/bin/$PRGUNTARRED
+
+# 20220211 bkw: new-style icons, extracted from hercstudio.icns in source.
+for i in $CWD/icons/*.png; do
+  px="$( basename $i | cut -d. -f1 )"
+  size=${px}x${px}
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  cat $i > $dir/$PRGNAM.png
+done
+
+# 20220211 bkw: old-style icon, just a symlink.
+mkdir -p $PKG/usr/share/pixmaps
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
+
+mkdir -p $PKG/usr/share/applications
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
-cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  COPYING INSTALL INSTALL-BIN \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/herculesstudio/herculesstudio.info b/system/herculesstudio/herculesstudio.info
index 5ef87cdb22..4eaf57b7f9 100644
--- a/system/herculesstudio/herculesstudio.info
+++ b/system/herculesstudio/herculesstudio.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://ftp.mirrorservice.org/sites/download.salixos.org/i486/extra-14
 MD5SUM="58d6643a97ce80df44bf655a5ac23c6c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="hercules"
+REQUIRES="hercules qt4"
 MAINTAINER="Niels Horn"
 EMAIL="niels.horn@gmail.com"
diff --git a/system/herculesstudio/herculesstudio.png b/system/herculesstudio/herculesstudio.png
deleted file mode 100644
index feae70b4c4..0000000000
--- a/system/herculesstudio/herculesstudio.png
+++ /dev/null
diff --git a/system/herculesstudio/icons/128.png b/system/herculesstudio/icons/128.png
new file mode 100644
index 0000000000..6d704e7584
--- /dev/null
+++ b/system/herculesstudio/icons/128.png
diff --git a/system/herculesstudio/icons/16.png b/system/herculesstudio/icons/16.png
new file mode 100644
index 0000000000..6155b61ab3
--- /dev/null
+++ b/system/herculesstudio/icons/16.png
diff --git a/system/herculesstudio/icons/256.png b/system/herculesstudio/icons/256.png
new file mode 100644
index 0000000000..c63d3eda3d
--- /dev/null
+++ b/system/herculesstudio/icons/256.png
diff --git a/system/herculesstudio/icons/32.png b/system/herculesstudio/icons/32.png
new file mode 100644
index 0000000000..ce3dc9f102
--- /dev/null
+++ b/system/herculesstudio/icons/32.png
diff --git a/system/herculesstudio/icons/48.png b/system/herculesstudio/icons/48.png
new file mode 100644
index 0000000000..5be0cbeee4
--- /dev/null
+++ b/system/herculesstudio/icons/48.png
diff --git a/system/herculesstudio/slack-desc b/system/herculesstudio/slack-desc
index 740342c04e..4539b78c3d 100644
--- a/system/herculesstudio/slack-desc
+++ b/system/herculesstudio/slack-desc
@@ -8,11 +8,11 @@
               |-----handy-ruler------------------------------------------------------|
 herculesstudio: herculesstudio (Hercules GUI for Linux)
 herculesstudio:
-herculesstudio: Hercules Studio is a GUI front-end to the Hercules Emulator.
-herculesstudio: As such, it requires the actual emulator to be installed and
-herculesstudio: operational in order for Hercules Studio to be functional.
+herculesstudio: Hercules Studio is a GUI front-end to the Hercules Emulator. As such,
+herculesstudio: it requires the actual emulator to be installed and operational in
+herculesstudio: order for Hercules Studio to be functional.
+herculesstudio:
 herculesstudio:
-herculesstudio: Homepage: http://www.mvsdasd.org/herculesstudio/
 herculesstudio:
 herculesstudio:
 herculesstudio: