fix building with gcc 4.3, thanks to Ryan Hill <dirtyepic@gentoo.org>, bug #199579

Package-Manager: portage-2.1.3.19

4 files changed, 36 insertions, 13 deletions

diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index bdcaab2608e5..6380658d67df 100644
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/flac
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.133 2007/11/18 19:22:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.134 2007/11/18 19:31:35 aballier Exp $
+
+  18 Nov 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/flac-1.2.1-gcc-4.3-includes.patch, flac-1.2.1-r2.ebuild:
+  fix building with gcc 4.3, thanks to Ryan Hill <dirtyepic@gentoo.org>, bug
+  #199579
 
 *flac-1.2.1-r2 (18 Nov 2007)
 
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index 59b0174d8172..114b7ccd5cda 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -13,6 +13,10 @@ AUX flac-1.2.1-cflags.patch 435 RMD160 49cb14f8c107fada76252a67e6ef693dcc0f82b1
 MD5 1051a5f9f97cb98bfc38092893093d19 files/flac-1.2.1-cflags.patch 435
 RMD160 49cb14f8c107fada76252a67e6ef693dcc0f82b1 files/flac-1.2.1-cflags.patch 435
 SHA256 cc9397825c966839edcd4a30406ff3590a21c825d4e1cb043bd35145a608bc21 files/flac-1.2.1-cflags.patch 435
+AUX flac-1.2.1-gcc-4.3-includes.patch 423 RMD160 d7502f5185e8b9bcefbadfa30014b91cc0446267 SHA1 7e9f8c2ef4d9daf5ddd20df63b608fe19b8c1560 SHA256 b9826946fb8372cf7da1b68538bce9a6069c1be0e6e288cba5522ce977a1d8d4
+MD5 b9d245422bbc547b18a72897366bea77 files/flac-1.2.1-gcc-4.3-includes.patch 423
+RMD160 d7502f5185e8b9bcefbadfa30014b91cc0446267 files/flac-1.2.1-gcc-4.3-includes.patch 423
+SHA256 b9826946fb8372cf7da1b68538bce9a6069c1be0e6e288cba5522ce977a1d8d4 files/flac-1.2.1-gcc-4.3-includes.patch 423
 DIST flac-1.1.2.tar.gz 1516235 RMD160 58656837b02e211eaed5010d84c4ed59841c82d3 SHA1 65501f3547df99b153951edb2ee7bfc13dd56946 SHA256 ce4f7d11b3c04a7368c916ca4abc284dd0c0256f461dfb7f07df1ab445e7a5c0
 DIST flac-1.1.4.tar.gz 1866308 RMD160 7e323ccebbbe453b1dee056d0223f56db0818188 SHA1 b4ce77a96d7ec89a1555b016d90ad4899e613141 SHA256 b774d573b971f71f84386d34b96d388dd2dae3f15735acf91dbd4adff0ce4114
 DIST flac-1.2.1.tar.gz 2009217 RMD160 bd3223c848054f0a75d11200b30f903bdd375bfc SHA1 bd54354900181b59db3089347cc84ad81e410b38 SHA256 9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf
@@ -30,14 +34,14 @@ EBUILD flac-1.2.1-r1.ebuild 1441 RMD160 31117fe1a522d99d25e0f6851c0aee4eefa738a9
 MD5 0d4bdf5b0c8553d1a16bcf9713eb31ea flac-1.2.1-r1.ebuild 1441
 RMD160 31117fe1a522d99d25e0f6851c0aee4eefa738a9 flac-1.2.1-r1.ebuild 1441
 SHA256 a751f26ea7719463dd6bdcf37087ffb891a497f9e02cc72d4492917477bc6835 flac-1.2.1-r1.ebuild 1441
