Hello community, here is the log from the commit of package kdenetwork4 for openSUSE:Factory checked in at 2012-04-03 09:19:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdenetwork4 (Old) and /work/SRC/openSUSE:Factory/.kdenetwork4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdenetwork4", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kdenetwork4/kdenetwork4.changes 2012-03-13 09:33:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdenetwork4.new/kdenetwork4.changes 2012-04-03 09:20:22.000000000 +0200 @@ -1,0 +2,16 @@ +Sun Apr 1 10:20:36 UTC 2012 - [email protected] + +- Add kdenetwork4-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- +Sat Mar 31 11:06:00 UTC 2012 - [email protected] + +- Add xz to BuildRequires + +------------------------------------------------------------------- +Fri Mar 30 01:14:12 CEST 2012 - [email protected] + +- update to 4.8.2 + * see http://kde.org/announcements/changelogs/changelog4_8_1to4_8_2.php for details + +------------------------------------------------------------------- Old: ---- kdenetwork-4.8.1.tar.bz2 New: ---- kdenetwork-4.8.2.tar.xz kdenetwork4-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdenetwork4.spec ++++++ --- /var/tmp/diff_new_pack.fsMnUM/_old 2012-04-03 09:20:23.000000000 +0200 +++ /var/tmp/diff_new_pack.fsMnUM/_new 2012-04-03 09:20:23.000000000 +0200 @@ -17,13 +17,14 @@ Name: kdenetwork4 -Version: 4.8.1 +Version: 4.8.2 Release: 0 Summary: KDE Network Base Package License: GPL-2.0+ Group: Productivity/Networking/Other Url: http://www.kde.org -Source0: kdenetwork-%{version}.tar.bz2 +Source0: kdenetwork-%{version}.tar.xz +Patch0: %{name}-gcc47.patch BuildRequires: LibVNCServer-devel BuildRequires: fdupes BuildRequires: gpgme-devel @@ -51,6 +52,7 @@ BuildRequires: pkg-config BuildRequires: speex-devel BuildRequires: sqlite-devel +BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -59,6 +61,7 @@ %prep %setup -q -n kdenetwork-%{version} +%patch0 -p1 # icon fixups pushd kget/ui/icons popd ++++++ kdenetwork4-gcc47.patch ++++++ Index: kdenetwork-4.8.2/kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc =================================================================== --- kdenetwork-4.8.2.orig/kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc +++ kdenetwork-4.8.2/kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc @@ -47,6 +47,8 @@ int inet_aton(const char * cp, struct in inp->s_addr = inet_addr(cp); return (inp->s_addr == INADDR_NONE) ? 0 : 1; } +#else +#include <unistd.h> //for gethostbyname() #endif // WIN32 #ifdef _DEBUG Index: kdenetwork-4.8.2/kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h =================================================================== --- kdenetwork-4.8.2.orig/kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h +++ kdenetwork-4.8.2/kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h @@ -198,15 +198,6 @@ size_t strcatn(CTYPE* buffer, size_t buf } 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 @@ size_t vsprintfn(CTYPE* buffer, size_t b 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. Index: kdenetwork-4.8.2/kopete/protocols/qq/evautil.cpp =================================================================== --- kdenetwork-4.8.2.orig/kopete/protocols/qq/evautil.cpp +++ kdenetwork-4.8.2/kopete/protocols/qq/evautil.cpp @@ -78,7 +78,9 @@ namespace Eva { plain[0] = ( rand() & 0xf8 ) | pos; memset( plain_pre, 0, 8 ); memset( crypted_pre, 0, 8 ); - memset( plain+1, rand()& 0xff, pos++ ); + if( pos ) + memset( plain+1, rand()& 0xff, pos ); + pos++; // pad 2 bytes for( i = 0; i< 2; i++ ) Index: kdenetwork-4.8.2/kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc =================================================================== --- kdenetwork-4.8.2.orig/kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc +++ kdenetwork-4.8.2/kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc @@ -26,6 +26,7 @@ */ #include "talk/base/ssladapter.h" +#include <unistd.h> // for MUTEX handling... #if !defined(SSL_USE_SCHANNEL) && !defined(SSL_USE_OPENSSL) #ifdef WIN32 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
