Hello community, here is the log from the commit of package kopete for openSUSE:Factory checked in at 2014-09-09 06:21:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kopete (Old) and /work/SRC/openSUSE:Factory/.kopete.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kopete" Changes: -------- --- /work/SRC/openSUSE:Factory/kopete/kopete.changes 2014-08-25 11:02:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kopete.new/kopete.changes 2014-09-09 06:21:20.000000000 +0200 @@ -3,0 +4,6 @@ +- Added patch giflib510-support.patch to fix the build when building + against the latest giflib + +------------------------------------------------------------------- +Fri Aug 15 09:06:15 UTC 2014 - tittiatc...@gmail.com + @@ -6 +12 @@ - * See http://www.kde.org/announcements/4.13/ + * See http://www.kde.org/announcements/4.14/ New: ---- giflib510-support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kopete.spec ++++++ --- /var/tmp/diff_new_pack.wVk9kk/_old 2014-09-09 06:21:21.000000000 +0200 +++ /var/tmp/diff_new_pack.wVk9kk/_new 2014-09-09 06:21:21.000000000 +0200 @@ -44,6 +44,8 @@ License: GPL-2.0+ Group: Productivity/Networking/Instant Messenger Source0: %{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM giflib510-support.patch tittiatc...@gmail.com -- fix build when using giflib 5.1.0 +Patch1: giflib510-support.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: kdepim4-runtime Recommends: kopete-protocol-facebook @@ -69,6 +71,7 @@ %prep %setup -q +%patch1 -p1 %build %ifarch ppc ppc64 ++++++ giflib510-support.patch ++++++ commit 2e8e809c22414c8ce47ce78192f15bf1ef069486 Author: Raymond Wooninck <tittiatc...@gmail.com> Date: Wed Sep 3 11:58:26 2014 +0200 Make Kopete build with giflib 5.1.0 and up. CCBUG: 335519 diff --git a/protocols/wlm/wlmchatsession.cpp b/protocols/wlm/wlmchatsession.cpp index 4843791..438bd0a 100644 --- a/protocols/wlm/wlmchatsession.cpp +++ b/protocols/wlm/wlmchatsession.cpp @@ -557,7 +557,11 @@ WlmChatSession::convertToGif( const QPixmap & ink, QString filename) screenColourmap); if (status != GIF_OK) { +#if defined(GIFLIB_MAJOR) && ((GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1) || GIFLIB_MAJOR > 5) + EGifCloseFile(GifFile, NULL ); +#else EGifCloseFile(GifFile); +#endif return; } @@ -580,11 +584,19 @@ WlmChatSession::convertToGif( const QPixmap & ink, QString filename) if (status != GIF_OK) { printGifErrorMessage(); +#if defined(GIFLIB_MAJOR) && ((GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1) || GIFLIB_MAJOR > 5) + EGifCloseFile(GifFile, NULL ); +#else EGifCloseFile(GifFile); +#endif return; } +#if defined(GIFLIB_MAJOR) && ((GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1) || GIFLIB_MAJOR > 5) + if (EGifCloseFile(GifFile, NULL) != GIF_OK) { +#else if (EGifCloseFile(GifFile) != GIF_OK) { +#endif printGifErrorMessage(); return; } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
