summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2008-12-01 15:03:33 -0800
committerEric Sandall2008-12-01 15:03:33 -0800
commit4a2adedf446ba45d516fae1b63540047f61249fb (patch)
treef1f60777ec693d199b02367fcb38a5517f470ca8
parent79ce0476d32f38ac7764cdcc47dbda5415e7c322 (diff)
devtodo: gcc4.3.0_fix.diff: added for #14910
(cherry-picked from commit 9abdac84fb3f03c3dc08b27edd27a1a9c6b43e7f)
-rw-r--r--utils/devtodo/HISTORY3
-rwxr-xr-xutils/devtodo/PRE_BUILD3
-rw-r--r--utils/devtodo/gcc4.3.0_fix.diff10
3 files changed, 15 insertions, 1 deletions
diff --git a/utils/devtodo/HISTORY b/utils/devtodo/HISTORY
index 1501984e3b..664ef478c3 100644
--- a/utils/devtodo/HISTORY
+++ b/utils/devtodo/HISTORY
@@ -1,3 +1,6 @@
+2008-11-26 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
+ * gcc4.3.0_fix.diff: added for #14910
+
2007-01-28 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
* PRE_BUILD, gcc4 patch: added to fix compilation #13460
diff --git a/utils/devtodo/PRE_BUILD b/utils/devtodo/PRE_BUILD
index 64d7228137..7843a8a1aa 100755
--- a/utils/devtodo/PRE_BUILD
+++ b/utils/devtodo/PRE_BUILD
@@ -2,4 +2,5 @@ default_pre_build &&
cd $SOURCE_DIRECTORY &&
patch -p1 < $SPELL_DIRECTORY/devtodo-0.1.19-gcc4.diff &&
# another gcc4 fix
-sed -i '/int TodoDB::markDone(Todo &todo);/ s,TodoDB::,,' src/TodoDB.h
+sed -i '/int TodoDB::markDone(Todo &todo);/ s,TodoDB::,,' src/TodoDB.h &&
+patch -p0 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/gcc4.3.0_fix.diff
diff --git a/utils/devtodo/gcc4.3.0_fix.diff b/utils/devtodo/gcc4.3.0_fix.diff
new file mode 100644
index 0000000000..ebf4ed1afa
--- /dev/null
+++ b/utils/devtodo/gcc4.3.0_fix.diff
@@ -0,0 +1,10 @@
+--- src/todoterm.cc 2008-05-03 17:10:43.000000000 +0200
++++ src/todoterm.cc 2008-05-03 17:08:46.000000000 +0200
+@@ -4,6 +4,7 @@
+ #ifdef USETERMCAP
+ #include <iostream>
+ #include <string>
++#include <stdlib.h>
+ #include <stdexcept>
+ #include <curses.h>
+ #include <term.h>