aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--academic/xflr5/link_directly.patch11
-rw-r--r--academic/xflr5/link_directly.patch.gzbin0 -> 225 bytes
-rw-r--r--academic/xflr5/xflr5.SlackBuild4
3 files changed, 3 insertions, 12 deletions
diff --git a/academic/xflr5/link_directly.patch b/academic/xflr5/link_directly.patch
deleted file mode 100644
index 10259cc326530..0000000000000
--- a/academic/xflr5/link_directly.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xflr5v6/xflr5v6.pro 2023-11-04 12:13:23.000000000 -0400
-+++ xflr5v6/xflr5v6.pro.new 2023-12-21 03:12:21.572518974 -0500
-@@ -121,7 +121,7 @@
- QMAKE_CFLAGS_WARN_ON -= -W3
- QMAKE_CFLAGS_WARN_ON += -W4
-
--LIBS += -L../XFoil-lib -lXFoil
-+LIBS += ../XFoil-lib/libXFoil.so
-
-
- include(xflr5v6.pri)
diff --git a/academic/xflr5/link_directly.patch.gz b/academic/xflr5/link_directly.patch.gz
new file mode 100644
index 0000000000000..232529802fa8f
--- /dev/null
+++ b/academic/xflr5/link_directly.patch.gz
Binary files differ
diff --git a/academic/xflr5/xflr5.SlackBuild b/academic/xflr5/xflr5.SlackBuild
index 0ab76f588cfca..8bfc0a47053a9 100644
--- a/academic/xflr5/xflr5.SlackBuild
+++ b/academic/xflr5/xflr5.SlackBuild
@@ -88,7 +88,9 @@ sed -i "s/Exec=\/usr\/local\/bin\/xflr5/Exec=\/usr\/bin\/xflr5/g" linux/xflr5.de
sed -i "s/Icon=\/usr\/local\/share\/xflr5\/xflr5.png/Icon=xflr5/g" linux/xflr5.desktop
# Fix linking XFoil-lib
-patch -p0 < $CWD/link_directly.patch
+# 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 \