Fix gcc-4.4 compatibility, bug 267816. Thanks to uzytkownik <uzytkownik2@gmail.com> for the patch.

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

4 files changed, 35 insertions, 4 deletions

diff --git a/net-libs/libjingle/ChangeLog b/net-libs/libjingle/ChangeLog
index 8f57e55408b9..f6f398ac041d 100644
--- a/net-libs/libjingle/ChangeLog
+++ b/net-libs/libjingle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libjingle
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libjingle/ChangeLog,v 1.17 2009/02/11 15:31:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libjingle/ChangeLog,v 1.18 2009/05/08 01:28:47 loki_val Exp $
+
+  08 May 2009; Peter Alfredsen <loki_val@gentoo.org>
+  libjingle-0.3.12.ebuild, +files/libjingle-0.3.12-gcc44.patch:
+  Fix gcc-4.4 compatibility, bug 267816. Thanks to uzytkownik
+  <uzytkownik2@gmail.com> for the patch.
 
   11 Feb 2009; Raúl Porcel <armin76@gentoo.org> libjingle-0.3.11-r1.ebuild:
   Add ~ia64/~sparc wrt #257795
diff --git a/net-libs/libjingle/Manifest b/net-libs/libjingle/Manifest
index 48c8f43bc8ec..a5b77351ee58 100644
--- a/net-libs/libjingle/Manifest
+++ b/net-libs/libjingle/Manifest
@@ -1,8 +1,9 @@
 AUX libjingle-0.3.11-gcc43.patch 9565 RMD160 082360eeed9e4f4c8b5dca6eb7bea5f9825b8258 SHA1 1f222fef9c6efb992e0c55b28c72273e45872e65 SHA256 793f1aad29fc7c4eeb46d3bfb1184aac81f7876e087988f1656fdd630379290f
 AUX libjingle-0.3.12-asneeded.patch 1024 RMD160 ea8aa08e02f9c40fb957c0fbadb1475aae4daabd SHA1 5a720aa0f0908c98858e00deba850b8212564f8d SHA256 2e069cedf0287359b8add040e0c1dff1d01d583eaaeda39aafbde27513bfec54
+AUX libjingle-0.3.12-gcc44.patch 718 RMD160 459e7a42e52253ec8441f300bceccb769a83e2ee SHA1 06a194b186047019be51316604c0968f4174c414 SHA256 d0ec67d72d81ea23b5e8589e8f85aab059c353334db822b7764ae67303d091fe
 DIST libjingle-0.3.11.tar.gz 613784 RMD160 61c4359f029fed2ce4fcd9da38a9ff2324b7af17 SHA1 47f6b403388d470f2bcb9e1e961711e236d01445 SHA256 d287f9f90fd0d31272d7d63edbf7103b986e2e20f82906b0ddddcfdbb914b4f4
 DIST libjingle-0.3.12.tar.gz 526316 RMD160 b0b823a405e75b2c952bd638087647cee7aeef26 SHA1 7435366a5f9c228dc7fa7e47e94a7702ede0bc2e SHA256 4bbc4b4813292c20905d2f857ec7ec1055cc54611ae9cd7c85f46962f1b1a2d9
 EBUILD libjingle-0.3.11-r1.ebuild 1016 RMD160 a799c6a0e9e97b63f5cf8260d1b9c4b4967faf8f SHA1 e0542355b7316205e65c811722c69bff38824983 SHA256 9fb8a6e9c9fc0406c902466901e3c3ada2aab0d8822fd4ee8dd027d477d4c142
-EBUILD libjingle-0.3.12.ebuild 840 RMD160 dd0e8aab34a0523690f429e89bcfae579945eca2 SHA1 76d80eeb0c3a03b8fab1381baef0b605d476139d SHA256 8d14a9c794d62b4f869c7803d8b180d2d701dd6f73248d85d383311e6d9f8a75
-MISC ChangeLog 2719 RMD160 1901c6c3be02aae57af587ab87784377d7dd70d7 SHA1 04a52a1c7381a48ee58e1bcc9064bd9e71ed31e8 SHA256 58be2941bc1956b51660a8cd421a0bada2bb8f1a2beb142cb30fe8a1f099949c
+EBUILD libjingle-0.3.12.ebuild 899 RMD160 47de077b4922e1f2fb47a26b1e7f628dcfc578da SHA1 611b1e1bb88d71b1db268844806d6364bdcfbf25 SHA256 def56f5f71932a1b8c2bf20a2027363927d7d4a3f57d983e849c49682e4dc999
+MISC ChangeLog 2941 RMD160 9cec61a9e7e0adca0b558e2a7de85d41d04aea34 SHA1 bfe4d84854f20825ee5d912075a4a9e9bee54a9b SHA256 890d904586661ed389fa93a1be2a705be03dd64b76a912b17ffb2104b076792d
 MISC metadata.xml 274 RMD160 4768001753012d66c37ffdf286af9f85acc909d2 SHA1 7d11f7d9f6871b06db910f54f1b5d68de3625698 SHA256 757abf07369008f55658d8a6b937f6677602cdfb1961aa0767a189d4bfef6d70
diff --git a/net-libs/libjingle/files/libjingle-0.3.12-gcc44.patch b/net-libs/libjingle/files/libjingle-0.3.12-gcc44.patch
new file mode 100644
index 000000000000..dde3135639e5
--- /dev/null
+++ b/net-libs/libjingle/files/libjingle-0.3.12-gcc44.patch
@@ -0,0 +1,22 @@
+diff -ru a/talk/base/logging.cc b/talk/base/logging.cc
+--- a/talk/base/logging.cc	2008-09-16 15:55:22.000000000 +0200
++++ b/talk/base/logging.cc	2009-04-29 00:16:18.000000000 +0200
+@@ -34,6 +34,7 @@
+ #include <iostream>
+ #include <iomanip>
+ #include <string.h>
++#include <stdio.h>
+ 
+ #include "talk/base/logging.h"
+ #include "talk/base/stream.h"
+diff -ru a/talk/base/stream.cc b/talk/base/stream.cc
+--- a/talk/base/stream.cc	2008-09-16 15:55:22.000000000 +0200
++++ b/talk/base/stream.cc	2009-04-29 00:17:05.000000000 +0200
+@@ -30,6 +30,7 @@
+ #include <errno.h>
+ #include <string>
+ #include <string.h>
++#include <stdio.h>
+ #include "talk/base/basictypes.h"
+ #include "talk/base/common.h"
+ #include "talk/base/stream.h"
diff --git a/net-libs/libjingle/libjingle-0.3.12.ebuild b/net-libs/libjingle/libjingle-0.3.12.ebuild
index db49e05b1330..5e91df1d4d0f 100644
--- a/net-libs/libjingle/libjingle-0.3.12.ebuild
+++ b/net-libs/libjingle/libjingle-0.3.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libjingle/libjingle-0.3.12.ebuild,v 1.4 2009/01/07 17:01:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libjingle/libjingle-0.3.12.ebuild,v 1.5 2009/05/08 01:28:47 loki_val Exp $
 
 inherit autotools eutils
 
@@ -25,6 +25,9 @@ src_unpack() {
 	# See bug #238262
 	epatch "${FILESDIR}/${P}-asneeded.patch"
 
+	# See bug 267816
+	epatch "${FILESDIR}/${P}-gcc44.patch"
+
 	eautomake
 }