summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse van Rhijn2017-12-21 20:59:31 +0100
committerJesse van Rhijn2017-12-21 20:59:31 +0100
commit2bf04e5b462c692641e1aac1803910804e9c27ab (patch)
tree4aa888797421882e85c7a470cf96cb338190f475
parenta98082d9e009158be987ace70dc6d3803c073076 (diff)
downloadaur-2bf04e5b462c692641e1aac1803910804e9c27ab.tar.gz
Incorporate write after eof fix from Ubuntu repos
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD20
-rw-r--r--xfoil-fix-write-after-end.patch31
3 files changed, 44 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5a0f7a70497f..d014198cb55a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,10 +10,12 @@ pkgbase = xfoil
depends = gcc-libs
depends = libx11
source = http://web.mit.edu/drela/Public/web/xfoil/xfoil6.99.tgz
+ source = xfoil-fix-write-after-end.patch
source = xfoil-overflow.patch
source = xfoil-osmap.patch
source = xfoil-build.patch
md5sums = 8d6270fc4341d299a426b3ad41be9cc4
+ md5sums = 818090412424024b464d8e3afee5732e
md5sums = f5f7d8cb268bf44546464636635109bc
md5sums = a4ad193f796e9de52596057d03e5b703
md5sums = 3f5445c409c7bca00ef22adedcaa61cf
diff --git a/PKGBUILD b/PKGBUILD
index 419d6092cb03..e774f44eeee5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
+# Maintainer: Jesse van Rhijn <jesse.v.rhijn@gmail.com>
# Contributor: pfm <vorticity@mail.ru>
pkgname=xfoil
pkgver=6.99
-pkgrel=2
+pkgrel=1
pkgdesc="Program for design and analysis of subsonic airfoils."
arch=('i686' 'x86_64')
url="http://web.mit.edu/drela/Public/web/xfoil/"
@@ -10,23 +11,19 @@ license=('GPL2')
depends=('gcc-libs' 'libx11')
makedepends=('gcc-fortran')
source=("http://web.mit.edu/drela/Public/web/xfoil/$pkgname$pkgver.tgz"
+ "xfoil-fix-write-after-end.patch"
"xfoil-overflow.patch"
"xfoil-osmap.patch"
"xfoil-build.patch")
-md5sums=('8d6270fc4341d299a426b3ad41be9cc4'
- 'f5f7d8cb268bf44546464636635109bc'
- 'a4ad193f796e9de52596057d03e5b703'
- '3f5445c409c7bca00ef22adedcaa61cf')
-
-prepare() {
+build() {
cd "$srcdir/Xfoil"
+
+ patch -Np1 -i ../xfoil-fix-write-after-end.patch
patch -Np1 -i ../xfoil-overflow.patch
patch -Np1 -i ../xfoil-osmap.patch
patch -Np1 -i ../xfoil-build.patch
-}
-build() {
cd "$srcdir/Xfoil/orrs/bin"
make -f Makefile_DP FTNLIB="${LDFLAGS}" OS
cd "$srcdir/Xfoil/orrs"
@@ -53,3 +50,8 @@ package() {
install -m644 ${srcdir}/Xfoil/xfoil_doc.txt \
${pkgdir}/usr/share/xfoil/doc
}
+md5sums=('8d6270fc4341d299a426b3ad41be9cc4'
+ '818090412424024b464d8e3afee5732e'
+ 'f5f7d8cb268bf44546464636635109bc'
+ 'a4ad193f796e9de52596057d03e5b703'
+ '3f5445c409c7bca00ef22adedcaa61cf')
diff --git a/xfoil-fix-write-after-end.patch b/xfoil-fix-write-after-end.patch
new file mode 100644
index 000000000000..5702e48a2c22
--- /dev/null
+++ b/xfoil-fix-write-after-end.patch
@@ -0,0 +1,31 @@
+diff -aur Xfoil/src/xpol.f Xfoil.patched/src/xpol.f
+--- Xfoil/src/xpol.f
++++ Xfoil.patched/src/xpol.f
+@@ -516,6 +516,7 @@
+ C
+ C---- the polar dump file doesn't exist, so write new header
+ 60 CONTINUE
++ BACKSPACE(LU)
+ WRITE(LU) NAME, 'XFOIL ', VERSION
+ WRITE(LU) MINF1, REINF1/1.0E6, ACRIT(1), ACRIT(2)
+ WRITE(LU) MATYP, RETYP
+@@ -948,7 +949,8 @@
+ 1000 FORMAT(A)
+ GO TO 10
+ C
+- 90 RETURN
++ 90 BACKSPACE(LU)
++ RETURN
+ END
+
+
+@@ -958,7 +960,8 @@
+ 10 READ(LU,END=90,ERR=90) DUMMY
+ GO TO 10
+ C
+- 90 RETURN
++ 90 BACKSPACE(LU)
++ RETURN
+ END
+
+