diff options
Diffstat (limited to 'academic/xflr5')
-rw-r--r-- | academic/xflr5/link_directly.patch | 13 | ||||
-rw-r--r-- | academic/xflr5/link_directly.patch.gz | bin | 0 -> 225 bytes | |||
-rw-r--r-- | academic/xflr5/xflr5.SlackBuild | 9 | ||||
-rw-r--r-- | academic/xflr5/xflr5.info | 6 |
4 files changed, 10 insertions, 18 deletions
diff --git a/academic/xflr5/link_directly.patch b/academic/xflr5/link_directly.patch deleted file mode 100644 index 722a238556..0000000000 --- a/academic/xflr5/link_directly.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- xflr5-gui/xflr5-gui.pro 2019-12-26 23:06:50.168628145 -0500 -+++ xflr5-gui/xflr5-gui.pro.new 2019-12-26 23:07:01.925796901 -0500 -@@ -128,8 +128,8 @@ - QMAKE_CFLAGS_WARN_ON -= -W3 - QMAKE_CFLAGS_WARN_ON += -W4 - --LIBS += -L../xflr5-engine -lxflr5-engine --LIBS += -L../XFoil-lib -lXFoil -+LIBS += ../xflr5-engine/libxflr5-engine.so -+LIBS += ../XFoil-lib/libXFoil.so - - include(xflr5v6.pri) - diff --git a/academic/xflr5/link_directly.patch.gz b/academic/xflr5/link_directly.patch.gz Binary files differnew file mode 100644 index 0000000000..232529802f --- /dev/null +++ b/academic/xflr5/link_directly.patch.gz diff --git a/academic/xflr5/xflr5.SlackBuild b/academic/xflr5/xflr5.SlackBuild index 18e4308115..8bfc0a4705 100644 --- a/academic/xflr5/xflr5.SlackBuild +++ b/academic/xflr5/xflr5.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for xflr5 -# Copyright 2020-2022 Daniel Prosser, Lexington Park, MD, USA +# Copyright 2020-2023 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.54} +VERSION=${VERSION:-6.61} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -87,6 +87,11 @@ sed -i "s/target\.path = \$\$PREFIX\/lib/target\.path = \$\$PREFIX\/lib${LIBDIRS 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 +# Fix linking XFoil-lib +# Note: this patch *must* be gzipped, as it contain a mix of \n and \r\n +# line endings, and git would strip the \r's. +zcat $CWD/link_directly.patch.gz | patch -p0 + qmake-qt5 \ PREFIX=/usr \ QMAKE_CFLAGS+="$SLKCFLAGS" \ diff --git a/academic/xflr5/xflr5.info b/academic/xflr5/xflr5.info index 484e3aca95..947ad8f4ea 100644 --- a/academic/xflr5/xflr5.info +++ b/academic/xflr5/xflr5.info @@ -1,8 +1,8 @@ PRGNAM="xflr5" -VERSION="6.54" +VERSION="6.61" HOMEPAGE="http://www.xflr5.com/xflr5.htm" -DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/xflr5/xflr5-6.54.tar.gz" -MD5SUM="a005dabe15ff93bc441655228e10c291" +DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/xflr5/xflr5-6.61.tar.gz" +MD5SUM="ddedf9a123e67dfbf206901f6d6d59f1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |