diff options
author | Johannes Huber <johu@gentoo.org> | 2012-09-03 14:16:59 +0000 |
---|---|---|
committer | Johannes Huber <johu@gentoo.org> | 2012-09-03 14:16:59 +0000 |
commit | c95ac839f3bf043df2771a5fffc7008a5c89a144 (patch) | |
tree | 3d2c7b46b2eac0bce64a04a722c17e8f54c0e4f1 /kde-base/kopete | |
parent | Remove old. (diff) | |
download | gentoo-2-c95ac839f3bf043df2771a5fffc7008a5c89a144.tar.gz gentoo-2-c95ac839f3bf043df2771a5fffc7008a5c89a144.tar.bz2 gentoo-2-c95ac839f3bf043df2771a5fffc7008a5c89a144.zip |
Remove old.
(Portage version: 2.2.0_alpha124/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/kopete')
-rw-r--r-- | kde-base/kopete/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/kopete/files/kopete-4.8.3-gcc47.patch | 65 |
2 files changed, 4 insertions, 67 deletions
diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog index 5be037f5f0f2..3586d02e3921 100644 --- a/kde-base/kopete/ChangeLog +++ b/kde-base/kopete/ChangeLog @@ -1,6 +1,9 @@ # 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.329 2012/09/03 13:29:31 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.330 2012/09/03 14:16:59 johu Exp $ + + 03 Sep 2012; Johannes Huber <johu@gentoo.org> -files/kopete-4.8.3-gcc47.patch: + Remove old. 03 Sep 2012; Johannes Huber <johu@gentoo.org> -kopete-4.7.4.ebuild: Remove KDE SC 4.7.4 @@ -1376,4 +1379,3 @@ +kopete-3.4.0_beta1.ebuild: Adding the split ebuilds to portage. For KDE 3.4, we've created separate ebuilds for all the KDE apps. - diff --git a/kde-base/kopete/files/kopete-4.8.3-gcc47.patch b/kde-base/kopete/files/kopete-4.8.3-gcc47.patch deleted file mode 100644 index 81071b21da48..000000000000 --- a/kde-base/kopete/files/kopete-4.8.3-gcc47.patch +++ /dev/null @@ -1,65 +0,0 @@ -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. |