From c53e6ba5797f4d414baf2aca86693b572e876868 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 25 Feb 2011 13:17:36 +0000
Subject: testing/fotoxx: add updated patch

---
 testing/fotoxx/no-execinfo.patch | 51 ++++++++--------------------------------
 1 file changed, 10 insertions(+), 41 deletions(-)

diff --git a/testing/fotoxx/no-execinfo.patch b/testing/fotoxx/no-execinfo.patch
index 2c8195c9e9..c0e43a9f7c 100644
--- a/testing/fotoxx/no-execinfo.patch
+++ b/testing/fotoxx/no-execinfo.patch
@@ -1,56 +1,25 @@
 diff --git a/zfuncs.cc b/zfuncs.cc
-index 0427f99..686b75a 100644
+index 1398557..c504bbf 100644
 --- a/zfuncs.cc
 +++ b/zfuncs.cc
-@@ -45,12 +45,14 @@ void appcrash(cchar *pMess, ... )
-    va_end(arglist);
-    
-    printf("appcrash: \n %s \n",message);
--   
-+#ifndef __UCLIBC__ 
-    nstack = backtrace(stacklist,nstack);                                   //  good for g++ -rdynamic
-    stackents = backtrace_symbols(stacklist,nstack);
-    for (ii = 0; ii < nstack; ii++) 
-       printf(" %s \n",stackents[ii]);
--
-+#else
-+   printf("backtrace not available\n");
-+#endif
-    abort();                                                                //  good for gdb backtrace
- }
+@@ -77,6 +77,7 @@ void zappcrash(cchar *pMess, ... )                                         //  v
  
-@@ -105,11 +107,13 @@ void zappcrash(cchar *pMess, ... )                                         //  v
- 
-    printf("zappcrash: \n %s \n",message);                                  //  stdout message      v.3.7
+    printf("zappcrash: \n %s \n",message);                                  //  output message to stdout
  
 +#ifndef __UCLIBC__
     nstack = backtrace(stacklist,nstack);                                   //  get traceback data
     stackents = backtrace_symbols(stacklist,nstack);
  
-    for (ii = 0; ii < nstack; ii++)                                         //  stdout backtrace
-       printf(" %s \n",stackents[ii]);
-+#endif
- 
-    fid1 = fopen("zappcrash","w");                                          //  text file for backtrace
- 
-@@ -118,6 +122,7 @@ void zappcrash(cchar *pMess, ... )                                         //  v
-    cc = readlink("/proc/self/exe",progexe,300);                            //  get own program path
-    progexe[cc] = 0;
- 
-+#ifndef __UCLIBC__
-    for (ii = 0; ii < nstack; ii++)                                         //  output backtrace
-    {
-       pfunc = 0;
-@@ -137,6 +142,7 @@ void zappcrash(cchar *pMess, ... )                                         //  v
- 
-       fprintf(fid1," %s %s \n",stackents[ii],pfunc);                       //  write to text file
-    }
-+#endif
- 
+@@ -113,6 +114,7 @@ void zappcrash(cchar *pMess, ... )                                         //  v
     fclose(fid1);
     
+    err = system("xdg-open zappcrash");                                     //  display in editor
++#endif
+    abort();
+ }
+ 
 diff --git a/zfuncs.h b/zfuncs.h
-index 9ec9a6b..76b7b44 100644
+index e415adb..b6f02ac 100644
 --- a/zfuncs.h
 +++ b/zfuncs.h
 @@ -34,7 +34,9 @@
-- 
cgit v1.2.3