From 883ad17197f6ad77f36b15d5b53a85ed8f1347a8 Mon Sep 17 00:00:00 2001
From: Daniel Prosser <dpross1100@msn.com>
Date: Sat, 23 Jun 2018 02:22:22 +0700
Subject: academic/xflr5: Updated for version 6.42.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 academic/xflr5/fix_includes.diff | 23 -----------------------
 academic/xflr5/xflr5.SlackBuild  | 15 +++++++--------
 academic/xflr5/xflr5.info        |  6 +++---
 3 files changed, 10 insertions(+), 34 deletions(-)
 delete mode 100644 academic/xflr5/fix_includes.diff

(limited to 'academic')

diff --git a/academic/xflr5/fix_includes.diff b/academic/xflr5/fix_includes.diff
deleted file mode 100644
index cc4fe2c56d..0000000000
--- a/academic/xflr5/fix_includes.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- xflr5-gui/xdirect/XDirectStyleDlg.cpp	2018-02-28 23:07:05.640183963 -0500
-+++ xflr5-gui/xdirect/XDirectStyleDlg.cpp.new	2018-02-28 23:06:54.047183259 -0500
-@@ -25,7 +25,7 @@
- #include "viewwidgets/oppointwidget.h"
- #include <QGridLayout>
- #include <QLabel>
--
-+#include <QKeyEvent>
- 
- 
- XDirectStyleDlg::XDirectStyleDlg(QWidget *pParent) : QDialog(pParent)
---- xflr5-gui/xdirect/analysis/XFoilAnalysisDlg.cpp	2018-02-28 23:10:02.922194720 -0500
-+++ xflr5-gui/xdirect/analysis/XFoilAnalysisDlg.cpp.new	2018-02-17 07:56:55.430707766 -0500
-@@ -37,8 +37,7 @@
- #include "graphwidget.h"
- #include <XFoil.h>
- #include <xdirect/analysis/XFoilTask.h>
--
--
-+#include <QShowEvent>
- 
- void *XFoilAnalysisDlg::s_pXDirect;
- QPoint XFoilAnalysisDlg::s_Position;
diff --git a/academic/xflr5/xflr5.SlackBuild b/academic/xflr5/xflr5.SlackBuild
index 85e09e46e9..1e20a40f35 100644
--- a/academic/xflr5/xflr5.SlackBuild
+++ b/academic/xflr5/xflr5.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xflr5
-VERSION=${VERSION:-6.40}
+VERSION=${VERSION:-6.42}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM
-tar xvf $CWD/${PRGNAM}_v${VERSION}_src.tar.gz
+tar xvf $CWD/${PRGNAM}_${VERSION}_src.tar.gz
 cd $PRGNAM
 chown -R root:root .
 find -L . \
@@ -69,7 +69,11 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch -p0 < $CWD/fix_includes.diff
+# Change default path for libraries installation
+sed -i "s/target\.path = \/usr\/local\/lib/target\.path = \/usr\/lib${LIBDIRSUFFIX}/g" \
+  XFoil-lib/XFoil-lib.pro
+sed -i "s/target\.path = \/usr\/local\/lib/target\.path = \/usr\/lib${LIBDIRSUFFIX}/g" \
+  xflr5-engine/xflr5-engine.pro
 
 qmake-qt5 \
   PREFIX=/usr \
@@ -81,11 +85,6 @@ qmake-qt5 \
 make
 make install INSTALL_ROOT=$PKG
 
-# Rename lib directory manually, since there's no configuration option to do so
-if [ -n "$LIBDIRSUFFIX" ]; then
-  mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX}
-fi
-
 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
 
diff --git a/academic/xflr5/xflr5.info b/academic/xflr5/xflr5.info
index 0c2221f819..b9ad0e8653 100644
--- a/academic/xflr5/xflr5.info
+++ b/academic/xflr5/xflr5.info
@@ -1,8 +1,8 @@
 PRGNAM="xflr5"
-VERSION="6.40"
+VERSION="6.42"
 HOMEPAGE="http://www.xflr5.com/xflr5.htm"
-DOWNLOAD="https://netix.dl.sourceforge.net/project/xflr5/6.40/xflr5_v6.40_src.tar.gz"
-MD5SUM="f29b78d641c1f09138ffaa02377b3f26"
+DOWNLOAD="https://phoenixnap.dl.sourceforge.net/project/xflr5/6.42/xflr5_6.42_src.tar.gz"
+MD5SUM="ec1586f2257ef82921500c888686dcd9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
-- 
cgit v1.2.3