summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2009-05-08 01:28:47 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2009-05-08 01:28:47 +0000
commit13aa7f9def01a3bb7bf186addb6da5efaf559f40 (patch)
tree4224de1f780d35c1acf931bfbbbd3643edb56b8c /net-libs/libjingle
parentFix build with gcc-4.4, bug 264761. Thanks to Daniel J. <sleeperseven@hotmail... (diff)
downloadgentoo-2-13aa7f9def01a3bb7bf186addb6da5efaf559f40.tar.gz
gentoo-2-13aa7f9def01a3bb7bf186addb6da5efaf559f40.tar.bz2
gentoo-2-13aa7f9def01a3bb7bf186addb6da5efaf559f40.zip
Fix gcc-4.4 compatibility, bug 267816. Thanks to uzytkownik <uzytkownik2@gmail.com> for the patch.
(Portage version: 2.2_rc28/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/libjingle')
-rw-r--r--net-libs/libjingle/ChangeLog7
-rw-r--r--net-libs/libjingle/files/libjingle-0.3.12-gcc44.patch22
-rw-r--r--net-libs/libjingle/libjingle-0.3.12.ebuild5
3 files changed, 32 insertions, 2 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/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
}