Fix gcc-4.6 build in older version too, bug #421539.

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64

4 files changed, 33 insertions, 8 deletions

diff --git a/net-libs/ccrtp/ChangeLog b/net-libs/ccrtp/ChangeLog
index a4df9c164e06..a0a16ce7c581 100644
--- a/net-libs/ccrtp/ChangeLog
+++ b/net-libs/ccrtp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/ccrtp
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ccrtp/ChangeLog,v 1.24 2012/11/22 18:30:25 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ccrtp/ChangeLog,v 1.25 2013/02/13 10:57:26 chithanh Exp $
+
+  13 Feb 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/ccrtp-1.7.0-cstddef.patch, ccrtp-1.7.0.ebuild:
+  Fix gcc-4.6 build in older version too, bug #421539.
 
   22 Nov 2012; Agostino Sarubbo <ago@gentoo.org> ccrtp-2.0.3.ebuild:
   Stable for x86, tested by Vincent Olivert Riera <peratu@carrosses.com>, wrt
diff --git a/net-libs/ccrtp/Manifest b/net-libs/ccrtp/Manifest
index de31418ca8e2..3aaa10a5d405 100644
--- a/net-libs/ccrtp/Manifest
+++ b/net-libs/ccrtp/Manifest
@@ -1,9 +1,10 @@
+AUX ccrtp-1.7.0-cstddef.patch 400 SHA256 653867fed05f205ebe66e18399ab25e0ede9d3c18d8ae8ea62ea49f6def2d09d SHA512 a57dcd1ff846c1d939a437948e7bbfb486b7c8665ef852e2dc6639f23ff60fc660b877b4e7d44ab6653d3c92e174743e1380ab1863924fd5ec43a994e55db96a WHIRLPOOL 2274e82a201adc5ef7cd62ee288d23282c5beb3b36a7acb112f0ed7d7b6037ff148e45756468078f78e96a55b6f87defbd6007dd184754771c7e53b27b74b1f6
 AUX ccrtp-stdlib.patch 251 SHA256 5637a27719b50480c7e7c1de1de3d4705ef69c6e2bec4b56e9aea860046a402a SHA512 28b19eb77d5cb5c49481039e87d9a11139eed9a428683ce95ba5f4abbea09c0e5b0e2fa7d889f3577d45e881b375e90339daf887a32beef9d6a43fb3d5ab5fa4 WHIRLPOOL b0832c343a2e2d5dae0297f1323a6a8881da3da237468c7edf1ffd286df6e4d4356219f32fc7f20b53d2330ef6a2f6eb0cbb0cf437404b82d0c4228cc45bd714
 DIST ccrtp-1.6.0.tar.gz 624644 SHA256 509801156cc54a4af8d1a75fba18698ac4117bdd564ac3f61a4e0f07035a370b
-DIST ccrtp-1.7.0.tar.gz 628883 SHA256 923cd26ffc43903ef33704e46fd57f659c3ad01554927fe323635a73082d56ae
+DIST ccrtp-1.7.0.tar.gz 628883 SHA256 923cd26ffc43903ef33704e46fd57f659c3ad01554927fe323635a73082d56ae SHA512 07c3aab9b9374f3c01c1236a8c9137919fd98d32b0ab238e7530fc9c98def3b345d03705b08fa9e13ae080d521a8434ff58eb6934ae089b77a7c31207c0bae99 WHIRLPOOL 967a3135ad209fc93f36bd6066576ca293b5000d2737444d85a6045556dee444843c650e346b7a2bc773bf34883d2053b0d4bf221ea26ad8bb8acc7282181851
 DIST ccrtp-2.0.3.tar.gz 722142 SHA256 01d84705f704769da021295ab39c1084de6236c2114e82bcf4767f012cfe9fdc SHA512 105bd47020af0408a92f917d0d838eb3c70a522b303a58862a90422b1ab50c9ea3bcd06665cd2f74b498563312a2c3d610c0b769688c235af7344a3429df0d47 WHIRLPOOL 66aba88cc409e458658505d915efb3f904630551e6bf01551d5687a451a42211def8f4787fa2c04754ac07d483d28eabd915099526a30f002c4e7992af9ddc3d
 EBUILD ccrtp-1.6.0.ebuild 1128 SHA256 788192cceac847405a6de9576617edf41c8a1cd43a3e3d38fc3e90b64278713e SHA512 8788055b69174f60584d477d69519c6e617675c646dcefb2336fedd90549714bb09579ccc6b97f97d600933e7c16480a3d3f69cb51fcc73f93b02b0bb4a105f9 WHIRLPOOL 25a30936c6b59d2c073794bd93ddf4e4638128627f2525a1d9d10dbb5a15ca7da241067601f2e970bd3d5f97ed3a5b06410959ff02d82320b33242c3d999c811
