[IBSimu] Fix ARM FTBFS.

[Jon Ciesla]

commit 63f9511ecaac70993dec875e46e691cf6d7811ac
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Fri Sep 21 11:35:10 2012 -0500

    Fix ARM FTBFS.

 IBSimu-1.0.5b-arm.patch |   49 +++++++++++++++++++++++++++++++++++++++++++++++
 IBSimu.spec             |    7 +++++-
 2 files changed, 55 insertions(+), 1 deletions(-)
---
diff --git a/IBSimu-1.0.5b-arm.patch b/IBSimu-1.0.5b-arm.patch
new file mode 100644
index 0000000..a4717ca
--- /dev/null
+++ b/IBSimu-1.0.5b-arm.patch
@@ -0,0 +1,49 @@
+--- src/error.cpp.orig	2012-09-20 14:38:33.860633438 -0500
++++ src/error.cpp	2012-09-20 14:42:12.767022106 -0500
+@@ -163,9 +163,23 @@
+     std::cerr << "info.si_errno = " << info->si_errno << "\n";
+     std::cerr << "info.si_code  = " << info->si_code << "(" << si_codes[info->si_code] << ")\n";
+     std::cerr << "info.si_addr  = 0x" << std::hex << info->si_addr << "\n";
++#if not defined(__arm__)
+     for( int i = 0; i < NGREG; i++ )
+-	std::cerr << "reg[" << std::setw(2) << i << "]       = 0x" 
+-		  << std::hex << ucontext->uc_mcontext.gregs[i] << "\n";
++        std::cerr << "reg[" << std::setw(2) << i << "]       = 0x" 
++                  << std::hex << ucontext->uc_mcontext.gregs[i] << "\n";
++#else
++    std::cerr << "reg[" << std::setw(2) << 0 << "]       = 0x" << std::hex << ucontext->uc_mcontext.arm_r0 << "\n";
++    std::cerr << "reg[" << std::setw(2) << 1 << "]       = 0x" << std::hex << ucontext->uc_mcontext.arm_r1 << "\n";
++    std::cerr << "reg[" << std::setw(2) << 2 << "]       = 0x" << std::hex << ucontext->uc_mcontext.arm_r2 << "\n";
++    std::cerr << "reg[" << std::setw(2) << 3 << "]       = 0x" << std::hex << ucontext->uc_mcontext.arm_r3 << "\n";
++    std::cerr << "reg[" << std::setw(2) << 4 << "]       = 0x" << std::hex << ucontext->uc_mcontext.arm_r4 << "\n";
++    std::cerr << "reg[" << std::setw(2) << 5 << "]       = 0x" << std::hex << ucontext->uc_mcontext.arm_r5 << "\n";
++    std::cerr << "reg[" << std::setw(2) << 6 << "]       = 0x" << std::hex << ucontext->uc_mcontext.arm_r6 << "\n";
++    std::cerr << "reg[" << std::setw(2) << 7 << "]       = 0x" << std::hex << ucontext->uc_mcontext.arm_r7 << "\n";
++    std::cerr << "reg[" << std::setw(2) << 8 << "]       = 0x" << std::hex << ucontext->uc_mcontext.arm_r8 << "\n";
++    std::cerr << "reg[" << std::setw(2) << 9 << "]       = 0x" << std::hex << ucontext->uc_mcontext.arm_r9 << "\n";
++    std::cerr << "reg[" << std::setw(2) << 10 << "]       = 0x" << std::hex << ucontext->uc_mcontext.arm_r10 << "\n";
++#endif
+ 
+ #ifndef SIGSEGV_NOSTACK
+ #if defined(SIGSEGV_STACK_IA64) || defined(SIGSEGV_STACK_X86)
+--- src/error.cpp~	2012-09-20 16:02:13.000000000 -0500
++++ src/error.cpp	2012-09-20 16:03:23.144904511 -0500
+@@ -203,12 +203,12 @@
+ 	bp = (void**)bp[0];
+ 	i++;
+     }
+-#else
+-    std::cerr << "Stack trace (non-dedicated):\n";
+-    sz = backtrace( bt, 20 );
+-    strings = backtrace_symbols( bt, sz );
+-    for( int i = 0; i < sz; ++i )
+-	std::cerr << strings[i] << "\n";
++#elif not defined(__arm__)   
++    std::cerr << "Stack trace (non-dedicated):\n";
++    sz = backtrace( bt, 20 );
++    strings = backtrace_symbols( bt, sz );
++    for( int i = 0; i < sz; ++i )
++	std::cerr << strings[i] << "\n";
+ #endif
+     std::cerr << "End of stack trace.\n";
+ #else
diff --git a/IBSimu.spec b/IBSimu.spec
index 703f7e2..486c27a 100644
--- a/IBSimu.spec
+++ b/IBSimu.spec
@@ -2,7 +2,7 @@
 
 Name:           IBSimu
 Version:        1.0.5
-Release:        3.b%{?dist}
+Release:        4.b%{?dist}
 Summary:        Ion beam simulator
 
 Group:          System Environment/Libraries
@@ -26,6 +26,7 @@ Source7:	webheader.html
 #Both patches are reported upstream:
 Patch0 :        libibsimu-lower-cairo.patch
 Patch1:         libibsimu-remove-gtk_widget_set_tooltip_text.patch
+Patch2:         IBSimu-1.0.5b-arm.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -82,6 +83,7 @@ developing applications that use %{name}.
 %patch0 -p1
 %patch1 -p1
 %endif
+%patch2 -p0
 
 # Copy in missing doc files
 cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} doc/
@@ -122,6 +124,9 @@ make check
 %doc doc/html
 
 %changelog
+* Thu Sep 20 2012 Jon Ciesla <limburgher at gmail.com> - 1.0.5-4.b
+- Patch for FTBFS on ARM.
+
 * Thu Sep 20 2012 Jon Ciesla <limburgher at gmail.com> - 1.0.5-3.b
 - Dropped ISA from BR to help find fix for FTBFS on ARM.