graphics/teighafileconverter: Updated for v19.5.0.0, new maintainer.

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

5 files changed, 67 insertions, 27 deletions

diff --git a/graphics/teighafileconverter/README b/graphics/teighafileconverter/README
index 307659241156..c1b9b329e90f 100644
--- a/graphics/teighafileconverter/README
+++ b/graphics/teighafileconverter/README
@@ -1,2 +1,4 @@
+teighafileconverter (DWG and DXF file converter)
+
 TeighaFileConverter is a free application that converts files between
-the .dwg and .dxf file formats.
+the .dwg and .dxf CAD file formats (used by AutoCAD, among others).
diff --git a/graphics/teighafileconverter/slack-desc b/graphics/teighafileconverter/slack-desc
index c515248f425f..1a0fb6db7283 100644
--- a/graphics/teighafileconverter/slack-desc
+++ b/graphics/teighafileconverter/slack-desc
@@ -9,7 +9,7 @@
 teighafileconverter: teighafileconverter (DWG and DXF file converter)
 teighafileconverter:
 teighafileconverter: TeighaFileConverter is a free application that converts files between
-teighafileconverter: the .dwg and .dxf file formats.
+teighafileconverter: the .dwg and .dxf CAD file formats (used by AutoCAD, among others).
 teighafileconverter:
 teighafileconverter: Homepage: https://www.opendesign.com/guestfiles/TeighaFileConverter
 teighafileconverter:
diff --git a/graphics/teighafileconverter/teighafileconverter.SlackBuild b/graphics/teighafileconverter/teighafileconverter.SlackBuild
index bdd32297ce68..80bdd648517a 100644
--- a/graphics/teighafileconverter/teighafileconverter.SlackBuild
+++ b/graphics/teighafileconverter/teighafileconverter.SlackBuild
@@ -2,7 +2,8 @@
 
 # Slackware build script for TeighaFileConverter
 
-# Copyright 2012-2014  Fridrich von Stauffenberg <cancellor2@gmail.com>
+# Copyright 2012-2014  Fridrich von Stauffenberg <email removed>
+# Copyright 2018 B. Watson <yalhcru@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,42 +23,79 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20180724 bkw:
+# - Take over maintenance.
+# - Update for v19.5.0.0. This adds x86_64 support, but means qt5 is
+#   now required.
+# - Pacify desktop-file-validate.
+# - Simplify script a bit.
+# - Clarify README and slack-desc.
+# - Name the x86 package according to ARCH (i586 or i686). No effect on
+#   the package contents, just the filename.
+
 PRGNAM=teighafileconverter
-VERSION=${VERSION:-4.00.0}
+VERSION=${VERSION:-19.5.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-ARCH=i386
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
 
-ORIG_PRGNAM=TeighaFileConverter
+ORIGNAM=TeighaFileConverter
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+case "$ARCH" in
+  i?86)   DEBARCH=X86 ; LIBDIRSUFFIX=""   ;;
+  x86_64) DEBARCH=X64 ; LIBDIRSUFFIX="64" ;;
+  *)      echo "Unsupported ARCH, only i?86 and x86_64 supported" 1>&2
+          exit 1 ;;
+esac
+
 set -e
 
+# No "source" directory, extract directly to $PKG.
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $PKG
-ar xv $CWD/${ORIG_PRGNAM}_lnxX86_4.4dll_${VERSION}_$ARCH.deb
-tar xvf data.tar.gz
-rm -f data.tar.gz control.tar.gz debian-binary
+
+# How to extract a .deb without creating temp files. If you're using this
+# in your own SlackBuild, be aware that some .debs contain data.tar.xz
+# instead of .gz.
+ar p $CWD/${ORIGNAM}_QT5_lnx${DEBARCH}_*dll.deb data.tar.gz | tar xvfz -
+
 chown -R root:root .
 find . -type d -exec chmod 755 {} \;
 find -L . \! -name '*.so' \! -name '*.tx*' -type f -exec chmod 644 {} \;
 