-EBUILD ccrtp-1.7.0.ebuild 1173 SHA256 d95b8872ef106d584b852e6034d2ffdda2decc2087b5c550956a8628f0559790 SHA512 b14cf24c0b386b0b08c13d48a9075777c517c3d9ffa6e517cc28fcd018fb09a64d961096b0339501a7477fad8ad6a221f0916a858038c4ee05617deb2431c7f2 WHIRLPOOL b92d649590c91787849a254e7370ff83f8562b0f614af701aaa0d772c8f8d7bb6cc1ef31e679eefc2b8755dd676bffb89692c09bcec00abea53cb4ee5d2478bd
+EBUILD ccrtp-1.7.0.ebuild 1227 SHA256 0f87dae1d4aa1e5648f6404dbf5e9db942acd3c5bb820c9d409ca8f225b6c9b1 SHA512 400ec4233c4c81c1ad3ed80e434b8cc60873edd04ee71442defff12fbf74632b9ccf0ed646c7c37b26992d69d27c284fa55866d995dd5291f023b17a32c5a724 WHIRLPOOL aee85922a638d9b83d4b4e6ae9bac46f03d28c94596dcd54afbae8967f0a66f9f3d79ba60e3f3fbfe9980865563f9decf93174ebe1e8367cfa64104cffe3b5ba
 EBUILD ccrtp-2.0.3.ebuild 1204 SHA256 42164537957e512da2f9131ce4949aea6406d61d650bf844bc8bc118ec2e8bcd SHA512 622326c11e3086ccec5aad1132f2cf843e14baf054084d13efd86a0b604d3be7270ae16afb60500c47d190cc4db1798b1262deaf2aec516b9cd7541fe4b6f781 WHIRLPOOL ceee5cb8dc0f6be620156c6bf79f1d17d04285ad612b1d5bff011b4bf6c3c5d4b7232bd24bb41c0e19c55337f7acdb3234e5a9f6ea84aeb1e8455386340884a7
-MISC ChangeLog 3578 SHA256 9c37f3c22acfffeb1ff45adb8e364cae63b703c10fc606d7466ddb0437bc6c0b SHA512 cd426a539189c632d9ef00be43d5c2bc4d760d56b76ba70a082164718e5aa54197d41c8a80af5ff40a2f4a1c0d8ccb300b2839f435b51ab49f174952d43afbc2 WHIRLPOOL ac9a6bcf724795c94981e8ac15a4df25d06fad449e3350dcb7efee30d5606e6452bc347e6363750bd01427e10b1f5255bf479a237f47a9ab1d3e27c30b2fde5d
+MISC ChangeLog 3764 SHA256 58f28b6e7eedfd4efd0056f605b0621f4c6107b634d8668faadc0140b788d8d2 SHA512 0bc0df1692dd7bba7009decdff9b9c0632a1e39dd9201d9e1e30e6cbc8db7b07965a8dee4a7e3da86a8b37d1cdd10cdb5f795e2b683ec769e14e1e38809917b0 WHIRLPOOL e5f54b2901ca14c9fc2e93ac56a0640463568ca6042d99be53e3a8a364545ef38ae933b068be15995e74efe2be43b61137af498babe3806f8aa2f9cf69bcdcf4
 MISC metadata.xml 157 SHA256 6759dc127ff53f85505b9b455ba325e65015b694b1ec50eb99ddfc8903b967bf SHA512 0de06f1d4e9ed5e244b5cb71e583902103384d9addd6991ef750f5932fc11b7c101e5de477c1a8be6661bb6b822518e4526c64f287ac1480e3b558ac816829f7 WHIRLPOOL 76f77c019f198e57f02228dfff99311370040dd582c30a2ccf3a8072a54adac434066d3a08257c635d70daab81d642943cee43386186e7e086ba9632fa6d80b9
diff --git a/net-libs/ccrtp/ccrtp-1.7.0.ebuild b/net-libs/ccrtp/ccrtp-1.7.0.ebuild
index 0c623c2756e8..6a277790b620 100644
--- a/net-libs/ccrtp/ccrtp-1.7.0.ebuild
+++ b/net-libs/ccrtp/ccrtp-1.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ccrtp/ccrtp-1.7.0.ebuild,v 1.3 2012/05/05 02:54:23 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ccrtp/ccrtp-1.7.0.ebuild,v 1.4 2013/02/13 10:57:26 chithanh Exp $
 
-inherit multilib
+inherit base multilib
 
 DESCRIPTION="GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF"
 HOMEPAGE="http://www.gnu.org/software/ccrtp/"
@@ -19,6 +19,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-cstddef.patch
+)
+
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc README ChangeLog AUTHORS NEWS TODO
diff --git a/net-libs/ccrtp/files/ccrtp-1.7.0-cstddef.patch b/net-libs/ccrtp/files/ccrtp-1.7.0-cstddef.patch
new file mode 100644
index 000000000000..4ba1bc26e0b1
--- /dev/null
+++ b/net-libs/ccrtp/files/ccrtp-1.7.0-cstddef.patch
@@ -0,0 +1,16 @@
+Fix building with gcc-4.6
+./ccrtp/sources.h:409:11: error: ‘ptrdiff_t’ does not name a type
+
+https://bugs.gentoo.org/show_bug.cgi?id=421539
+
+Patch written by Kacper Kowalik <xarthisius@gentoo.org>
+--- a/src/ccrtp/sources.h
++++ b/src/ccrtp/sources.h
+@@ -44,6 +44,7 @@
+ #ifndef	CCXX_RTP_SOURCES_H_
+ #define CCXX_RTP_SOURCES_H_
+ 
++#include <cstddef>
+ #include <string>
+ #include <ccrtp/rtcppkt.h>
+