dev-cpp/gtkmm: patch for gcc 4.3 build error, fixes bug #218403

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r6 x86_64

4 files changed, 28 insertions, 4 deletions

diff --git a/dev-cpp/gtkmm/ChangeLog b/dev-cpp/gtkmm/ChangeLog
index 09a47edc5eed..f3481c88f818 100644
--- a/dev-cpp/gtkmm/ChangeLog
+++ b/dev-cpp/gtkmm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-cpp/gtkmm
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.143 2008/07/10 15:16:28 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.144 2008/07/11 09:00:23 remi Exp $
+
+  11 Jul 2008; Rémi Cardona <remi@gentoo.org>
+  +files/gtkmm-1.2.9-gcc4.3.patch, gtkmm-1.2.9-r2.ebuild:
+  patch for gcc 4.3 build error, fixes bug #218403
 
   10 Jul 2008; Rémi Cardona <remi@gentoo.org> gtkmm-1.2.9-r2.ebuild,
   gtkmm-2.2.12.ebuild, gtkmm-2.10.10.ebuild, gtkmm-2.12.1.ebuild,
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index ff9b11cbea10..95ab0c24c9b5 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,5 +1,6 @@
 AUX gtkmm-1.2.9-gcc3.1-gentoo.patch 518 RMD160 2c516c51c0b97d26638150a9741f9f196a0b037e SHA1 d6330370dac2f9a6cf08db9be3d5c6ee36c28b5e SHA256 be2e4bb78de8d55824a3564427e6078bb65a525ed05164128b4857dffc487705
 AUX gtkmm-1.2.9-gcc3.4-gentoo.patch 2197 RMD160 a3ababae65054054ff790dadf825fc7dd263926a SHA1 fe9376c71de04a23fc0413befee521d6cae8cc38 SHA256 918f1f1774901699a4c64749e4dc2965895b018c47c707308b65033db9586ceb
+AUX gtkmm-1.2.9-gcc4.3.patch 538 RMD160 1355108436b34d25a0b66c043354f8079953a567 SHA1 aea11193c3da443853091261b3af3c1df016fd43 SHA256 26a75270f3e70b975effc966721be5fcc1000519ad5dca395b7dbb934a0be468
 AUX gtkmm-1.2.9-gcc4.patch 1382 RMD160 681cb464e36f0ad7d89029fd384bb7496c48eeb3 SHA1 c0c4c2370d5552394926a03ba6b1ede093a8f4fe SHA256 45a907630a651e8bd1355b837253a75ecd6e1e8f9e80d8e6668669a85c2d5a41
 AUX gtkmm-2.2.12-gcc41.patch 3418 RMD160 7893ea3ea8aebfcc8b8c296d1ccb407658dc6d56 SHA1 e2fb943fa1277da0735bbd08acbd6602aca0e6a4 SHA256 28b21d7ba79a19cea0df01546b58dcbe5a0577b2d9c7c07bde8010cb2b1e7158
 DIST gtkmm-1.2.9.tar.gz 716656 RMD160 d5248981343fea5f3c0b7e59b190f7fe9273021a SHA1 42c87bba55fa72452bf3fcc18b169478a825fbf6 SHA256 fb8e59cee2d9825e4060b72937461bde488f673362bab258f6fe78e9db93925c
@@ -10,7 +11,7 @@ DIST gtkmm-2.12.4.tar.bz2 13938491 RMD160 66ce86018c9ffe4205b02e2263483eed28ea25
 DIST gtkmm-2.12.5.tar.bz2 15198017 RMD160 8a8e49ee97878034874fbac7ae4bf369beeca8dc SHA1 49b7f20980e643f265a4cf260a10059794c2e00a SHA256 b309ff2ad596d6f9a2dd90a807d3c3bdad82b90b174f08ebc1a90b2e55fe45ad
 DIST gtkmm-2.12.7.tar.bz2 15198578 RMD160 0363b0c03e56e965d1d25f1bbed80476af809f3c SHA1 ee7211c99e860c4b22091e81e6d1676d12fbb23c SHA256 4e58c9ad827759a2375b3c0d39952b5b2983111ab16ee329b10a34792fb1d9eb
 DIST gtkmm-2.2.12.tar.bz2 3846586 RMD160 009c6af3c638f2e55eaf82e5d9cdf468ca0a62ad SHA1 ea6f130f68b837bd042e8e84ab6708467dd8ba08 SHA256 8aa93a899f7aa55617041107dd3290ccbd3b2b81348a745a66557b159617bb57
-EBUILD gtkmm-1.2.9-r2.ebuild 1323 RMD160 e15100b04e86a34840cf7f50042eff1e9f9a050b SHA1 82954f6c417bb4581c980fbc891f038cb3ce624e SHA256 a2ab4e6a2e41ea3ef162d747634303d725aee6eb6fc21cb1b62a647b75bfec62
+EBUILD gtkmm-1.2.9-r2.ebuild 1381 RMD160 b60bac2742371d7933e62a0656aa2b1d97113ad9 SHA1 fa39331e5d6b2ea0c8b5e2d2421b1e466470a613 SHA256 73ae87e764c6e556d8594e0e17531f8c54bf8c796f8af4ab4e9c3f2a1db87fea
 EBUILD gtkmm-2.10.10.ebuild 862 RMD160 5ff98a2a00eeed8540f26553f0de1bf4da7ad33a SHA1 5fce09846dac873fd712bfb667faecab1e394495 SHA256 f15d1ae83a1bfc3b0b63f28d2c682071d39d41163c76c6ba156cbd9b9b996ac4
 EBUILD gtkmm-2.12.1.ebuild 859 RMD160 4373907644a5587499748b02c4f37afb62f7c3a3 SHA1 b46c1c3f4086193cf6bd3a739d9b1b61c366ed7c SHA256 f6e5dff76beca94f7cd3242a051b2d39b8e54f3f44b6b8d31355f7a2451378bf
 EBUILD gtkmm-2.12.3.ebuild 848 RMD160 09fdae354bb82714265fdfb48df83ab0779f17ca SHA1 0451c5f3a1ff547873077a22319b700225b184f4 SHA256 bb1b84cae7b83a79f6393dc1eb170a68220cc4eaa17705407a9902454bd3df71