-EBUILD flac-1.2.1-r2.ebuild 1494 RMD160 8daf0e7f0c6be3d5c747b035bade67f1f51a048b SHA1 9d16cbc8f4038b5fe73ccd81d744869272fa95e8 SHA256 3405d6dca45fb56325b466df2a6308be70843ea9ab1644d7d35dc6d931487b45
-MD5 8f58d9b10c56ae90ed2ea34077422884 flac-1.2.1-r2.ebuild 1494
-RMD160 8daf0e7f0c6be3d5c747b035bade67f1f51a048b flac-1.2.1-r2.ebuild 1494
-SHA256 3405d6dca45fb56325b466df2a6308be70843ea9ab1644d7d35dc6d931487b45 flac-1.2.1-r2.ebuild 1494
-MISC ChangeLog 18595 RMD160 ea5b92fbf3114ed3570f780a204018d2de4699fb SHA1 772ef569b597689fb252a2921184ccc6ec97eb1d SHA256 8aafc83fb20af2e1be4322838eec652b5cdc713b957647b3a6f860afff15c32a
-MD5 6ac6d3749de4a338616221a6deab2076 ChangeLog 18595
-RMD160 ea5b92fbf3114ed3570f780a204018d2de4699fb ChangeLog 18595
-SHA256 8aafc83fb20af2e1be4322838eec652b5cdc713b957647b3a6f860afff15c32a ChangeLog 18595
+EBUILD flac-1.2.1-r2.ebuild 1584 RMD160 99e1581a630dd9d595d5c08f1182d9888abc7441 SHA1 9d46155c04f486bd53ab9cb8301235722dab0ceb SHA256 2e09928d3c4de3059112d16efaa95bd7cc9a02137b4980c132eba51886326628
+MD5 098b2f0da901209d27a2c71be5cb64e4 flac-1.2.1-r2.ebuild 1584
+RMD160 99e1581a630dd9d595d5c08f1182d9888abc7441 flac-1.2.1-r2.ebuild 1584
+SHA256 2e09928d3c4de3059112d16efaa95bd7cc9a02137b4980c132eba51886326628 flac-1.2.1-r2.ebuild 1584
+MISC ChangeLog 18801 RMD160 d8b0d8e3391cec27ad32bbca3705693a0f9ce4ef SHA1 cee80066cc0ff87db7940a7b9834b0d36e783b59 SHA256 7d9cce35069e4310afb05bb0a57230d5fa9836a89a424f6c83d565b093807735
+MD5 02a76419247f3a85f3e7638cd72506f2 ChangeLog 18801
+RMD160 d8b0d8e3391cec27ad32bbca3705693a0f9ce4ef ChangeLog 18801
+SHA256 7d9cce35069e4310afb05bb0a57230d5fa9836a89a424f6c83d565b093807735 ChangeLog 18801
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -57,7 +61,7 @@ SHA256 f5f86f0b423fbab0265a4ab7e1b20850e026cb20b63085c71ff2093f1556d78c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHQJEIvFcC4BYPU0oRAhcAAJ9j9PCctZkvaEG5F4xkBhXJqN54rACeMZjv
-XvThcNCuA0mJTwofPDEjw20=
-=QtRQ
+iD8DBQFHQJM3vFcC4BYPU0oRAuEFAKCUJXrKv2cjQBPQHKkO0VP+rPaf2ACfTV7a
+GAw9iEBJ+3TZ8XhmzDItgtw=
+=z0wp
 -----END PGP SIGNATURE-----
diff --git a/media-libs/flac/files/flac-1.2.1-gcc-4.3-includes.patch b/media-libs/flac/files/flac-1.2.1-gcc-4.3-includes.patch
new file mode 100644
index 000000000000..52fec8be5706
--- /dev/null
+++ b/media-libs/flac/files/flac-1.2.1-gcc-4.3-includes.patch
@@ -0,0 +1,11 @@
+diff -Naur flac-1.2.1-orig/examples/cpp/encode/file/main.cpp flac-1.2.1/examples/cpp/encode/file/main.cpp
+--- flac-1.2.1-orig/examples/cpp/encode/file/main.cpp	2007-09-13 09:58:03.000000000 -0600
++++ flac-1.2.1/examples/cpp/encode/file/main.cpp	2007-11-18 12:59:45.000000000 -0600
+@@ -30,6 +30,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <cstring>
+ #include "FLAC++/metadata.h"
+ #include "FLAC++/encoder.h"
+ 
diff --git a/media-libs/flac/flac-1.2.1-r2.ebuild b/media-libs/flac/flac-1.2.1-r2.ebuild
index 7bff4e7a0a34..13d01ce20070 100644
--- a/media-libs/flac/flac-1.2.1-r2.ebuild
+++ b/media-libs/flac/flac-1.2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.2.1-r2.ebuild,v 1.1 2007/11/18 19:22:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.2.1-r2.ebuild,v 1.2 2007/11/18 19:31:35 aballier Exp $
 
 EAPI="1"
 
@@ -33,6 +33,9 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-cflags.patch
 	epatch "${FILESDIR}"/${P}-asm.patch
 
+	# Fix build with gcc 4.3, bug #199579
+	epatch "${FILESDIR}/${P}-gcc-4.3-includes.patch"
+
 	AT_M4DIR="m4" eautoreconf
 }