Add patch to fix build w/ GCC 4.3. Bug #211589.

Package-Manager: portage-2.2_pre7-r1/cvs/Linux 2.6.25-gentoo-r3 Intel(R) Core(TM)2 Duo CPU T9300 @ 2.50GHz

4 files changed, 26 insertions, 7 deletions

diff --git a/app-accessibility/dasher/ChangeLog b/app-accessibility/dasher/ChangeLog
index 5e2f6a700afc..286372ffdca7 100644
--- a/app-accessibility/dasher/ChangeLog
+++ b/app-accessibility/dasher/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/dasher
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.123 2008/04/09 22:03:44 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.124 2008/06/09 03:50:07 dirtyepic Exp $
+
+  09 Jun 2008; Ryan Hill <dirtyepic@gentoo.org>
+  +files/dasher-4.7.3-gcc-4.3.patch, dasher-4.7.3.ebuild:
+  Add patch to fix build w/ GCC 4.3. Bug #211589.
 
 *dasher-4.7.3 (09 Apr 2008)
 
diff --git a/app-accessibility/dasher/Manifest b/app-accessibility/dasher/Manifest
index 244be095ad13..bec6d4e26d8f 100644
--- a/app-accessibility/dasher/Manifest
+++ b/app-accessibility/dasher/Manifest
@@ -7,18 +7,19 @@ AUX dasher-4.5.2-gcc4-speech-fix.patch 2029 RMD160 ccd0efc75fc29c5b327f0d7ba9e9f
 AUX dasher-4.6.1-gnome.patch 1685 RMD160 8767be5fa679862e0a793062eff491d32704afe9 SHA1 cb0768f4d98ed6d2c2432042673d04506008a107 SHA256 6462d01b3ce27e89a2d44ba9e1461d21da6490485bddfce87a82e9a549165d84
 AUX dasher-4.6.1-lldiv.patch 367 RMD160 2ea3a9f822e27c8fbc68b7ffcd63cd0153501876 SHA1 cfc2193d0b98f9ede818241d5b1d53205a7dec7f SHA256 9d4d814d6e13190f3677f3cf08dbf8a729bbab80d48f0451c6de91572dde879c
 AUX dasher-4.7.0-as-needed.patch 690 RMD160 9a33ecd5ccce8edef2478288775dd9e9a908d57a SHA1 90f12dde417adc072c36b48686136b3081fec97e SHA256 15531b4cf1ed129ff094700e5818c2cb4c38ab9de9163518d1ce1282a0ae38b7
+AUX dasher-4.7.3-gcc-4.3.patch 351 RMD160 328821a4e4f07d08939c2b96072b34b69819fa2b SHA1 6fdfdb867635c8bdd326720cce84d6b28d4b5e01 SHA256 4d0d11253c2a1dc43aa0ca69b1dfe96ddcff8efca0859b54dcc0c88d0b4dace8
 DIST dasher-4.6.1.tar.bz2 6473483 RMD160 77a765ddc623895a2a121732848f00c5a82652d0 SHA1 6efeb3fdd160e203b60e5d2b9faca0d243a68ed3 SHA256 3f0ee0a37465f5262937e8d2746bf7710cc6505e704e80c318dc3e01806aebc8
 DIST dasher-4.7.0.tar.bz2 6483077 RMD160 64323feeee6cb99fc71eb7b0e31edfdb3806ec14 SHA1 3c98835986f1db541fe681f470c7345eaa66421a SHA256 3c4a8fb69f5710be1ad52c2260d5af49857ca10c4dd66322c70c79c3b701a745
 DIST dasher-4.7.3.tar.bz2 6773132 RMD160 cef9e14e53cd29244aa5e84de32cffe75cde2c76 SHA1 962cec3050e6a0b0f3670971734bd0595076b959 SHA256 44a2fdd1dde5c4fc499090f61aa3ee8939c9df40d5a009ecac8441f633b85e9f
 EBUILD dasher-4.6.1.ebuild 2219 RMD160 edf37e017b0ab0a13ff11c91f7fe09e511110896 SHA1 42b2a000b42cc190c07cb5fee025d88871324f82 SHA256 cbcee2b328c3adce8eeedc0ae0cb6972480b818dd1379c787295b737bb89d13e
 EBUILD dasher-4.7.0.ebuild 2322 RMD160 041134aad9d0be84a373cdbc6de5a9c3693df695 SHA1 8740a696eb55cd9f877dd3c7d37bb2e42fc61b08 SHA256 55108f4806c4282ee68c8b4e0fcf4231fbf0a8cea2a9f8e995a75a61eb7d7a83
