diff --git a/kdeadmin/PKGBUILD b/kdeadmin/PKGBUILD index 59a40b4ec..e02cb0e08 100644 --- a/kdeadmin/PKGBUILD +++ b/kdeadmin/PKGBUILD @@ -27,7 +27,7 @@ install=kdeadmin.install options=('docs' '!splithdr' 'splitdbg' 'log') makedepends=('pkgconfig' 'cmake' 'automoc4' "kdepimlibs>=${_kdever}" "kde-runtime>=${_kdever}" - "kdebindings-pykde4>=${_kdever}" 'system-config-printer-common' "kdepim-runtime>=${_kdever}" "docbook-xsl") + "kdebindings-pykde4>=${_kdever}" 'system-config-printer' "kdepim-runtime>=${_kdever}" "docbook-xsl") source=("$_mirror/${pkgbase}-$_kdever.tar.xz" "syslog-path.patch") diff --git a/kdenetwork/gcc47.patch b/kdenetwork/gcc47.patch new file mode 100644 index 000000000..03986752b --- /dev/null +++ b/kdenetwork/gcc47.patch @@ -0,0 +1,60 @@ +--- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc 2012/05/03 16:03:23 1292761 ++++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc 2012/05/03 16:11:00 1292762 +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #endif + + #include +--- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc 2012/05/03 16:03:23 1292761 ++++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc 2012/05/03 16:11:00 1292762 +@@ -27,6 +27,12 @@ + + #include "talk/base/ssladapter.h" + ++#ifdef POSIX ++extern "C" { ++#include ++} ++#endif ++ + #if !defined(SSL_USE_SCHANNEL) && !defined(SSL_USE_OPENSSL) + #ifdef WIN32 + #define SSL_USE_SCHANNEL 1 +--- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h 2012/05/03 16:03:23 1292761 ++++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h 2012/05/03 16:11:00 1292762 +@@ -198,15 +198,6 @@ + } + + template +-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 + 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 ++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. +