academic/xflr5: Updated for version 6.54.

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

3 files changed, 14 insertions, 26 deletions

diff --git a/academic/xflr5/xflr5.SlackBuild b/academic/xflr5/xflr5.SlackBuild
index 03f38a6d2e..18e4308115 100644
--- a/academic/xflr5/xflr5.SlackBuild
+++ b/academic/xflr5/xflr5.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xflr5
 
-# Copyright 2020 Daniel Prosser, Lexington Park, MD, USA
+# Copyright 2020-2022 Daniel Prosser, Lexington Park, MD, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=xflr5
-VERSION=${VERSION:-6.47}
+VERSION=${VERSION:-6.54}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -69,9 +69,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM
-tar xvf $CWD/${PRGNAM}_v${VERSION}_src.tar.gz
-cd $PRGNAM
+rm -rf ${PRGNAM}-${VERSION}
+tar -xzvf $CWD/${PRGNAM}-${VERSION}.tar.gz
+cd ${PRGNAM}-${VERSION}
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -82,12 +82,10 @@ find -L . \
 # Change default path for libraries installation
 sed -i "s/target\.path = \$\$PREFIX\/lib/target\.path = \$\$PREFIX\/lib${LIBDIRSUFFIX}/g" \
   XFoil-lib/XFoil-lib.pro
-sed -i "s/target\.path = \$\$PREFIX\/lib/target\.path = \$\$PREFIX\/lib${LIBDIRSUFFIX}/g" \
-  xflr5-engine/xflr5-engine.pro
 
-# Patch seems to have been made with other line endings to the source.
-# Fix linking
-sed "s,$,\r," $CWD/link_directly.patch | patch -lp0 --verbose --binary
+# Fix some hardcoded paths in launcher
+sed -i "s/Exec=\/usr\/local\/bin\/xflr5/Exec=\/usr\/bin\/xflr5/g" linux/xflr5.desktop
+sed -i "s/Icon=\/usr\/local\/share\/xflr5\/xflr5.png/Icon=xflr5/g" linux/xflr5.desktop
 
 qmake-qt5 \
   PREFIX=/usr \
@@ -102,11 +100,11 @@ make install INSTALL_ROOT=$PKG
 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
 
-mkdir -p $PKG/usr/share/icons/hicolor/64x64/apps
-cp -a xflr5-gui/images/xflr5_64.png $PKG/usr/share/icons/hicolor/64x64/apps
+mkdir -p $PKG/usr/share/icons/hicolor/128x128/apps
+cp -a res/xflr5.png $PKG/usr/share/icons/hicolor/128x128/apps
 
 mkdir -p $PKG/usr/share/applications
-cp -a $CWD/xflr5.desktop $PKG/usr/share/applications
+cp -a linux/xflr5.desktop $PKG/usr/share/applications
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a License.txt $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/academic/xflr5/xflr5.desktop b/academic/xflr5/xflr5.desktop
deleted file mode 100644
index 4559ab869f..0000000000
--- a/academic/xflr5/xflr5.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Comment=an analysis tool for airfoils, wings, and planes
-Exec=xflr5
-GenericName=Aircraft analysis tool
-Icon=xflr5_64
-Name=xflr5
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Education;Science;
diff --git a/academic/xflr5/xflr5.info b/academic/xflr5/xflr5.info
index 44491f3fe1..484e3aca95 100644
--- a/academic/xflr5/xflr5.info
+++ b/academic/xflr5/xflr5.info
@@ -1,8 +1,8 @@
 PRGNAM="xflr5"
-VERSION="6.47"
+VERSION="6.54"
 HOMEPAGE="http://www.xflr5.com/xflr5.htm"
-DOWNLOAD="https://slackware.uk/sbosrcarch/by-name/academic/xflr5/xflr5_v6.47_src.tar.gz"
-MD5SUM="272484cc3fe077af31bbe2ad7ef4205b"
+DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/xflr5/xflr5-6.54.tar.gz"
+MD5SUM="a005dabe15ff93bc441655228e10c291"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""