diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2008-09-09 03:48:27 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2008-09-09 03:48:27 +0000 |
| commit | d5794251bdcca6ab6b304be2a7f28280987ade31 (patch) | |
| tree | 395a2ea274126f3e29cf7492c5cef90dcbe66cd5 /x11-misc/ipager/files | |
| parent | Added magic 'mms.cfg' file for system-wide security configuration. Also, thi... (diff) | |
| download | historical-d5794251bdcca6ab6b304be2a7f28280987ade31.tar.gz historical-d5794251bdcca6ab6b304be2a7f28280987ade31.tar.bz2 historical-d5794251bdcca6ab6b304be2a7f28280987ade31.zip | |
Fix ipager to actually build.
Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc5-00283-g70bb089 x86_64
Diffstat (limited to 'x11-misc/ipager/files')
| -rw-r--r-- | x11-misc/ipager/files/ipager-1.1.0-gcc43.patch | 29 | ||||
| -rw-r--r-- | x11-misc/ipager/files/ipager-1.1.0-scons_flags.patch | 24 |
2 files changed, 53 insertions, 0 deletions
diff --git a/x11-misc/ipager/files/ipager-1.1.0-gcc43.patch b/x11-misc/ipager/files/ipager-1.1.0-gcc43.patch new file mode 100644 index 000000000000..e4fe301a7b89 --- /dev/null +++ b/x11-misc/ipager/files/ipager-1.1.0-gcc43.patch @@ -0,0 +1,29 @@ +Fix ipager to compile with GCC 4.3. + +Patch taken from Gentoo bug #173562. + +X-Gentoo-Bug: 173562 +Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> + +--- iconfig.old 2008-08-22 21:35:16.000000000 +0600 ++++ iconfig.cpp 2008-08-22 21:35:20.000000000 +0600 +@@ -30,7 +30,7 @@ + #include <iostream> + #include <fstream> + #include <sstream> +- ++#include <stdlib.h> + #include <sys/stat.h> + #include <sys/types.h> + +--- wm.old 2008-08-22 21:52:36.000000000 +0600 ++++ wm.cpp 2008-08-22 21:52:40.000000000 +0600 +@@ -27,7 +27,7 @@ + + #include <time.h> + #include "atoms.h" +- ++#include <stdlib.h> + + WM * WM::m_instance = 0; + bool WM::x_error = false; diff --git a/x11-misc/ipager/files/ipager-1.1.0-scons_flags.patch b/x11-misc/ipager/files/ipager-1.1.0-scons_flags.patch new file mode 100644 index 000000000000..6eb8b1ff4f53 --- /dev/null +++ b/x11-misc/ipager/files/ipager-1.1.0-scons_flags.patch @@ -0,0 +1,24 @@ +Make sure Scons takes the CFLAGS/CXXFLAGS/LDFLAGS etc for the system. + +Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> + +diff -Nuar ipager-1.1.0.orig/SConstruct ipager-1.1.0/SConstruct +--- ipager-1.1.0.orig/SConstruct 2008-09-08 20:32:23.007016555 -0700 ++++ ipager-1.1.0/SConstruct 2008-09-08 20:32:05.103267940 -0700 +@@ -30,6 +30,16 @@ + # environment + ipager_env = Environment(options = ipager_options, ENV = os.environ) + ++# process env variables ++for K in ['CPPFLAGS', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CC', 'CXX']: ++ if K in os.environ.keys(): ++ dict = ipager_env.ParseFlags(os.environ[K]) ++ # These headers are supposed static. Don't check at each build. ++ for i in dict['CPPPATH']: ++ dict['CCFLAGS'].append('-I' + i) ++ dict['CPPPATH'] = [] ++ ipager_env.MergeFlags(dict) ++ + ipager_env.Append( + CPPFLAGS = [ '-Wall' ], + CPPPATH = [ '/usr/X11R6/include' ], |