development/hexinator: Updated for version 1.10.

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

2 files changed, 24 insertions, 14 deletions

diff --git a/development/hexinator/hexinator.SlackBuild b/development/hexinator/hexinator.SlackBuild
index 7966c38c29..96a64af668 100644
--- a/development/hexinator/hexinator.SlackBuild
+++ b/development/hexinator/hexinator.SlackBuild
@@ -6,13 +6,19 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20200317 bkw: update for v1.10, switched from RPM to .deb. Yes, there
+# is a v1.11 available, but there are good reasons for not packaging it,
+# from our POV:
+# 1) v1.11 dropped support for 32-bit.
+# 2) The 64-bit .deb for v1.11 is missing one of the shared libraries that
+#    should be packaged with it, so it doesn't *work*. Reported to
+#    upstream, possibly will be fixed soon.
+
 PRGNAM=hexinator
-VERSION=${VERSION:-1.9_1}
+VERSION=${VERSION:-1.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-RPMVER="$( echo $VERSION | sed 's/_/-/g' )"
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -27,8 +33,8 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 case "$ARCH" in
-  i?86)   RPMARCH=i386    ;;
-  x86_64) RPMARCH="$ARCH" ;;
+  i?86)   DEBARCH=i386    ;;
+  x86_64) DEBARCH=amd64 ;;
   *) echo "!!! Unsupported ARCH '$ARCH'. Only i586|i686|x86_64 allowed." 1>&2
      exit 1 ;;
 esac
@@ -41,19 +47,23 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 mkdir -p $PKG
 cd $PKG
-rpm2cpio $CWD/$PRGNAM-$RPMVER.$RPMARCH.rpm | cpio -idmv
+ar p $CWD/$PRGNAM-${VERSION}_$DEBARCH.deb data.tar.xz | tar xvfJ -
+
+# png icons don't need to be +x
+chmod -x usr/share/icons/*/*/*/*
+
 chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-# No docs in the RPM, include our own README.
+# No docs in the .deb, include our own README.
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $CWD/README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # The hexinator binary was built with rpath support, so it can find its
 # own libraries. The libs need some attention before hexinator can find
-# them (presumably rpm would automagically do this when the package gets
+# them (presumably dpkg would automagically do this when the package gets
 # installed). It's a qt5 app that ships with its own private set of qt5
 # libs. We *don't* want it using any other qt5 libs that may happen to
 # exist (like the ones in /usr/lib64 from the qt5 SlackBuild). The
diff --git a/development/hexinator/hexinator.info b/development/hexinator/hexinator.info
index efed4f495d..552bb018c3 100644
--- a/development/hexinator/hexinator.info
+++ b/development/hexinator/hexinator.info
@@ -1,10 +1,10 @@
 PRGNAM="hexinator"
-VERSION="1.9_1"
+VERSION="1.10"
 HOMEPAGE="https://hexinator.com/"
-DOWNLOAD="https://hexinator.com/downloads/linux/hexinator-1.9-1.i386.rpm"
-MD5SUM="e39533c034c9b4b668706ae91d278b25"
-DOWNLOAD_x86_64="https://hexinator.com/downloads/linux/hexinator-1.9-1.x86_64.rpm"
-MD5SUM_x86_64="593c0f3f62e8ca92aedeb2c67eca12c3"
+DOWNLOAD="https://hexinator.com/downloads/dists/synalysis/non-free/binary-i386/hexinator-1.10_i386.deb"
+MD5SUM="7d056fcd3f45519873adf453caa9a5dc"
+DOWNLOAD_x86_64="https://hexinator.com/downloads/dists/synalysis/non-free/binary-amd64/hexinator-1.10_amd64.deb"
+MD5SUM_x86_64="9eba3224688d41edb515ffbe2e0155c1"
 REQUIRES=""
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"