Add patch to fix build with GCC 4.5 (bug #328539).

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 44 insertions, 9 deletions

diff --git a/dev-cpp/gstreamermm/ChangeLog b/dev-cpp/gstreamermm/ChangeLog
index b78546b12ada..f3de0b90bfcf 100644
--- a/dev-cpp/gstreamermm/ChangeLog
+++ b/dev-cpp/gstreamermm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-cpp/gstreamermm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gstreamermm/ChangeLog,v 1.8 2010/08/01 10:59:29 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gstreamermm/ChangeLog,v 1.9 2010/08/06 14:31:45 flameeyes Exp $
+
+  06 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  gstreamermm-0.10.7.3.ebuild, +files/gstreamermm-0.10.7.3+gcc-4.5.patch:
+  Add patch to fix build with GCC 4.5 (bug #328539).
 
   01 Aug 2010; Christian Faulhammer <fauli@gentoo.org>
   gstreamermm-0.10.7.3.ebuild:
diff --git a/dev-cpp/gstreamermm/Manifest b/dev-cpp/gstreamermm/Manifest
index aaa0f608d634..cc4e022b9416 100644
--- a/dev-cpp/gstreamermm/Manifest
+++ b/dev-cpp/gstreamermm/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA1
 
 AUX gstreamermm-0.10.7-gcc45.patch 7280 RMD160 e7df9c82328a3e809545f530405de9ff0ea585bd SHA1 f28423bd101238ccae7d3a06116596a4aec5a2ee SHA256 50611c392a4e9865643aff787e14c5321673a3ab7b33708e229a0f5d84c7a0cb
+AUX gstreamermm-0.10.7.3+gcc-4.5.patch 1147 RMD160 098ec247a29461b2a990700ae39a04e8f92aca84 SHA1 7d48efe66797815a3412e5617e6cba7f74c76511 SHA256 1d183daa5eea95f5b5449b312b83b5749c1db505961cbfb8d6b564c4ef8bec5e
 DIST gstreamermm-0.10.6.tar.bz2 5258082 RMD160 46f6ec862f7beeef5703c475e966d151e8c2cf27 SHA1 51d5d4a919f7d2a8676c4c73d678c1eb83dc8601 SHA256 f14169226973e47ed51f7f555f9fff5877413c3f0af5495735ac03ce4f51fc09
 DIST gstreamermm-0.10.7.3.tar.bz2 5429261 RMD160 2764afdf477b45a081e2e55a5430ec48a8183fe3 SHA1 d2924cf0440cced2c947fce4fcdc97776cc7ea4a SHA256 c185e8a3a2e0d5584ec96333c1d10b1dea975194825d3f09489f21b22dbf2417
 DIST gstreamermm-0.10.7.tar.bz2 5390860 RMD160 af7b1163eba8c5baa4faf28cec93821fe75927e5 SHA1 a3a0ad4660fecd1f953e6aa794f32e338493dfac SHA256 9ca91368c7f57b8b430af01977e42de9c3f7d1e38be92ca015724e19bc882274
 EBUILD gstreamermm-0.10.6.ebuild 1041 RMD160 97536f1e7e5d5bc9d82dac352ac1f4bd67390053 SHA1 4ec29184f957d3b332a359b77c40bace8e5fc1ac SHA256 648aea219c2a9f0d2898e55d29a07f86d26f08e7437ccd38911d184aba7e6260
-EBUILD gstreamermm-0.10.7.3.ebuild 1112 RMD160 400b20ff132d618f4d18d903897a0eb6df2b7c1e SHA1 52f2b27a06ca4793cb2d3e46c75ff48eee1b5470 SHA256 69d45a8a53ef7df73c47597586744bd2a540a030e9fd8e34929eb10104e83fdb
+EBUILD gstreamermm-0.10.7.3.ebuild 1183 RMD160 be4feedff76c5f8f55937a8256ac06c33ab72e75 SHA1 40a8e15496b4b955c128805742049a5230e27394 SHA256 08a39039ce9460a422104ae773c4c5f8c91b30e40a420b598c662fd15f3e89f2
 EBUILD gstreamermm-0.10.7.ebuild 1163 RMD160 e7702a1f77bd276852b66ea66216d8a92ec9e3f5 SHA1 543e25190b7a120d983a0266c199248340905e7e SHA256 8eb115c0764ec8d460460a0fbaef6c9b237bdd304abbaf8529257bcd462b38a3
-MISC ChangeLog 1539 RMD160 7df877c709750c04bcea2a8452ce0bdc75e4a9e7 SHA1 7cb65b601a7510a52b92ef06a83f65f573c170b8 SHA256 8eab77be83120bccecac29b2e281de04e97539ae88b50834be79ed426d147e6b
+MISC ChangeLog 1727 RMD160 e7bdb227de648c0eff7b4ace0ca48e3ad36e3e54 SHA1 ea0081b4e87830063c7dac594b58d470f3c954b3 SHA256 055a2936ffaf9e307688f4cb8475a9a52fc05d7a4260272dd63c0a37877836ca
 MISC metadata.xml 336 RMD160 96ef7e8b63752abbb94b4a6b2cc708f62ed4383f SHA1 b8a5fc488b314dbf996b3784e05d273585364782 SHA256 564e0692ab45e0c1e814a421e2a8cb9d73ef724bc82b484900a08f50d90424ea
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxVVDAACgkQNQqtfCuFneNlkgCeJekrhjy3n9vMidIcxf0PS5k2
-RQoAnRftFHpmjgHnXPGl50XfSxEJyb7T
-=pHxR
+iEYEARECAAYFAkxcHP0ACgkQAiZjviIA2XidKQCg8osV0gtRP5azYyup8iGvWgfw
+AwIAnjO4+wOqJPAX3bIG+8SltCyhpVmc
+=/8T+
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/gstreamermm/files/gstreamermm-0.10.7.3+gcc-4.5.patch b/dev-cpp/gstreamermm/files/gstreamermm-0.10.7.3+gcc-4.5.patch
new file mode 100644
index 000000000000..e6a25918162a
--- /dev/null
+++ b/dev-cpp/gstreamermm/files/gstreamermm-0.10.7.3+gcc-4.5.patch
@@ -0,0 +1,26 @@
+Index: gstreamermm-0.10.7.3/gstreamer/gstreamermm/mixer.cc
+===================================================================
+--- gstreamermm-0.10.7.3.orig/gstreamer/gstreamermm/mixer.cc
++++ gstreamermm-0.10.7.3/gstreamer/gstreamermm/mixer.cc
+@@ -207,7 +207,7 @@ Glib::ArrayHandle<int> Mixer::get_volume
+   gst_mixer_get_volume(const_cast<GstMixer*>(gobj()),
+     const_cast<GstMixerTrack*>(Glib::unwrap(track)), volumes);
+ 
+-  return Glib::ArrayHandle<int>::ArrayHandle(volumes, num_channels,
++  return Glib::ArrayHandle<int>(volumes, num_channels,
+     Glib::OWNERSHIP_DEEP);
+ }
+ 
+Index: gstreamermm-0.10.7.3/gstreamer/src/mixer.ccg
+===================================================================
+--- gstreamermm-0.10.7.3.orig/gstreamer/src/mixer.ccg
++++ gstreamermm-0.10.7.3/gstreamer/src/mixer.ccg
+@@ -201,7 +201,7 @@ Glib::ArrayHandle<int> Mixer::get_volume
+   gst_mixer_get_volume(const_cast<GstMixer*>(gobj()),
+     const_cast<GstMixerTrack*>(Glib::unwrap(track)), volumes);
+ 
+-  return Glib::ArrayHandle<int>::ArrayHandle(volumes, num_channels,
++  return Glib::ArrayHandle<int>(volumes, num_channels,
+     Glib::OWNERSHIP_DEEP);
+ }
+ 
diff --git a/dev-cpp/gstreamermm/gstreamermm-0.10.7.3.ebuild b/dev-cpp/gstreamermm/gstreamermm-0.10.7.3.ebuild
index ba5d830c98b7..a187af9bfab6 100644
--- a/dev-cpp/gstreamermm/gstreamermm-0.10.7.3.ebuild
+++ b/dev-cpp/gstreamermm/gstreamermm-0.10.7.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gstreamermm/gstreamermm-0.10.7.3.ebuild,v 1.3 2010/08/01 10:59:29 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gstreamermm/gstreamermm-0.10.7.3.ebuild,v 1.4 2010/08/06 14:31:45 flameeyes Exp $
 
 EAPI="2"
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="C++ interface for GStreamer"
 HOMEPAGE="http://gstreamer.freedesktop.org/bindings/cplusplus.html"
@@ -26,6 +26,10 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}+gcc-4.5.patch"
+}
+
 src_test() {
 	# explicitly allow parallel make of tests: they are not built in
 	# src_compile() and indeed we'd slow down tremendously to run this