| 1 |
robbat2 08/09/09 03:48:27 |
| 2 |
|
| 3 |
Added: ipager-1.1.0-gcc43.patch |
| 4 |
ipager-1.1.0-scons_flags.patch |
| 5 |
Log: |
| 6 |
Fix ipager to actually build. |
| 7 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc5-00283-g70bb089 x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 x11-misc/ipager/files/ipager-1.1.0-gcc43.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/ipager/files/ipager-1.1.0-gcc43.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/ipager/files/ipager-1.1.0-gcc43.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: ipager-1.1.0-gcc43.patch |
| 16 |
=================================================================== |
| 17 |
Fix ipager to compile with GCC 4.3. |
| 18 |
|
| 19 |
Patch taken from Gentoo bug #173562. |
| 20 |
|
| 21 |
X-Gentoo-Bug: 173562 |
| 22 |
Signed-off-by: Robin H. Johnson <robbat2@g.o> |
| 23 |
|
| 24 |
--- iconfig.old 2008-08-22 21:35:16.000000000 +0600 |
| 25 |
+++ iconfig.cpp 2008-08-22 21:35:20.000000000 +0600 |
| 26 |
@@ -30,7 +30,7 @@ |
| 27 |
#include <iostream> |
| 28 |
#include <fstream> |
| 29 |
#include <sstream> |
| 30 |
- |
| 31 |
+#include <stdlib.h> |
| 32 |
#include <sys/stat.h> |
| 33 |
#include <sys/types.h> |
| 34 |
|
| 35 |
--- wm.old 2008-08-22 21:52:36.000000000 +0600 |
| 36 |
+++ wm.cpp 2008-08-22 21:52:40.000000000 +0600 |
| 37 |
@@ -27,7 +27,7 @@ |
| 38 |
|
| 39 |
#include <time.h> |
| 40 |
#include "atoms.h" |
| 41 |
- |
| 42 |
+#include <stdlib.h> |
| 43 |
|
| 44 |
WM * WM::m_instance = 0; |
| 45 |
bool WM::x_error = false; |
| 46 |
|
| 47 |
|
| 48 |
|
| 49 |
1.1 x11-misc/ipager/files/ipager-1.1.0-scons_flags.patch |
| 50 |
|
| 51 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/ipager/files/ipager-1.1.0-scons_flags.patch?rev=1.1&view=markup |
| 52 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/ipager/files/ipager-1.1.0-scons_flags.patch?rev=1.1&content-type=text/plain |
| 53 |
|
| 54 |
Index: ipager-1.1.0-scons_flags.patch |
| 55 |
=================================================================== |
| 56 |
Make sure Scons takes the CFLAGS/CXXFLAGS/LDFLAGS etc for the system. |
| 57 |
|
| 58 |
Signed-off-by: Robin H. Johnson <robbat2@g.o> |
| 59 |
|
| 60 |
diff -Nuar ipager-1.1.0.orig/SConstruct ipager-1.1.0/SConstruct |
| 61 |
--- ipager-1.1.0.orig/SConstruct 2008-09-08 20:32:23.007016555 -0700 |
| 62 |
+++ ipager-1.1.0/SConstruct 2008-09-08 20:32:05.103267940 -0700 |
| 63 |
@@ -30,6 +30,16 @@ |
| 64 |
# environment |
| 65 |
ipager_env = Environment(options = ipager_options, ENV = os.environ) |
| 66 |
|
| 67 |
+# process env variables |
| 68 |
+for K in ['CPPFLAGS', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CC', 'CXX']: |
| 69 |
+ if K in os.environ.keys(): |
| 70 |
+ dict = ipager_env.ParseFlags(os.environ[K]) |
| 71 |
+ # These headers are supposed static. Don't check at each build. |
| 72 |
+ for i in dict['CPPPATH']: |
| 73 |
+ dict['CCFLAGS'].append('-I' + i) |
| 74 |
+ dict['CPPPATH'] = [] |
| 75 |
+ ipager_env.MergeFlags(dict) |
| 76 |
+ |
| 77 |
ipager_env.Append( |
| 78 |
CPPFLAGS = [ '-Wall' ], |
| 79 |
CPPPATH = [ '/usr/X11R6/include' ], |
Archives