Add upstream patch to fix build with gcc47 spotted by Michael (kensington) <gentoo@scribeofthenile.com> wrt bug #414773.

(Portage version: 2.2.0_alpha101/cvs/Linux i686)

3 files changed, 74 insertions, 2 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 3dabd4df642d..12588a62d3a7 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.314 2012/05/03 20:08:08 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.315 2012/05/07 10:23:22 johu Exp $
+
+  07 May 2012; Johannes Huber <johu@gentoo.org> +files/kopete-4.8.3-gcc47.patch,
+  kopete-4.8.3.ebuild:
+  Add upstream patch to fix build with gcc47 spotted by Michael (kensington)
+  <gentoo@scribeofthenile.com> wrt bug #414773.
 
 *kopete-4.8.3 (03 May 2012)
 
diff --git a/kde-base/kopete/files/kopete-4.8.3-gcc47.patch b/kde-base/kopete/files/kopete-4.8.3-gcc47.patch
new file mode 100644
index 000000000000..81071b21da48
--- /dev/null
+++ b/kde-base/kopete/files/kopete-4.8.3-gcc47.patch
@@ -0,0 +1,65 @@
+Index: kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc
+===================================================================
+--- kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc	(revision 1292761)
++++ kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc	(revision 1292762)
+@@ -31,6 +31,7 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
++#include <unistd.h>
+ #endif
+ 
+ #include <cstring>
+Index: kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc
+===================================================================
+--- kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc	(revision 1292761)
++++ kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc	(revision 1292762)
+@@ -27,6 +27,12 @@
+ 
+ #include "talk/base/ssladapter.h"
+ 
++#ifdef POSIX
++extern "C" {
++#include <unistd.h>
++}
++#endif
++
+ #if !defined(SSL_USE_SCHANNEL) && !defined(SSL_USE_OPENSSL)
+ #ifdef WIN32
+ #define SSL_USE_SCHANNEL 1
+Index: kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h
+===================================================================
+--- kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h	(revision 1292761)
++++ kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h	(revision 1292762)
+@@ -198,15 +198,6 @@
+ }
+ 
+ template<class CTYPE>
+-size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
+-  va_list args;
+-  va_start(args, format);
+-  size_t len = vsprintfn(buffer, buflen, format, args);
+-  va_end(args);
+-  return len;
+-}
+-
+-template<class CTYPE>
+ size_t vsprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format,
+                  va_list args) {
+   int len = vsnprintf(buffer, buflen, format, args);
+@@ -217,6 +208,15 @@
+   return len;
+ }
+ 
++template<class CTYPE>
++size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
++  va_list args;
++  va_start(args, format);
++  size_t len = vsprintfn(buffer, buflen, format, args);
++  va_end(args);
++  return len;
++}
++
+ ///////////////////////////////////////////////////////////////////////////////
+ // Allow safe comparing and copying ascii (not UTF-8) with both wide and
+ // non-wide character strings.
diff --git a/kde-base/kopete/kopete-4.8.3.ebuild b/kde-base/kopete/kopete-4.8.3.ebuild
index 9ac6b1c8f872..3a3e14c7bbcb 100644
--- a/kde-base/kopete/kopete-4.8.3.ebuild
+++ b/kde-base/kopete/kopete-4.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.8.3.ebuild,v 1.1 2012/05/03 20:08:08 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.8.3.ebuild,v 1.2 2012/05/07 10:23:22 johu Exp $
 
 EAPI=4
 
@@ -108,6 +108,8 @@ DEPEND="${COMMONDEPEND}
 	!aqua? ( x11-proto/scrnsaverproto )
 "
 
+PATCHES=( "${FILESDIR}/${P}-gcc47.patch" )
+
 src_prepare() {
 	sed -e "s:lib/mozilla:$(get_libdir)/mozilla:" \
 		-i kopete/protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed"