Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at 2013-03-15 10:38:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdelibs4 (Old) and /work/SRC/openSUSE:Factory/.kdelibs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdelibs4", Maintainer is "kde-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4-apidocs.changes 2013-02-04 20:31:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4-apidocs.changes 2013-03-15 10:38:40.000000000 +0100 @@ -1,0 +2,14 @@ +Sat Mar 2 15:31:49 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.10.1 + * Contains bug fixes. See http://www.kde.org/announcements/ + for more information + +------------------------------------------------------------------- +Thu Feb 7 18:56:22 UTC 2013 - wba...@tmo.at + +- changed clever-menu.patch: + * added method KServiceGroup::addSortOrderEntry(), needed to fix + bnc#356553 + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4.changes 2013-02-09 10:12:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4.changes 2013-03-15 10:38:40.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Mar 13 20:44:30 UTC 2013 - seife+...@b1-systems.com + +- fix build with giflib-5 (kdelibs-4.10.0-giflib5.patch) + +------------------------------------------------------------------- +Sat Mar 2 15:31:49 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.10.1 + * Contains bug fixes. See http://www.kde.org/announcements/ + for more information + +------------------------------------------------------------------- Old: ---- kdelibs-4.10.0.tar.xz New: ---- kdelibs-4.10.0-giflib5.patch kdelibs-4.10.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4-apidocs.spec ++++++ --- /var/tmp/diff_new_pack.hTjl1C/_old 2013-03-15 10:38:43.000000000 +0100 +++ /var/tmp/diff_new_pack.hTjl1C/_new 2013-03-15 10:38:43.000000000 +0100 @@ -17,7 +17,7 @@ Name: kdelibs4-apidocs -Version: 4.10.0 +Version: 4.10.1 Release: 0 Summary: KDE 4 API documentation License: LGPL-2.1+ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.hTjl1C/_old 2013-03-15 10:38:43.000000000 +0100 +++ /var/tmp/diff_new_pack.hTjl1C/_new 2013-03-15 10:38:43.000000000 +0100 @@ -24,7 +24,7 @@ %define kderev 0 Name: kdelibs4 -Version: 4.10.0 +Version: 4.10.1 Release: 0 %define default_branding 4.10 BuildRequires: OpenEXR-devel @@ -112,6 +112,8 @@ Patch24: ksuseinstall.diff Patch26: fix_kdeclarative_install_location.diff Patch28: kio_revert_slow_filesystems.patch +# PATCH-FIX-UPSTREAM kdelibs-4.10.0-giflib5.patch -- fix for changed giflib-5 API seife+...@b1-systems.com +Patch29: kdelibs-4.10.0-giflib5.patch PreReq: permissions Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`) Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) @@ -181,6 +183,7 @@ %patch24 %patch26 -p1 %patch28 -p1 +%patch29 -p1 # # define KDE version exactly ++++++ kdelibs-4.10.0-giflib5.patch ++++++ Index: b/khtml/imload/decoders/gifloader.cpp =================================================================== --- a/khtml/imload/decoders/gifloader.cpp +++ b/khtml/imload/decoders/gifloader.cpp @@ -43,10 +43,15 @@ #include <config.h> //For endian extern "C" { #include <gif_lib.h> } +/* avoid cpp warning about undefined macro, old giflib had no GIFLIB_MAJOR */ +#ifndef GIFLIB_MAJOR +#define GIFLIB_MAJOR 4 +#endif + // #define DEBUG_GIFLOADER namespace khtmlImLoad { static int INTERLACED_OFFSET[] = { 0, 4, 2, 1 }; @@ -298,11 +303,15 @@ public: 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<unsigned char*>(signedLoc); //GIFs are little-endian return loc[0] | (((unsigned int)loc[1]) << 8); @@ -346,11 +355,16 @@ public: } virtual int processEOF() { //Feed the buffered data to libUnGif +#if GIFLIB_MAJOR >= 5 + int e; + GifFileType* file = DGifOpen(this, gifReaderBridge, &e); +#else GifFileType* file = DGifOpen(this, gifReaderBridge); +#endif if (!file) return Error; if (DGifSlurp(file) == GIF_ERROR) ++++++ kdelibs-4.10.0.tar.xz -> kdelibs-4.10.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/kdelibs4/kdelibs-4.10.0.tar.xz /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs-4.10.1.tar.xz differ: char 25, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
