Hello community,
here is the log from the commit of package kdegraphics4 for openSUSE:Factory
checked in at Wed May 6 18:48:38 CEST 2009.
--------
--- KDE/kdegraphics4/kdegraphics4.changes 2009-04-21 10:08:30.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdegraphics4/kdegraphics4.changes 2009-05-03 08:29:15.000000000 +0200
@@ -1,0 +2,6 @@
+Sun May 3 08:26:42 CEST 2009 - beineri@opensuse.org
+
+- update to 4.2.3
+ * see http://kde.org/announcements/changelogs/changelog4_2_2to4_2_3.php
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kdegraphics-4.2.2.tar.bz2
New:
----
kdegraphics-4.2.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdegraphics4.spec ++++++
--- /var/tmp/diff_new_pack.jm4482/_old 2009-05-06 18:48:27.000000000 +0200
+++ /var/tmp/diff_new_pack.jm4482/_new 2009-05-06 18:48:27.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdegraphics4 (Version 4.2.2)
+# spec file for package kdegraphics4 (Version 4.2.3)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -33,8 +33,8 @@
Group: Productivity/Graphics/Other
Summary: kdegraphics base package
Url: http://www.kde.org
-Version: 4.2.2
-Release: 3
+Version: 4.2.3
+Release: 1
Source0: kdegraphics-%version.tar.bz2
Source1: _upstream
Patch0: 4_2_BRANCH.diff
@@ -566,6 +566,9 @@
%_kde_share_dir/services/ksane_scan_service.desktop
%changelog
+* Sun May 03 2009 beineri@opensuse.org
+- update to 4.2.3
+ * see http://kde.org/announcements/changelogs/changelog4_2_2to4_2_3.php
* Tue Apr 21 2009 dmueller@suse.de
- rename kde4-gwenview -> gwenview
* Mon Apr 20 2009 dmueller@suse.de
++++++ kdegraphics-4.2.2.tar.bz2 -> kdegraphics-4.2.3.tar.bz2 ++++++
Files old/kdegraphics-4.2.2/doc/gwenview/index.cache.bz2 and new/kdegraphics-4.2.3/doc/gwenview/index.cache.bz2 differ
Files old/kdegraphics-4.2.2/doc/kcontrol/kamera/index.cache.bz2 and new/kdegraphics-4.2.3/doc/kcontrol/kamera/index.cache.bz2 differ
Files old/kdegraphics-4.2.2/doc/kgamma/index.cache.bz2 and new/kdegraphics-4.2.3/doc/kgamma/index.cache.bz2 differ
Files old/kdegraphics-4.2.2/doc/kolourpaint/index.cache.bz2 and new/kdegraphics-4.2.3/doc/kolourpaint/index.cache.bz2 differ
Files old/kdegraphics-4.2.2/doc/kruler/index.cache.bz2 and new/kdegraphics-4.2.3/doc/kruler/index.cache.bz2 differ
Files old/kdegraphics-4.2.2/doc/ksnapshot/index.cache.bz2 and new/kdegraphics-4.2.3/doc/ksnapshot/index.cache.bz2 differ
Files old/kdegraphics-4.2.2/doc/okular/index.cache.bz2 and new/kdegraphics-4.2.3/doc/okular/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/gwenview/app/fileopscontextmanageritem.cpp new/kdegraphics-4.2.3/gwenview/app/fileopscontextmanageritem.cpp
--- old/kdegraphics-4.2.2/gwenview/app/fileopscontextmanageritem.cpp 2009-01-17 11:59:23.000000000 +0100
+++ new/kdegraphics-4.2.3/gwenview/app/fileopscontextmanageritem.cpp 2009-04-30 11:11:41.000000000 +0200
@@ -124,12 +124,15 @@
d->mCopyToAction = file->addAction("file_copy_to",this,SLOT(copyTo()));
d->mCopyToAction->setText(i18nc("Verb", "Copy To..."));
+ d->mCopyToAction->setShortcut(Qt::Key_F7);
d->mMoveToAction = file->addAction("file_move_to",this,SLOT(moveTo()));
d->mMoveToAction->setText(i18nc("Verb", "Move To..."));
+ d->mMoveToAction->setShortcut(Qt::Key_F8);
d->mLinkToAction = file->addAction("file_link_to",this,SLOT(linkTo()));
d->mLinkToAction->setText(i18nc("Verb: create link to the file where user wants", "Link To..."));
+ d->mLinkToAction->setShortcut(Qt::Key_F9);
d->mTrashAction = file->addAction("file_trash",this,SLOT(trash()));
d->mTrashAction->setText(i18nc("Verb", "Trash"));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/gwenview/app/main.cpp new/kdegraphics-4.2.3/gwenview/app/main.cpp
--- old/kdegraphics-4.2.2/gwenview/app/main.cpp 2009-03-26 15:42:07.000000000 +0100
+++ new/kdegraphics-4.2.3/gwenview/app/main.cpp 2009-04-30 11:11:41.000000000 +0200
@@ -39,7 +39,7 @@
"gwenview", /* appname */
0, /* catalogName */
ki18n("Gwenview"), /* programName */
- "2.2.2"); /* version */
+ "2.2.3"); /* version */
aboutData.setShortDescription(ki18n("An Image Viewer"));
aboutData.setLicense(KAboutData::License_GPL);
aboutData.setCopyrightStatement(ki18n("Copyright 2000-2009 Aurélien Gâteau"));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/gwenview/lib/document/loadingdocumentimpl.cpp new/kdegraphics-4.2.3/gwenview/lib/document/loadingdocumentimpl.cpp
--- old/kdegraphics-4.2.2/gwenview/lib/document/loadingdocumentimpl.cpp 2009-02-26 15:15:48.000000000 +0100
+++ new/kdegraphics-4.2.3/gwenview/lib/document/loadingdocumentimpl.cpp 2009-04-30 11:11:41.000000000 +0200
@@ -205,8 +205,25 @@
if (reader.supportsAnimation()
&& reader.nextImageDelay() > 0 // Assume delay == 0 <=> only one frame
) {
- LOG("This is an animated image");
- mAnimated = true;
+ /*
+ * QImageReader is not really helpful to detect animated gif:
+ * - QImageReader::imageCount() returns 0
+ * - QImageReader::nextImageDelay() may return something > 0 if the
+ * image consists of only one frame but includes a "Graphic
+ * Control Extension" (usually only present if we have an
+ * animation) (Bug #185523)
+ *
+ * Decoding the next frame is the only reliable way I found to
+ * detect an animated gif
+ */
+ LOG("May be an animated image. delay:" << reader.nextImageDelay());
+ QImage nextImage;
+ if (reader.read(&nextImage)) {
+ LOG("Really an animated image (more than one frame)");
+ mAnimated = true;
+ } else {
+ kWarning() << mImpl->document()->url() << "is not really an animated image (only one frame)";
+ }
}
}
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/gwenview/NEWS new/kdegraphics-4.2.3/gwenview/NEWS
--- old/kdegraphics-4.2.2/gwenview/NEWS 2009-03-26 15:42:07.000000000 +0100
+++ new/kdegraphics-4.2.3/gwenview/NEWS 2009-04-30 11:11:41.000000000 +0200
@@ -1,3 +1,8 @@
+# 2.2.3
+## Fixes
+- Handle gif files containing one frame and a graphic control extension as
+ non-animated gif (bug #185523).
+
# 2.2.2
## Fixes
- Fix display of JPEG2000 images
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/gwenview/part/gvpart.cpp new/kdegraphics-4.2.3/gwenview/part/gvpart.cpp
--- old/kdegraphics-4.2.2/gwenview/part/gvpart.cpp 2008-11-28 16:33:12.000000000 +0100
+++ new/kdegraphics-4.2.3/gwenview/part/gvpart.cpp 2009-04-30 11:11:41.000000000 +0200
@@ -116,14 +116,14 @@
"gvpart", /* appname */
"gwenview", /* catalogName */
ki18n("Gwenview KPart"), /* programName */
- "2.1"); /* version */
+ "2.2.3"); /* version */
aboutData->setShortDescription(ki18n("An Image Viewer"));
aboutData->setLicense(KAboutData::License_GPL);
- aboutData->setCopyrightStatement(ki18n("Copyright 2000-2008 Aurélien Gâteau"));
+ aboutData->setCopyrightStatement(ki18n("Copyright 2000-2009 Aurélien Gâteau"));
aboutData->addAuthor(
ki18n("Aurélien Gâteau"),
ki18n("Main developer"),
- "aurelien.gateau@free.fr");
+ "agateau@kde.org");
return aboutData;
}
Files old/kdegraphics-4.2.2/gwenview/tests/185523_1frame_with_graphic_control_extension.gif and new/kdegraphics-4.2.3/gwenview/tests/185523_1frame_with_graphic_control_extension.gif differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/gwenview/tests/documenttest.cpp new/kdegraphics-4.2.3/gwenview/tests/documenttest.cpp
--- old/kdegraphics-4.2.2/gwenview/tests/documenttest.cpp 2009-02-26 15:15:47.000000000 +0100
+++ new/kdegraphics-4.2.3/gwenview/tests/documenttest.cpp 2009-04-30 11:11:41.000000000 +0200
@@ -112,6 +112,8 @@
"gif", MimeTypeUtils::KIND_RASTER_IMAGE, true);
NEW_ROW("1frame.gif",
"gif", MimeTypeUtils::KIND_RASTER_IMAGE, false);
+ NEW_ROW("185523_1frame_with_graphic_control_extension.gif",
+ "gif", MimeTypeUtils::KIND_RASTER_IMAGE, false);
NEW_ROW("test.xcf",
"xcf", MimeTypeUtils::KIND_RASTER_IMAGE, false);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/kgamma/kcmkgamma/kgamma.cpp new/kdegraphics-4.2.3/kgamma/kcmkgamma/kgamma.cpp
--- old/kdegraphics-4.2.2/kgamma/kcmkgamma/kgamma.cpp 2008-11-12 17:37:01.000000000 +0100
+++ new/kdegraphics-4.2.3/kgamma/kcmkgamma/kgamma.cpp 2009-04-30 11:11:41.000000000 +0200
@@ -399,8 +399,9 @@
delete config;
if ( ConfigFile == "XF86Config" ) { // parse XF86Config
- xf86cfgbox->setChecked(true);
- return( loadSystemSettings() );
+ bool validGlobalConfig = loadSystemSettings();
+ xf86cfgbox->setChecked( validGlobalConfig );
+ return( validGlobalConfig );
}
else { //get gamma settings from user config
return( loadUserSettings() );
@@ -492,20 +493,22 @@
}
}
// Extract gamma values
- for ( int i = 0; i < ScreenCount; i++) {
- rgamma[i] = ggamma[i] = bgamma[i] = "";
-
- QStringList words = Gamma[assign[i]].split(' ');
- QStringList::ConstIterator it = words.constBegin();
- if ( words.size() < 4 )
- rgamma[i] = ggamma[i] = bgamma[i] = *(++it); // single gamma value
- else {
- rgamma[i] = *(++it); // eventually rgb gamma values
- ggamma[i] = *(++it);
- bgamma[i] = *(++it);
- }
- }
+ if (gm) {
+ for ( int i = 0; i < ScreenCount; i++) {
+ rgamma[i] = ggamma[i] = bgamma[i] = "";
+
+ QStringList words = Gamma[assign[i]].split(' ');
+ QStringList::ConstIterator it = words.constBegin();
+ if ( words.size() < 4 )
+ rgamma[i] = ggamma[i] = bgamma[i] = *(++it); // single gamma value
+ else {
+ rgamma[i] = *(++it); // eventually rgb gamma values
+ ggamma[i] = *(++it);
+ bgamma[i] = *(++it);
+ }
+ }
}
+ }
}
return( validateGammaValues() );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/ksaneplugin/CMakeLists.txt new/kdegraphics-4.2.3/ksaneplugin/CMakeLists.txt
--- old/kdegraphics-4.2.2/ksaneplugin/CMakeLists.txt 2008-05-15 20:37:10.000000000 +0200
+++ new/kdegraphics-4.2.3/ksaneplugin/CMakeLists.txt 2009-04-30 11:11:40.000000000 +0200
@@ -2,7 +2,6 @@
project(ksaneplugin)
find_package(KSane REQUIRED)
-message("KSANE_LIBRARY=${KSANE_LIBRARY}")
include_directories(${KSANE_INCLUDE_DIR})
########### target ###############
kde4_add_plugin(ksaneplugin sanedialog.cpp)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/ksaneplugin/sanedialog.cpp new/kdegraphics-4.2.3/ksaneplugin/sanedialog.cpp
--- old/kdegraphics-4.2.2/ksaneplugin/sanedialog.cpp 2008-05-07 11:05:18.000000000 +0200
+++ new/kdegraphics-4.2.3/ksaneplugin/sanedialog.cpp 2009-04-30 11:11:40.000000000 +0200
@@ -31,7 +31,7 @@
#include <KMessageBox>
K_PLUGIN_FACTORY(SaneDialogFactory, registerPlugin<SaneDialog>();)
-K_EXPORT_PLUGIN(SaneDialogFactory("kscanplugin"))
+K_EXPORT_PLUGIN(SaneDialogFactory("ksaneplugin"))
///////////////////////////////////////////////////////////////////
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-4.2.2/libs/libkipi/libkipi/pluginloader.cpp new/kdegraphics-4.2.3/libs/libkipi/libkipi/pluginloader.cpp
--- old/kdegraphics-4.2.2/libs/libkipi/libkipi/pluginloader.cpp 2008-11-12 17:37:00.000000000 +0100
+++ new/kdegraphics-4.2.3/libs/libkipi/libkipi/pluginloader.cpp 2009-04-30 11:11:40.000000000 +0200
@@ -6,7 +6,7 @@
* Date : 2004-02-01
* Description : plugin loader
*
- * Copyright (C) 2004-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2004-2009 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2004-2005 by Renchi Raju