[nazghul] Try to fix ARM build.

Jason ティビツ tibbs at fedoraproject.org
Sat Feb 21 20:29:41 UTC 2015


commit 3474ccca640645a073bce2d0fcf53c674546eaee
Author: Jason Tibbitts <tibbs at math.uh.edu>
Date:   Sat Feb 21 14:27:43 2015 -0600

    Try to fix ARM build.

 nazghul-armbuild.patch | 13 +++++++++++++
 nazghul.spec           |  6 +++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/nazghul-armbuild.patch b/nazghul-armbuild.patch
new file mode 100644
index 0000000..98753b9
--- /dev/null
+++ b/nazghul-armbuild.patch
@@ -0,0 +1,13 @@
+diff -r -u nazghul.armbuild/src/cmdwin.c nazghul/src/cmdwin.c
+--- nazghul.armbuild/src/cmdwin.c	2012-02-28 13:12:29.000000000 -0600
++++ nazghul/src/cmdwin.c	2015-02-21 14:26:30.304531152 -0600
+@@ -221,7 +221,8 @@
+ 
+ void cmdwin_push_mark()
+ {
+-        cmdwin_vpush(CMDWIN_FRAG_MARK, 0, 0);
++        va_list args;
++        cmdwin_vpush(CMDWIN_FRAG_MARK, 0, args);
+ }
+ 
+ void cmdwin_pop(void)
diff --git a/nazghul.spec b/nazghul.spec
index 60d8ba9..253844d 100644
--- a/nazghul.spec
+++ b/nazghul.spec
@@ -1,6 +1,6 @@
 Name:           nazghul
 Version:        0.7.1
-Release:        9.20120228gitb0a402a%{?dist}
+Release:        10.20120228gitb0a402a%{?dist}
 Summary:        A computer role-playing game (CRPG) engine
 
 License:        GPLv2+
@@ -18,6 +18,7 @@ Source0:        nazghul-20120228gitb0a402a.txz
 Source1:        haxima-music-license
 Patch0:         nazghul-desktop.patch
 Patch1:         nazghul-format-security.patch
+Patch2:         nazghul-armbuild.patch
 
 # For building from a CVS snapshot
 BuildRequires:  automake, autoconf
@@ -98,6 +99,9 @@ install -D -m 644 icons/haxima.png %{buildroot}/%{_datadir}/pixmaps/haxima.png
 
 
 %changelog
+* Sat Feb 21 2015 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7.1-10.20120228gitb0a402a
+- Fix build on ARM.
+
 * Sat Feb 21 2015 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7.1-9.20120228gitb0a402a
 - Fix format-security errors.
 - Fix upstream URL.


More information about the scm-commits mailing list