@@ -18,5 +19,5 @@ EBUILD gtkmm-2.12.4.ebuild 848 RMD160 c477d73131e161082db26c48a620fdf91bb93fd9 S
 EBUILD gtkmm-2.12.5.ebuild 848 RMD160 a5015c7b6082c07ff33c165daf210218d402329e SHA1 f107b07e20c289f8183c2b8f3d7aa590a6ffd693 SHA256 c79d56df1656211207030de441af524064425175fe682cc03a978054629dfaef
 EBUILD gtkmm-2.12.7.ebuild 848 RMD160 c1c16d9631907117f9ba1c5fa58de89c694d8647 SHA1 b0faefdf53564e625257a19523760d1134a8978f SHA256 db4609c64c9d50c12ef4cfedc2416693af64a71e55caf7d331364aa8a01d8e6d
 EBUILD gtkmm-2.2.12.ebuild 696 RMD160 0e82e332757fe5ee3351c95067ebcbfc5d7c0814 SHA1 33e63d772ec1ba56b5a17b36b60bca1b01748c0a SHA256 3b5c0822d282ea2ed69fd74512e056577317dcb9c66798d0f22c92a5ebebfee7
-MISC ChangeLog 19798 RMD160 c70477a0294db334420cde37d48ef9a7e4677234 SHA1 2fae02daf2a127e49806ca99887051183ed33da1 SHA256 e2f62efb51c2f37dab7e69003648595b279b5ab7fa2423df265ea7079f6062bc
+MISC ChangeLog 19955 RMD160 940b50c33771f5008c5a765086dcad8de09a67b3 SHA1 83209ae28c31364ed937aad31c34d338aa27cd29 SHA256 d57da3492acd60f6231c6eac80e3977d220546cfab70eb5d92aaf5eb6b5853e0
 MISC metadata.xml 161 RMD160 1988530f97a742d78d3f3e99d15625f8a674260a SHA1 b034f3d668b50c57826ead5cfd17fcd2b68d19d6 SHA256 00ba82c241ad7007fe861877db3ae5aeaa967e05f0a6478e6ba9eb60ba31a3b6
diff --git a/dev-cpp/gtkmm/files/gtkmm-1.2.9-gcc4.3.patch b/dev-cpp/gtkmm/files/gtkmm-1.2.9-gcc4.3.patch
new file mode 100644
index 000000000000..4b9777bfb329
--- /dev/null
+++ b/dev-cpp/gtkmm/files/gtkmm-1.2.9-gcc4.3.patch
@@ -0,0 +1,17 @@
+--- src/gtkmmproc/gtkmmproc.cc~ 2007-04-01 20:46:07.000000000 +0000
++++ src/gtkmmproc/gtkmmproc.cc  2007-04-01 20:46:11.000000000 +0000
+@@ -1,5 +1,6 @@
+ // $Id: gtkmm-1.2.9-gcc4.3.patch,v 1.1 2008/07/11 09:00:23 remi Exp $
+ 
++#include <cstdlib>
+ #include <stdio.h>
+ #include <iostream>
+ #include <string>
+--- src/gtkmmproc/fixate.cc~    2007-04-01 20:46:21.000000000 +0000
++++ src/gtkmmproc/fixate.cc     2007-04-01 20:46:26.000000000 +0000
+@@ -1,3 +1,4 @@
++#include <cstdlib>
+ #include <stdio.h>
+ #include <string>
+ #include <string.h>
+
diff --git a/dev-cpp/gtkmm/gtkmm-1.2.9-r2.ebuild b/dev-cpp/gtkmm/gtkmm-1.2.9-r2.ebuild
index 42c63b76e310..ae802c1c89d6 100644
--- a/dev-cpp/gtkmm/gtkmm-1.2.9-r2.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-1.2.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-1.2.9-r2.ebuild,v 1.15 2008/07/10 15:16:28 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-1.2.9-r2.ebuild,v 1.16 2008/07/11 09:00:23 remi Exp $
 
 inherit eutils
 
@@ -20,6 +20,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
 
 	# this patch applies only to gtkmm-1.2.9. gtkmm has been fixed
 	# in CVS. It fixes a build problem with gcc3.1.
@@ -27,6 +28,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/gtkmm-1.2.9-gcc3.1-gentoo.patch
 	epatch "${FILESDIR}"/gtkmm-1.2.9-gcc3.4-gentoo.patch
 	epatch "${FILESDIR}"/gtkmm-1.2.9-gcc4.patch
+	epatch "${FILESDIR}/gtkmm-1.2.9-gcc4.3.patch"
 }
 
 src_compile() {