[SCM] KDE Network module packaging branch, master, updated. debian/4.7.4-2-3-g483d159

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdenetwork.git;a=commitdiff;h=0506d61

The following commit has been merged in the master branch:
commit 0506d6146abc601772bea17bc414f6ee0e70c296
Author: Pino Toscano <pino at debian.org>
Date:   Tue May 22 14:51:50 2012 +0200

    fix building with GCC 4.7 (#672044)
    
    backport upstream r1292762
---
 debian/changelog                      |    3 +
 debian/patches/series                 |    1 +
 debian/patches/upstream_r1292762.diff |   70 +++++++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d1276c6..3abcd82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 kdenetwork (4:4.7.4-3) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Backport upstream r1292762 to fix building with GCC 4.7; patch
+    upstream_r1292762.diff. (Closes: #672044)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 07 Mar 2012 09:46:27 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index f32112e..fddee22 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 no_home_set.diff
 protocols_namespaces.diff
 libgadu_pthread_check.diff
+upstream_r1292762.diff
diff --git a/debian/patches/upstream_r1292762.diff b/debian/patches/upstream_r1292762.diff
new file mode 100644
index 0000000..b7a52ab
--- /dev/null
+++ b/debian/patches/upstream_r1292762.diff
@@ -0,0 +1,70 @@
+Author: Alex Merry <kde at randomguy3.me.uk>
+Author: Raphael Kubo da Costa <rakuco at FreeBSD.org>
+Description: Fix building with the latest GCC.
+Applied-Upstream: commit:1292762
+
+Index: kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc
+===================================================================
+--- kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc	(revision 1292761)
++++ kdenetwork/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: kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc
+===================================================================
+--- kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc	(revision 1292761)
++++ kdenetwork/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: kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h
+===================================================================
+--- kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h	(revision 1292761)
++++ kdenetwork/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.

-- 
KDE Network module packaging