-EBUILD dasher-4.7.3.ebuild 1968 RMD160 31bae3a9ee21f6709c84d9fb9757732617a8f334 SHA1 cc63b8e907f74b2e02dad1eeb64644c4e6de940a SHA256 a902cd046ab6773aa943dcb7151fffcdac1698f7df1d6c514de3cab85439905d
-MISC ChangeLog 15571 RMD160 b42f17c8cba3ae7e64742985d9ff1d1ac8216a5a SHA1 c56aed98751ad82cdb4b52d91b5d0e57af3bc879 SHA256 a0246fb83a2467cbbf88981cce1de97cddc7029549d87f17bc13ea2f22954192
+EBUILD dasher-4.7.3.ebuild 2087 RMD160 a4d93545bcce8dfbfef7ac0fdc933896b44569f2 SHA1 15806a1460fe7209f0fa3d25b25fe4ea72e318fe SHA256 96664018d01b671c5e7dd0e8784e243fbe9fe82e692980939ae8f85c86180a06
+MISC ChangeLog 15734 RMD160 e9b7268adc79811ddacdcfa21e0e94689179b6a8 SHA1 1c1efed7015f823f7a2f2f17a625fea43a6cf11e SHA256 beb5ed4874a8da3bf7f683fefd8baa5fd93fdc7f38a5288646030537fd89611a
 MISC metadata.xml 718 RMD160 80e52afb8285d78a52704f4f7c4b79275cddff35 SHA1 450e5ccc819b3c4497dc2685432d75939ac629c3 SHA256 265dfe7a088764ff6a165384ade6c9fe04a5dd068c1e7f31736fe4a2c1c10eca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkf9PUcACgkQ1fmVwcYIWAZRIgCbBFwtRoRK3m08qnJQ/LqjsEQi
-k0EAnicsot0v2Na3V5Ahas2tBaNg6m1w
-=2zwv
+iEYEARECAAYFAkhMqGUACgkQiqiDRvmkBmIKzQCgs/pOhjkPwt3sKmdhhXL3Ikz3
+7ugAnAlWUp081jeYQicjYw1gK6+ezqSE
+=pmAn
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/dasher/dasher-4.7.3.ebuild b/app-accessibility/dasher/dasher-4.7.3.ebuild
index 89eebc4c6c56..02149172b905 100644
--- a/app-accessibility/dasher/dasher-4.7.3.ebuild
+++ b/app-accessibility/dasher/dasher-4.7.3.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/app-accessibility/dasher/dasher-4.7.3.ebuild,v 1.1 2008/04/09 22:03:44 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-4.7.3.ebuild,v 1.2 2008/06/09 03:50:07 dirtyepic Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.8"
@@ -71,6 +71,10 @@ src_unpack() {
 	# Fix build with --as-needed (upstream bug #525028)
 	epatch "${FILESDIR}/${PN}-4.7.0-as-needed.patch"
 
+	# https://bugs.gentoo.org/211589
+	# https://bugzilla.gnome.org/522121
+	epatch "${FILESDIR}"/${P}-gcc-4.3.patch
+
 	eautomake
 	intltoolize --force || die "intltoolize failed"
 }
diff --git a/app-accessibility/dasher/files/dasher-4.7.3-gcc-4.3.patch b/app-accessibility/dasher/files/dasher-4.7.3-gcc-4.3.patch
new file mode 100644
index 000000000000..32a49491b936
--- /dev/null
+++ b/app-accessibility/dasher/files/dasher-4.7.3-gcc-4.3.patch
@@ -0,0 +1,10 @@
+--- dasher-4.7.3/Src/Gtk2/dasher_action_speech.cpp.old	2008-06-06 20:54:34.098275404 +0200
++++ dasher-4.7.3/Src/Gtk2/dasher_action_speech.cpp	2008-06-06 20:55:38.331005219 +0200
+@@ -8,6 +8,7 @@
+ #include <glib/gi18n.h>
+ #include <gnome-speech/gnome-speech.h>
+ #include <libbonobo.h>
++#include <cstring>
+ //#include <libintl.h>
+ //#include <string.h>
+