games/hexglass: Fix 15.0 build.

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

3 files changed, 20 insertions, 18 deletions

diff --git a/games/hexglass/hexglass.SlackBuild b/games/hexglass/hexglass.SlackBuild
index f4b45dd15723..100e4c7a8e20 100644
--- a/games/hexglass/hexglass.SlackBuild
+++ b/games/hexglass/hexglass.SlackBuild
@@ -22,11 +22,20 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220220 bkw: Modified by SlackBuilds.org, BUILD=3:
+# - fix github filename mess. upstream includes the project name as the
+#   first part of the tag name, so the correct name really is:
+#   hexglass-hexglass-1.2.2.tar.gz.
+# - add qt4 dep, since it doesn't build with qt5.
+# - install binary in /usr/games
+# - absolute paths in .desktop
+# - icon was huge (512x512), resize to 64x64.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=hexglass
 VERSION=${VERSION:-1.2.1}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -38,9 +47,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
@@ -75,31 +81,27 @@ cd $PRGNAM-$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 {} \+
 
 # create Makefile
-qmake
+qmake-qt4
 
 # fix path installation
-sed -i 's/INSTALL\_ROOT)\/usr\/lib64\/qt\/bin/INSTALL\_ROOT)\/usr\/bin/g' Makefile
+sed -i 's/INSTALL\_ROOT)\/usr\/lib64\/qt4\/bin/INSTALL\_ROOT)\/usr\/games/g' Makefile
 
 make
 make INSTALL_ROOT=$PKG install
-
-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
+strip $PKG/usr/games/$PRGNAM
 
 # create .desktop file for this script
 mkdir -p $PKG/usr/share/applications
 install -D -m644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
 
 # convert .xpm logo image to .png file
-convert resources/logo512x512.xpm $PRGNAM.png
-
 mkdir -p $PKG/usr/share/pixmaps/
-install -D -m644 $PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
+convert -resize 64x64 resources/logo512x512.xpm $PKG/usr/share/pixmaps/$PRGNAM.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a CHANGES COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/games/hexglass/hexglass.desktop b/games/hexglass/hexglass.desktop
index d1d793dd8700..87fc38350427 100644
--- a/games/hexglass/hexglass.desktop
+++ b/games/hexglass/hexglass.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=HexGlass
 Comment=The HexGlass is a Tetris-like puzzle game
-Exec=hexglass
-Icon=hexglass
+Exec=/usr/games/hexglass
+Icon=/usr/share/pixmaps/hexglass.png
 Terminal=false
 Type=Application
 Categories=Game;LogicGame;
diff --git a/games/hexglass/hexglass.info b/games/hexglass/hexglass.info
index bfba313137ac..577386cb8fa5 100644
--- a/games/hexglass/hexglass.info
+++ b/games/hexglass/hexglass.info
@@ -1,10 +1,10 @@
 PRGNAM="hexglass"
 VERSION="1.2.1"
 HOMEPAGE="https://github.com/lizaifang/hexglass/"
-DOWNLOAD="https://github.com/lizaifang/hexglass/archive/hexglass-1.2.1.tar.gz"
+DOWNLOAD="https://github.com/lizaifang/hexglass/archive/hexglass-1.2.1/hexglass-hexglass-1.2.1.tar.gz"
 MD5SUM="92683988cd7f2aff7478c1e73c53433b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="qt4"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"