From d3703bea4f193f2e340fe9eb55a6d6d54c9c00b0 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Thu, 11 Oct 2018 10:50:02 +0200
Subject: extra/nasm: fix for pure function attributes (FS#60380) and i486 fix
 for no TTF fonts for docu

---
 .../0001-Remove-invalid-pure_func-qualifiers.patch | 27 ++++++++++++++++++++++
 extra/nasm/PKGBUILD                                | 13 +++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 extra/nasm/0001-Remove-invalid-pure_func-qualifiers.patch
 create mode 100644 extra/nasm/PKGBUILD

(limited to 'extra/nasm')

diff --git a/extra/nasm/0001-Remove-invalid-pure_func-qualifiers.patch b/extra/nasm/0001-Remove-invalid-pure_func-qualifiers.patch
new file mode 100644
index 00000000..87ec601c
--- /dev/null
+++ b/extra/nasm/0001-Remove-invalid-pure_func-qualifiers.patch
@@ -0,0 +1,27 @@
+From d0dabb46a821b2506681f882af0d5696d2c2bade Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek@redhat.com>
+Date: Thu, 8 Feb 2018 14:47:08 +0100
+Subject: [PATCH] Remove invalid pure_func qualifiers
+
+---
+ include/nasmlib.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/nasmlib.h b/include/nasmlib.h
+index 79e866b..c93cef0 100644
+--- a/include/nasmlib.h
++++ b/include/nasmlib.h
+@@ -191,8 +191,8 @@ int64_t readstrnum(char *str, int length, bool *warn);
+  * seg_init: Initialise the segment-number allocator.
+  * seg_alloc: allocate a hitherto unused segment number.
+  */
+-void pure_func seg_init(void);
+-int32_t pure_func seg_alloc(void);
++void seg_init(void);
++int32_t seg_alloc(void);
+ 
+ /*
+  * many output formats will be able to make use of this: a standard
+-- 
+2.14.3
+
diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD
new file mode 100644
index 00000000..220091bd
--- /dev/null
+++ b/extra/nasm/PKGBUILD
@@ -0,0 +1,13 @@
+# see FS#60380
+source+=('0001-Remove-invalid-pure_func-qualifiers.patch')
+sha1sums+=('b853817a1dd5dc902b36ae80d11402d68e6d9a44')
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i "$srcdir/0001-Remove-invalid-pure_func-qualifiers.patch"
+}
+
+# i486-specific
+if [ "${CARCH}" = "i486" ]; then
+  # remove ttf-liberation (X packages missing for installing the font)
+  makedepends=(${makedepends[@]//ttf-liberation/})
+fi
-- 
cgit v1.2.3