diff -Naur kdelibs-4.9.4/cmake/modules/FindGIF.cmake kdelibs-4.9.4-giflib5/cmake/modules/FindGIF.cmake --- kdelibs-4.9.4/cmake/modules/FindGIF.cmake 2012-11-30 08:17:39.000000000 +0100 +++ kdelibs-4.9.4-giflib5/cmake/modules/FindGIF.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,39 +0,0 @@ -# - Try to find GIF -# Once done this will define -# -# GIF_FOUND - system has GIF -# GIF_INCLUDE_DIR - the GIF include directory -# GIF_LIBRARIES - Libraries needed to use GIF -# GIF_DEFINITIONS - Compiler switches required for using GIF - -# Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. -# See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. - -IF (GIF_INCLUDE_DIR AND GIF_LIBRARIES) - # Already in cache, be silent - SET(GIF_FIND_QUIETLY TRUE) -ENDIF (GIF_INCLUDE_DIR AND GIF_LIBRARIES) - -FIND_PATH(GIF_INCLUDE_DIR gif_lib.h) - -SET(POTENTIAL_GIF_LIBS gif libgif ungif libungif giflib giflib4) -FIND_LIBRARY(GIF_LIBRARIES NAMES ${POTENTIAL_GIF_LIBS}) - -IF (GIF_INCLUDE_DIR AND GIF_LIBRARIES) - SET(CMAKE_REQUIRED_INCLUDES "${GIF_INCLUDE_DIR}" "${CMAKE_REQUIRED_INCLUDES}") - CHECK_STRUCT_MEMBER(GifFileType UserData gif_lib.h GIF_FOUND) -ENDIF (GIF_INCLUDE_DIR AND GIF_LIBRARIES) - -IF (GIF_FOUND) - IF (NOT GIF_FIND_QUIETLY) - MESSAGE(STATUS "Found GIF: ${GIF_LIBRARIES}") - ENDIF (NOT GIF_FIND_QUIETLY) -ELSE (GIF_FOUND) - IF (GIF_FIND_REQUIRED) - MESSAGE(STATUS "Looked for GIF libraries named ${POTENTIAL_GIF_LIBS}.") - MESSAGE(STATUS "Found no acceptable GIF library. This is fatal.") - MESSAGE(FATAL_ERROR "Could NOT find GIF") - ENDIF (GIF_FIND_REQUIRED) -ENDIF (GIF_FOUND) - -MARK_AS_ADVANCED(GIF_INCLUDE_DIR GIF_LIBRARIES) diff -Naur kdelibs-4.9.4/khtml/imload/decoders/gifloader.cpp kdelibs-4.9.4-giflib5/khtml/imload/decoders/gifloader.cpp --- kdelibs-4.9.4/khtml/imload/decoders/gifloader.cpp 2012-11-30 08:17:38.000000000 +0100 +++ kdelibs-4.9.4-giflib5/khtml/imload/decoders/gifloader.cpp 2012-12-10 20:34:12.463272621 +0100 @@ -299,8 +299,12 @@ return toRet; } - + +#if GIFLIB_MAJOR >= 5 + static unsigned int decode16Bit(unsigned char* signedLoc) +#else static unsigned int decode16Bit(char* signedLoc) +#endif { unsigned char* loc = reinterpret_cast(signedLoc); @@ -348,7 +352,12 @@ virtual int processEOF() { //Feed the buffered data to libUnGif +#if GIFLIB_MAJOR >= 5 + int ErrorCode; + GifFileType* file = DGifOpen(this, gifReaderBridge, &ErrorCode); +#else GifFileType* file = DGifOpen(this, gifReaderBridge); +#endif if (!file) return Error;