-mkdir -p $PKG/usr/lib
-mv $PKG/usr/bin/${ORIG_PRGNAM}_$VERSION $PKG/usr/lib/$ORIG_PRGNAM
-cat $CWD/$PRGNAM.sh > $PKG/usr/bin/$ORIG_PRGNAM
-chmod 755 $PKG/usr/bin/$ORIG_PRGNAM $PKG/usr/lib/$ORIG_PRGNAM/$ORIG_PRGNAM
+# Binaries aren't stripped, according to 'file', but they don't get any
+# smaller if I strip them, so leave them as-is.
+
+PKGLIB=$PKG/usr/lib$LIBDIRSUFFIX
+mkdir -p $PKGLIB
+mv $PKG/usr/bin/${ORIGNAM}_$VERSION $PKGLIB/$ORIGNAM
+sed "s,@LIBDIRSUFFIX@,$LIBDIRSUFFIX,g" $CWD/$PRGNAM.sh > $PKG/usr/bin/$ORIGNAM
+chmod 755 $PKG/usr/bin/$ORIGNAM $PKGLIB/$ORIGNAM/$ORIGNAM
 
-mv $PKG/usr/share/applications/${ORIG_PRGNAM}{_$VERSION,}.desktop
-sed -i 's@/usr/bin/@@g' $PKG/usr/share/applications/$ORIG_PRGNAM.desktop
+# .desktop file spec says they *must* be UTF-8, upstream used 8859-1...
+PKGAPP=$PKG/usr/share/applications
+iconv -f ISO-8859-1 -t UTF-8 $PKGAPP/${ORIGNAM}_$VERSION.desktop | \
+  sed 's@/usr/bin/@@g' > \
+  $PKGAPP/${ORIGNAM}.deskop
+rm -f $PKGAPP/${ORIGNAM}_$VERSION.desktop
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/doc/$ORIG_PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+mv $PKG/usr/share/doc/$ORIGNAM/* $PKGDOC
 rm -rf $PKG/usr/share/doc
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/graphics/teighafileconverter/teighafileconverter.info b/graphics/teighafileconverter/teighafileconverter.info
index e559a8e55fb7..9cd78e6cff29 100644
--- a/graphics/teighafileconverter/teighafileconverter.info
+++ b/graphics/teighafileconverter/teighafileconverter.info
@@ -1,10 +1,10 @@
 PRGNAM="teighafileconverter"
-VERSION="4.00.0"
+VERSION="19.5.0.0"
 HOMEPAGE="https://www.opendesign.com/guestfiles/TeighaFileConverter"
-DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/teighafileconverter/TeighaFileConverter_lnxX86_4.4dll_4.00.0_i386.deb"
-MD5SUM="4a74e4ab1b4555f31ff7a070ff6c8a8a"
-DOWNLOAD_x86_64="UNSUPPORTED"
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="orphaned - no maintainer"
-EMAIL="nobody@nowhere.com"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/TeighaFileConverter_QT5_lnxX86_4.7dll.deb"
+MD5SUM="68e6185b3419fcf31d53da1fe34142a4"
+DOWNLOAD_x86_64="http://urchlay.naptime.net/~urchlay/src/TeighaFileConverter_QT5_lnxX64_4.7dll.deb"
+MD5SUM_x86_64="a9da11f38a74a767812f1a11d387bbbf"
+REQUIRES="qt5"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/graphics/teighafileconverter/teighafileconverter.sh b/graphics/teighafileconverter/teighafileconverter.sh
index e41e380d1361..0b4a1f1ced35 100644
--- a/graphics/teighafileconverter/teighafileconverter.sh
+++ b/graphics/teighafileconverter/teighafileconverter.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-export LD_LIBRARY_PATH=/usr/lib/TeighaFileConverter:$LD_LIBRARY_PATH
-exec /usr/lib/TeighaFileConverter/TeighaFileConverter "$@"
+export LD_LIBRARY_PATH=/usr/lib@LIBDIRSUFFIX@/TeighaFileConverter:$LD_LIBRARY_PATH
+exec /usr/lib@LIBDIRSUFFIX@/TeighaFileConverter/TeighaFileConverter "$@"