Hello community,

here is the log from the commit of package gwenview for openSUSE:Factory 
checked in at 2013-06-11 06:13:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gwenview (Old)
 and      /work/SRC/openSUSE:Factory/.gwenview.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gwenview"

Changes:
--------
--- /work/SRC/openSUSE:Factory/gwenview/gwenview.changes        2013-05-16 
15:35:46.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.gwenview.new/gwenview.changes   2013-06-11 
09:27:57.000000000 +0200
@@ -1,0 +2,8 @@
+Sat Jun  1 09:37:43 UTC 2013 - [email protected]
+
+- Update to 4.10.4
+   * Bugfix release
+   * See http://www.kde.org/announcements/announce-4.10.4.php
+   * resolves bnc#8122760
+
+-------------------------------------------------------------------

Old:
----
  gwenview-4.10.3.tar.xz

New:
----
  gwenview-4.10.4.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gwenview.spec ++++++
--- /var/tmp/diff_new_pack.7YoLC6/_old  2013-06-11 09:27:58.000000000 +0200
+++ /var/tmp/diff_new_pack.7YoLC6/_new  2013-06-11 09:27:58.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           gwenview
-Version:        4.10.3
+Version:        4.10.4
 Release:        0
 Summary:        Simple Image Viewer for KDE
 License:        GPL-2.0+

++++++ gwenview-4.10.3.tar.xz -> gwenview-4.10.4.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/gwenview-4.10.3/app/main.cpp 
new/gwenview-4.10.4/app/main.cpp
--- old/gwenview-4.10.3/app/main.cpp    2013-05-03 06:40:20.000000000 +0200
+++ new/gwenview-4.10.4/app/main.cpp    2013-05-30 21:58:37.000000000 +0200
@@ -116,7 +116,7 @@
         GWENVIEW_VERSION); /* version */
     aboutData.setShortDescription(ki18n("An Image Viewer"));
     aboutData.setLicense(KAboutData::License_GPL);
-    aboutData.setCopyrightStatement(ki18n("Copyright 2000-2012 Aurélien 
Gâteau"));
+    aboutData.setCopyrightStatement(ki18n("Copyright 2000-2013 Aurélien 
Gâteau"));
     aboutData.addAuthor(
         ki18n("Aurélien Gâteau"),
         ki18n("Main developer"),
Files old/gwenview-4.10.3/doc/index.cache.bz2 and 
new/gwenview-4.10.4/doc/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/gwenview-4.10.3/lib/historymodel.cpp 
new/gwenview-4.10.4/lib/historymodel.cpp
--- old/gwenview-4.10.3/lib/historymodel.cpp    2013-05-03 06:40:20.000000000 
+0200
+++ new/gwenview-4.10.4/lib/historymodel.cpp    2013-05-28 21:27:25.000000000 
+0200
@@ -236,6 +236,7 @@
             kError() << "Could not save history for url" << url;
             return;
         }
+        d->mHistoryItemForUrl.insert(url, historyItem);
         appendRow(historyItem);
         sort(0);
         d->garbageCollect();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/gwenview-4.10.3/lib/imagescaler.cpp 
new/gwenview-4.10.4/lib/imagescaler.cpp
--- old/gwenview-4.10.3/lib/imagescaler.cpp     2013-05-03 06:40:20.000000000 
+0200
+++ new/gwenview-4.10.4/lib/imagescaler.cpp     2013-05-30 21:58:37.000000000 
+0200
@@ -101,6 +101,11 @@
 
 void ImageScaler::doScale()
 {
+    if (d->mDocument->isBusy()) {
+        LOG("Document is busy, waiting");
+        QMetaObject::invokeMethod(this, "doScale", Qt::QueuedConnection);
+        return;
+    }
     if (d->mZoom < Document::maxDownSampledZoom()) {
         if (!d->mDocument->prepareDownSampledImageForZoom(d->mZoom)) {
             LOG("Asked for a down sampled image");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/gwenview-4.10.3/lib/version.h 
new/gwenview-4.10.4/lib/version.h
--- old/gwenview-4.10.3/lib/version.h   2013-05-03 06:40:23.000000000 +0200
+++ new/gwenview-4.10.4/lib/version.h   2013-05-30 21:58:37.000000000 +0200
@@ -33,6 +33,6 @@
 https://bugs.kde.org/editversions.cgi?product=gwenview
 
 */
-#define GWENVIEW_VERSION "4.10.3"
+#define GWENVIEW_VERSION "4.10.4"
 
 #endif /* VERSION_H */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/gwenview-4.10.3/part/gvpart.cpp 
new/gwenview-4.10.4/part/gvpart.cpp
--- old/gwenview-4.10.3/part/gvpart.cpp 2013-05-03 06:40:20.000000000 +0200
+++ new/gwenview-4.10.4/part/gvpart.cpp 2013-05-30 21:58:37.000000000 +0200
@@ -129,7 +129,7 @@
         GWENVIEW_VERSION);       /* version */
     aboutData->setShortDescription(ki18n("An Image Viewer"));
     aboutData->setLicense(KAboutData::License_GPL);
-    aboutData->setCopyrightStatement(ki18n("Copyright 2000-2012 Aurélien 
Gâteau"));
+    aboutData->setCopyrightStatement(ki18n("Copyright 2000-2013 Aurélien 
Gâteau"));
     aboutData->addAuthor(
         ki18n("Aurélien Gâteau"),
         ki18n("Main developer"),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/gwenview-4.10.3/tests/auto/imagescalertest.cpp 
new/gwenview-4.10.4/tests/auto/imagescalertest.cpp
--- old/gwenview-4.10.3/tests/auto/imagescalertest.cpp  2013-05-03 
06:40:20.000000000 +0200
+++ new/gwenview-4.10.4/tests/auto/imagescalertest.cpp  2013-05-30 
21:58:37.000000000 +0200
@@ -39,16 +39,18 @@
     KUrl url = urlForTestFile("test.png");
     Document::Ptr doc = DocumentFactory::instance()->load(url);
 
+    // FIXME: Load full image for now, because ImageScalerClient does not wait
+    // when ImageScaler request a full image to be loaded asynchronously.
+    doc->startLoadingFullImage();
+    while (doc->isBusy()) {
+        QTest::qWait(500);
+    }
+
     ImageScaler scaler;
     ImageScalerClient client(&scaler);
     scaler.setDocument(doc);
     scaler.setZoom(zoom);
 
-    // FIXME: Load full image for now, because ImageScalerClient does not wait
-    // when ImageScaler request a full image to be loaded asynchronously.
-    doc->startLoadingFullImage();
-    doc->waitUntilLoaded();
-
     scaler.setDestinationRegion(QRect(QPoint(0, 0), doc->size() * zoom));
 
     QImage scaledImage = client.createFullImage();

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to