Hello community, here is the log from the commit of package kdenetwork4 for openSUSE:Factory checked in at 2013-03-15 10:38:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-02-04 20:32:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdenetwork4.new/kdenetwork4.changes 2013-03-15 10:38:51.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Mar 12 21:21:50 UTC 2013 - [email protected] + +- fix build with giflib-5 (kdenetwork-4.10.0-giflib5.patch) + +------------------------------------------------------------------- +Sat Mar 2 16:00:45 UTC 2013 - [email protected] + +- Update to 4.10.1 + * Contains bug fixes. See http://www.kde.org/announcements/ + for more information + +------------------------------------------------------------------- Old: ---- kdenetwork-4.10.0.tar.xz New: ---- kdenetwork-4.10.0-giflib5.patch kdenetwork-4.10.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdenetwork4.spec ++++++ --- /var/tmp/diff_new_pack.eOf1vH/_old 2013-03-15 10:38:52.000000000 +0100 +++ /var/tmp/diff_new_pack.eOf1vH/_new 2013-03-15 10:38:52.000000000 +0100 @@ -17,7 +17,7 @@ Name: kdenetwork4 -Version: 4.10.0 +Version: 4.10.1 Release: 0 Summary: KDE Network Base Package License: GPL-2.0+ @@ -25,6 +25,8 @@ Url: http://www.kde.org Source0: kdenetwork-%{version}.tar.xz Patch1: kopete-qq-memset.patch +# PATCH-FIX-UPSTREAM kdenetwork-4.10.0-giflib5.patch -- fix for changed giflib-5 API [email protected] +Patch2: kdenetwork-4.10.0-giflib5.patch BuildRequires: LibVNCServer-devel BuildRequires: fdupes BuildRequires: gpgme-devel @@ -66,6 +68,7 @@ %prep %setup -q -n kdenetwork-%{version} %patch1 +%patch2 -p1 %build %ifarch ppc ppc64 ++++++ kdenetwork-4.10.0-giflib5.patch ++++++ Index: b/kopete/protocols/wlm/wlmchatsession.cpp =================================================================== --- a/kopete/protocols/wlm/wlmchatsession.cpp +++ b/kopete/protocols/wlm/wlmchatsession.cpp @@ -63,10 +63,14 @@ #include "wlmprotocol.h" #include "wlmaccount.h" #include "wlmchatsessioninkaction.h" #ifdef HAVE_GIFLIB #include <gif_lib.h> +/* old giflib has no GIFLIB_MAJOR, define to avoid cpp warnings */ +#ifndef GIFLIB_MAJOR +#define GIFLIB_MAJOR 4 +#endif #endif WlmChatSession::WlmChatSession (Kopete::Protocol * protocol, const Kopete::Contact * user, Kopete::ContactPtrList others, @@ -465,15 +469,19 @@ WlmChatSession::slotInviteContact (Kopet static void printGifErrorMessage() { #ifdef HAVE_GIFLIB #ifdef HAVE_GIF_ERROR_STRING // giflib 4.2.0+ +#if GIFLIB_MAJOR >= 5 + fprintf(stderr, "GIF-LIB error (exact reporting not implemented)\n"); +#else const char * errorString = GifErrorString(); if (errorString) fprintf(stderr, "GIF-LIB error: %s\n", errorString); else fprintf(stderr, "GIF-LIB undefined error: %d\n", GifError()); +#endif #else // older giflib versions, libungif PrintGifError(); #endif // HAVE_GIF_ERROR_STRING #endif // HAVE_GIFLIB } @@ -481,10 +489,14 @@ printGifErrorMessage() /* stolen from kpaint write_to_gif() */ void WlmChatSession::convertToGif( const QPixmap & ink, QString filename) { #ifdef HAVE_GIFLIB +#if GIFLIB_MAJOR >= 5 +#define FreeMapObject GifFreeMapObject +#define MakeMapObject GifMakeMapObject +#endif int i, status; GifFileType *GifFile; ColorMapObject *screenColourmap; ColorMapObject *imageColourmap; QImage img = ink.toImage().convertToFormat(QImage::Format_Indexed8); @@ -523,11 +535,15 @@ WlmChatSession::convertToGif( const QPix screenColourmap->Colors[i].Green= 0; screenColourmap->Colors[i].Blue= 0; } } +#if GIFLIB_MAJOR >= 5 + GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0, NULL); +#else GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0); +#endif if (!GifFile) { FreeMapObject(imageColourmap); FreeMapObject(screenColourmap); return; } ++++++ kdenetwork-4.10.0.tar.xz -> kdenetwork-4.10.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/kdenetwork4/kdenetwork-4.10.0.tar.xz /work/SRC/openSUSE:Factory/.kdenetwork4.new/kdenetwork-4.10.1.tar.xz differ: char 25, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
