| 1 |
drac 08/04/28 21:22:21 |
| 2 |
|
| 3 |
Added: xstow-0.5.1-gcc43.patch |
| 4 |
Removed: xstow-0.4.6-configure-ncurses.diff |
| 5 |
Log: |
| 6 |
Fix building with GCC 4.3 wrt #219633, thanks to Peter Alfredsen. Also fix USE ncurses handling and pass --without-curses instead of --without-ncurses to configure. |
| 7 |
(Portage version: 2.1.5_rc6) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-admin/xstow/files/xstow-0.5.1-gcc43.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/xstow/files/xstow-0.5.1-gcc43.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/xstow/files/xstow-0.5.1-gcc43.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: xstow-0.5.1-gcc43.patch |
| 16 |
=================================================================== |
| 17 |
--- xstow-0.5.1.orig/src/format.h |
| 18 |
+++ xstow-0.5.1/src/format.h |
| 19 |
@@ -648,17 +648,17 @@ |
| 20 |
|
| 21 |
switch( num_of_args ) |
| 22 |
{ |
| 23 |
- case 1: n = std::snprintf( buffer, buffer_size, format.c_str(), |
| 24 |
+ case 1: n = snprintf( buffer, buffer_size, format.c_str(), |
| 25 |
D( a ) ); break; |
| 26 |
- case 2: n = std::snprintf( buffer, buffer_size, format.c_str(), |
| 27 |
+ case 2: n = snprintf( buffer, buffer_size, format.c_str(), |
| 28 |
D( a ), D( b ) ); break; |
| 29 |
- case 3: n = std::snprintf( buffer, buffer_size, format.c_str(), |
| 30 |
+ case 3: n = snprintf( buffer, buffer_size, format.c_str(), |
| 31 |
D( a ), D( b ), D( c ) ); break; |
| 32 |
- case 4: n = std::snprintf( buffer, buffer_size, format.c_str(), |
| 33 |
+ case 4: n = snprintf( buffer, buffer_size, format.c_str(), |
| 34 |
D( a ), D( b ), D( c ), D( d ) ); break; |
| 35 |
- case 5: n = std::snprintf( buffer, buffer_size, format.c_str(), |
| 36 |
+ case 5: n = snprintf( buffer, buffer_size, format.c_str(), |
| 37 |
D( a ), D( b ), D( c ), D( d ), D( e ) ); break; |
| 38 |
- case 6: n = std::snprintf( buffer, buffer_size, format.c_str(), |
| 39 |
+ case 6: n = snprintf( buffer, buffer_size, format.c_str(), |
| 40 |
D( a ), D( b ), D( c ), D( d ), D( e ), D( f ) ); break; |
| 41 |
} |
| 42 |
|
| 43 |
--- xstow-0.5.1.orig/src/main.cpp |
| 44 |
+++ xstow-0.5.1/src/main.cpp |
| 45 |
@@ -1,3 +1,4 @@ |
| 46 |
+#include <cstdlib> |
| 47 |
#include <iostream> |
| 48 |
|
| 49 |
#include "local_config.h" |
| 50 |
--- xstow-0.5.1.orig/src/cppdir.cpp |
| 51 |
+++ xstow-0.5.1/src/cppdir.cpp |
| 52 |
@@ -1,6 +1,8 @@ |
| 53 |
#include "cppdir.h" |
| 54 |
#include "debug.h" |
| 55 |
|
| 56 |
+#include <cstdlib> |
| 57 |
+ |
| 58 |
#define OUT(level) DEBUG_OUT( level, MODULE_CPPDIR) |
| 59 |
|
| 60 |
extern "C" { |
| 61 |
--- xstow-0.5.1.orig/src/setup.cpp |
| 62 |
+++ xstow-0.5.1/src/setup.cpp |
| 63 |
@@ -5,6 +5,8 @@ |
| 64 |
#include "debug.h" |
| 65 |
#include "nignore.h" |
| 66 |
|
| 67 |
+#include <cstdlib> |
| 68 |
+ |
| 69 |
#undef OUT |
| 70 |
|
| 71 |
#define OUT( level ) DEBUG_OUT( level, MODULE_SETUP ) |
| 72 |
--- xstow-0.5.1.orig/src/tree.cpp |
| 73 |
+++ xstow-0.5.1/src/tree.cpp |
| 74 |
@@ -26,6 +26,7 @@ |
| 75 |
|
| 76 |
|
| 77 |
#include <algorithm> |
| 78 |
+#include <cstring> |
| 79 |
|
| 80 |
#define OUT(level) DEBUG_OUT(level, MODULE_TREE) |
| 81 |
|
| 82 |
|
| 83 |
|
| 84 |
|
| 85 |
|
| 86 |
|
| 87 |
-- |
| 88 |
gentoo-commits@l.g.o mailing list |
Archives