Patch to fix compilation with gcc-4.3 by Peter Alfredsen <peter DOT alfredsen AT gmail DOT com>; bug #217667

Package-Manager: portage-2.1.5_rc7

4 files changed, 39 insertions, 4 deletions

diff --git a/dev-libs/gmetadom/ChangeLog b/dev-libs/gmetadom/ChangeLog
index 0d45358ad8bb..85cd025d19bd 100644
--- a/dev-libs/gmetadom/ChangeLog
+++ b/dev-libs/gmetadom/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/gmetadom
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/ChangeLog,v 1.29 2008/01/18 00:32:35 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/ChangeLog,v 1.30 2008/05/10 03:36:34 halcy0n Exp $
+
+  10 May 2008; Mark Loeser <halcy0n@gentoo.org>
+  +files/gmetadom-0.2.6-gcc43.patch, gmetadom-0.2.6.ebuild:
+  Patch to fix compilation with gcc-4.3 by Peter Alfredsen <peter DOT
+  alfredsen AT gmail DOT com>; bug #217667
 
   18 Jan 2008; MATSUU Takuto <matsuu@gentoo.org>
   files/gmetadom-0.2.6-gentoo.patch:
diff --git a/dev-libs/gmetadom/Manifest b/dev-libs/gmetadom/Manifest
index e6f9b0c64d92..961972d1143c 100644
--- a/dev-libs/gmetadom/Manifest
+++ b/dev-libs/gmetadom/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gmetadom-0.2.3-gcc41.patch 1138 RMD160 be5e80973a43729ba5b4bc799c8e5959025b2410 SHA1 af10a636d7a486552218edc5df04eb763d2b55e2 SHA256 59d305e43488c38345d31759c6a2ce8234885a71a2f327706ddbb3efb53ee59d
 AUX gmetadom-0.2.3-gentoo.patch 1743 RMD160 d4b9e59ec55bd50fa1a545af1a34784ce039a2a1 SHA1 c38068ea1f5fa42f2fa3f167f790f897b3354d1b SHA256 85043de46aa2efae736bbe5390b8766be603fba9fa17445766777ca4f1c860dd
+AUX gmetadom-0.2.6-gcc43.patch 700 RMD160 4251d4a51fa25d0595eb28c70fe701233b79f230 SHA1 5446774e802407ddc5e56bb0d3889cdbf1090443 SHA256 71d06b41cafcbca318d48d39c97e9f25873461828c7702541f721fd478dbbacf
 AUX gmetadom-0.2.6-gentoo.patch 5909 RMD160 8cce974b148c6c2ec62e92576494b8e301acaeea SHA1 9e7f29b2095af857da30332600ba094b8fce9ed7 SHA256 ebfc7233b5b89bbd63078b3b82e41648a2c3a90c13280874cdff34a72e0b0036
 DIST gmetadom-0.2.3.tar.gz 479336 RMD160 0200c0bdc211ebe85590cd5a5fd9b6cc5935d3ee SHA1 5c6cd54171dcf02479285a0fb6916c850fb522db SHA256 62a1005c4cc47521a6e7ca9615d7de482114bea8c80c165a7de5c813e991a8a9
 DIST gmetadom-0.2.6.tar.gz 509165 RMD160 db56a122853b6b2881d54cb5396c70ea94760e18 SHA1 04d162583193c5b8e5e1ea7a224c24e1a50f6b67 SHA256 2f1e286dfceb7877f90c72de7e5e17a87d0e3f8121feff794a6f637bc1a6756a
 EBUILD gmetadom-0.2.3.ebuild 1347 RMD160 c09809fb042a086359d1e384ed6d9a587866c9de SHA1 14ca12e6fdffaa7ed83f73dab25cc0ea6c77af86 SHA256 1b8d3fd19f774acbf1971aaa90ef5987475af63352b83e035169b9d7a241f568
-EBUILD gmetadom-0.2.6.ebuild 1215 RMD160 fe245eaa0971e467ad9519d120b115177fcab6c2 SHA1 6896395e9f1a1f67a59b8885ecc669c043f12df2 SHA256 d6f552b6df8d5491fd0a9a7cd0cfe47d507e0d0df1474a6c6f9cfe3bac638d2e
-MISC ChangeLog 4069 RMD160 4f1ad160993bd4e04675c6ca22a25d5948f1a582 SHA1 e9ad2cb41b42db1bd3761ebf4e8a2dc88ae57331 SHA256 1f2f09f78c5f177476b09f93e1c55ccefb7297311f2ef1727484330f4e4a5a13
+EBUILD gmetadom-0.2.6.ebuild 1255 RMD160 c70b89efea3b6fd0cb3a26bd62cf64487a3d275e SHA1 8c549ccc02f1afb96f3b1f0a9c4ed2fbe41cf08a SHA256 a8fb1b4f024b3575d41ebd8afc1640e337b63b9719b9af40001b1b6010c1c347
+MISC ChangeLog 4292 RMD160 319600f7435f0ab1167e0c38d96f636897921841 SHA1 01afb0cf6a8a05edbd0af67805bfc147785936bb SHA256 aa03e40ad0f7de4f391ad7420ea9520e313abb9317cae4ff742275d7707e4109
 MISC metadata.xml 222 RMD160 23efe87c16ebc9fbeb91e894ab372cc3bb66bc49 SHA1 a5d1e2317ae207bbd664aebe986687948fdd984a SHA256 38ef3457fd14e6872985f0e100fde79d0b8a9dbc4fc39ceef780c8c5abc5f337
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkglGIEACgkQCRZPokWLroR7YQCfRmIHnGtY0UdZKWXcCLasKWB4
+W2oAnjN+xAyKlMAeP8wE6rzF6rU2axhp
+=ZgKi
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/gmetadom/files/gmetadom-0.2.6-gcc43.patch b/dev-libs/gmetadom/files/gmetadom-0.2.6-gcc43.patch
new file mode 100644
index 000000000000..c16c3d6baba5
--- /dev/null
+++ b/dev-libs/gmetadom/files/gmetadom-0.2.6-gcc43.patch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_gcc43-fix.dpatch by Michael Bienia <geser@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad gmetadom-0.2.5-3ubuntu1~/src/gdome_cpp_smart/include/GdomeSmartDOMTraits.hh gmetadom-0.2.5-3ubuntu1/src/gdome_cpp_smart/include/GdomeSmartDOMTraits.hh
+--- gmetadom-0.2.5-3ubuntu1~/src/gdome_cpp_smart/include/GdomeSmartDOMTraits.hh	2007-11-21 18:27:08.000000000 +0100
++++ gmetadom-0.2.5-3ubuntu1/src/gdome_cpp_smart/include/GdomeSmartDOMTraits.hh	2007-11-28 12:16:00.000000000 +0100
+@@ -26,6 +26,7 @@
+  */
+ 
+ #include <string>
++#include <cstring>
+ 
+ #include "GdomeSmartDOMChar.hh"
+ 
diff --git a/dev-libs/gmetadom/gmetadom-0.2.6.ebuild b/dev-libs/gmetadom/gmetadom-0.2.6.ebuild
index 1911f01e5c75..3b95acb9055b 100644
--- a/dev-libs/gmetadom/gmetadom-0.2.6.ebuild
+++ b/dev-libs/gmetadom/gmetadom-0.2.6.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-libs/gmetadom/gmetadom-0.2.6.ebuild,v 1.1 2008/01/17 15:08:30 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/gmetadom-0.2.6.ebuild,v 1.2 2008/05/10 03:36:34 halcy0n Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
@@ -31,6 +31,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 	eautoreconf
 }