summaryrefslogtreecommitdiff
path: root/development/codeblocks/ftbfs-gcc-4.7.diff
diff options
context:
space:
mode:
authorMatteo Bernardini <ponce@slackbuilds.org>2012-09-16 14:32:53 +0200
committerdsomero <xgizzmo@slackbuilds.org>2012-09-16 19:44:43 -0400
commit34e8580ab9c964ccdf4ef91b0daf970c55ad27bf (patch)
tree8e80fac5351ff81b78c0e1247d55d034dd71aefa /development/codeblocks/ftbfs-gcc-4.7.diff
parente9e13e288db26e827b73635a57a4500f36d30c88 (diff)
downloadslackbuilds-34e8580ab9c964ccdf4ef91b0daf970c55ad27bf.tar.gz
development/codeblocks: Added a patch for gcc-4.7.x.
Fixed underlinking. Moved plugins path to /usr/lib{,64}, noted in README Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'development/codeblocks/ftbfs-gcc-4.7.diff')
-rw-r--r--development/codeblocks/ftbfs-gcc-4.7.diff34
1 files changed, 34 insertions, 0 deletions
diff --git a/development/codeblocks/ftbfs-gcc-4.7.diff b/development/codeblocks/ftbfs-gcc-4.7.diff
new file mode 100644
index 0000000000..e6a4b99ce0
--- /dev/null
+++ b/development/codeblocks/ftbfs-gcc-4.7.diff
@@ -0,0 +1,34 @@
+Index: codeblocks-10.05/src/plugins/contrib/help_plugin/defs.h
+===================================================================
+--- codeblocks-10.05.orig/src/plugins/contrib/help_plugin/defs.h 2010-05-22 10:29:35.000000000 +0000
++++ codeblocks-10.05/src/plugins/contrib/help_plugin/defs.h 2012-05-29 05:18:08.674124530 +0000
+@@ -289,7 +289,7 @@
+
+ if (i.second == false && overwrite)
+ {
+- find(k)->second = t;
++ this->find(k)->second = t;
+ }
+
+ return i.first;
+@@ -297,7 +297,7 @@
+
+ int remove(const Key &k)
+ {
+- return erase(k);
++ return this->erase(k);
+ }
+ };
+
+Index: codeblocks-10.05/src/plugins/contrib/help_plugin/man2html.cpp
+===================================================================
+--- codeblocks-10.05.orig/src/plugins/contrib/help_plugin/man2html.cpp 2010-05-22 10:29:35.000000000 +0000
++++ codeblocks-10.05/src/plugins/contrib/help_plugin/man2html.cpp 2012-05-29 05:15:59.186120279 +0000
+@@ -150,6 +150,7 @@
+ # include <kdeversion.h>
+ # define BYTEARRAY(x) x
+ #endif
++#include <unistd.h>
+
+ #ifdef __MINGW32__
+ #include <io.h>