Fix building with gcc-4.3 for bug #256218. Thanks to Nick S. Novikov for

the patch.
Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 34 insertions, 6 deletions

diff --git a/dev-util/codeblocks/ChangeLog b/dev-util/codeblocks/ChangeLog
index 42c54500ec9b..38553f38a8f4 100644
--- a/dev-util/codeblocks/ChangeLog
+++ b/dev-util/codeblocks/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/codeblocks
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/codeblocks/ChangeLog,v 1.13 2008/06/01 00:12:46 jurek Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/codeblocks/ChangeLog,v 1.14 2009/02/12 04:42:37 dirtyepic Exp $
+
+  12 Feb 2009; Ryan Hill <dirtyepic@gentoo.org>
+  +files/codeblocks-8.02-gcc43.patch, codeblocks-8.02.ebuild:
+  Fix building with gcc-4.3 for bug #256218. Thanks to Nick S. Novikov for
+  the patch.
 
 *codeblocks-8.02 (01 Jun 2008)
 
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 73cb646b9f7f..99c1d23df2f8 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 8.02-version.patch 345 RMD160 4e871fb354dc3d68cac84c7791facbc1cd0c8ea9 SHA1 e89bfc45b1d831dcbc4fc5f18d2a8219daf66c55 SHA256 cd7d28a0ec35f8013103feacdc29b5a82f36f7af24793e764eb26fa998d45c8d
+AUX codeblocks-8.02-gcc43.patch 472 RMD160 558a7c577f78159fa82fe86b1af6502c4f62c2ac SHA1 7b5b5af288fc165f9b67aadf9d60f27315fb2b9f SHA256 7326f738027eebdb1a2037a4e5536f52c612e9ab6f82a4d738e295c3239ad293
 DIST codeblocks-1.0_pre20070618.tar.bz2 8564270 RMD160 643deba773f3a873c19c3b89fbb4866b106ff457 SHA1 4ec7c2cd364b3fe0cb2172bd48e6c2569479e3b5 SHA256 19d54866991ccbfe7a4b9921f85d6289b1c948931040bf2462b92ddf8e2d8db9
 DIST codeblocks-1.0_pre20071215.tar.bz2 11131352 RMD160 e8a43ff768512b79072c53d276cbe37badfe07bb SHA1 6760ad7b8688226f455a2bfb40d7e368273df5a2 SHA256 66f42142675ca80f5e50717aa9cb46ba2dc5bd8a1d4e8d1259514a64b9a67e9e
 DIST codeblocks-8.02-src.tar.bz2 6839711 RMD160 88451f42ac4de2b98d57416a3cea1a0647344b30 SHA1 078932cfd4fee2066ec931cb6dfa8079235c1237 SHA256 5a6e9184b5edc991b59dadbf87bf4584ed6c30e7097c572149cc1b2085b3080f
 EBUILD codeblocks-1.0_pre20070618.ebuild 1406 RMD160 91154cbd3ad7e54405cfa84dafb9734f3ace9624 SHA1 4a92005750f94f73a372c2669bc1fe2ddcae51d8 SHA256 790bd4cc353a7789b4c6fe5e08185b3a3fc8756d30c95dbcfb8dee79c25ff482
 EBUILD codeblocks-1.0_pre20071215.ebuild 1330 RMD160 07338a657af0c90ae040ad7008d3817449ec7d45 SHA1 0b835234ac2e3e5b373f82b16345f4f7eaf6f90e SHA256 ae1739a2b81fa5c8d7b71ec81245e39072c7cb771e86787d5b04b6ea19e3ce63
-EBUILD codeblocks-8.02.ebuild 2226 RMD160 b1c787960b356a04036b6dc1565e842c9c3069b5 SHA1 6d43053295f6ad5e7ee0076e3a1f81c3e0496cba SHA256 000f395ff4ff4245e8b2397139d2fbe75bb8a6d9d6148554af12e663e02cb7fb
-MISC ChangeLog 2186 RMD160 8371c1fd38dab9709d068745ab1f02e91b03ab28 SHA1 907b90395c38cc1ca350ef506102095414514c2e SHA256 2eed70d0ac36bc7f1bc8e15f1923892e3ef5905dbd72c343266764f1b9066271
+EBUILD codeblocks-8.02.ebuild 2265 RMD160 67d25e3d672bbd88c815559f54ca3af8941e443e SHA1 594312adf2eef2205dccb4eaee2973db3a99a65c SHA256 4855c536a2c7371e1a1bd1c99e14872fae7a0762a4ae694df2c771d02c4473ef
+MISC ChangeLog 2389 RMD160 90df639352334ee9e4b1e13f051b0bd72c7fc2ef SHA1 471c38bc2cebb4fddad7d6671756996382c3a09a SHA256 f0886663fc938915f4bacc04d05996af4eef7f47cc8f3ffe6a5ac438171aa6b9
 MISC metadata.xml 347 RMD160 71d5ad7d9a84e8176377b9747a37d89c59146894 SHA1 bbe2552bedb698bda0b892d124a11341e83ee9c8 SHA256 aa3e08078960eef1da419865574bd70e2aee2f9e6550eb65a1795a2e78cf7d2f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmTqQgACgkQiqiDRvmkBmLirwCgggldio6WFbeoCTFM7Ul6f5zR
+K/QAn1G6rE+mkZoyeT6ZsJmwproDsfLS
+=ZgBk
+-----END PGP SIGNATURE-----
diff --git a/dev-util/codeblocks/codeblocks-8.02.ebuild b/dev-util/codeblocks/codeblocks-8.02.ebuild
index 3993bfaa0737..b87398d42269 100644
--- a/dev-util/codeblocks/codeblocks-8.02.ebuild
+++ b/dev-util/codeblocks/codeblocks-8.02.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/codeblocks/codeblocks-8.02.ebuild,v 1.2 2008/06/01 03:34:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/codeblocks/codeblocks-8.02.ebuild,v 1.3 2009/02/12 04:42:37 dirtyepic Exp $
 
 inherit autotools wxwidgets flag-o-matic eutils
 
@@ -35,6 +35,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	epatch "${FILESDIR}/${PV}-version.patch"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 	#epatch "${FILESDIR}/${PV}-install-plugins.patch"
 	cd "${S}"
 	find src/plugins -name Makefile.am -exec \
diff --git a/dev-util/codeblocks/files/codeblocks-8.02-gcc43.patch b/dev-util/codeblocks/files/codeblocks-8.02-gcc43.patch
new file mode 100644
index 000000000000..dd3bbadf4dc5
--- /dev/null
+++ b/dev-util/codeblocks/files/codeblocks-8.02-gcc43.patch
@@ -0,0 +1,11 @@
+diff -Naurp codeblocks-8.02-orig/src/plugins/contrib/help_plugin/defs.h codeblocks-8.02/src/plugins/contrib/help_plugin/defs.h
+--- codeblocks-8.02-orig/src/plugins/contrib/help_plugin/defs.h	2007-09-12 07:29:01.000000000 -0600
++++ codeblocks-8.02/src/plugins/contrib/help_plugin/defs.h	2009-02-11 22:32:02.000000000 -0600
+@@ -13,6 +13,7 @@
+ #include <ctime>
+ #include <cctype>
+ #include <cstdio>
++#include <cstdlib>
+ #include <string.h>
+ 
+ #define kDebug(x) DummyOutput()