Hello community, here is the log from the commit of package gwenview for openSUSE:Factory checked in at 2014-04-18 11:34:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-03-30 09:52:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gwenview.new/gwenview.changes 2014-04-18 12:36:37.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 11 16:47:13 UTC 2014 - tittiatcoke@gmail.com + +- Update to 4.13.0 + * KDE 4.13 release + * See http://www.kde.org/announcements/4.13/ + +------------------------------------------------------------------- Old: ---- gwenview-4.12.97.tar.xz New: ---- gwenview-4.13.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gwenview.spec ++++++ --- /var/tmp/diff_new_pack.NWPyac/_old 2014-04-18 12:36:39.000000000 +0200 +++ /var/tmp/diff_new_pack.NWPyac/_new 2014-04-18 12:36:39.000000000 +0200 @@ -17,7 +17,7 @@ Name: gwenview -Version: 4.12.97 +Version: 4.13.0 Release: 0 Summary: Simple Image Viewer for KDE License: GPL-2.0+ ++++++ gwenview-4.12.97.tar.xz -> gwenview-4.13.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-4.12.97/lib/mimetypeutils.cpp new/gwenview-4.13.0/lib/mimetypeutils.cpp --- old/gwenview-4.12.97/lib/mimetypeutils.cpp 2014-03-20 09:46:44.000000000 +0100 +++ new/gwenview-4.13.0/lib/mimetypeutils.cpp 2014-04-08 10:24:19.000000000 +0200 @@ -74,10 +74,13 @@ *list += "image/x-adobe-dng"; *list += "image/x-sony-arw"; *list += "image/x-minolta-mrw"; - *list += "image/x-panasonic-rw2"; + *list += "image/x-panasonic-raw"; + *list += "image/x-panasonic-raw2"; *list += "image/x-samsung-srw"; *list += "image/x-olympus-orf"; *list += "image/x-fuji-raf"; + *list += "image/x-kodak-dcr"; + *list += "image/x-sigma-x3f"; } const QStringList& rasterImageMimeTypes() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-4.12.97/lib/version.h new/gwenview-4.13.0/lib/version.h --- old/gwenview-4.12.97/lib/version.h 2014-03-20 09:46:44.000000000 +0100 +++ new/gwenview-4.13.0/lib/version.h 2014-04-08 10:24:19.000000000 +0200 @@ -33,6 +33,6 @@ https://bugs.kde.org/editversions.cgi?product=gwenview */ -#define GWENVIEW_VERSION "4.13.0 beta3" +#define GWENVIEW_VERSION "4.13.0" #endif /* VERSION_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-4.12.97/tests/auto/CMakeLists.txt new/gwenview-4.13.0/tests/auto/CMakeLists.txt --- old/gwenview-4.12.97/tests/auto/CMakeLists.txt 2014-03-20 09:46:44.000000000 +0100 +++ new/gwenview-4.13.0/tests/auto/CMakeLists.txt 2014-04-08 10:24:19.000000000 +0200 @@ -10,6 +10,7 @@ ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} + ${KDCRAW_LIBRARIES} gwenviewlib) endmacro(gv_add_unit_test) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-4.12.97/tests/auto/documenttest.cpp new/gwenview-4.13.0/tests/auto/documenttest.cpp --- old/gwenview-4.12.97/tests/auto/documenttest.cpp 2014-03-20 09:46:44.000000000 +0100 +++ new/gwenview-4.13.0/tests/auto/documenttest.cpp 2014-04-08 10:24:19.000000000 +0200 @@ -27,6 +27,7 @@ #include <KJobUiDelegate> #include <KIO/NetAccess> #include <qtest_kde.h> +#include <libkdcraw/kdcraw.h> // Local #include "../lib/abstractimageoperation.h" @@ -82,6 +83,16 @@ MimeTypeUtils::Kind expectedKind = MimeTypeUtils::Kind(expectedKindInt); KUrl url = urlForTestFile(fileName); + + // testing RAW loading. For raw, QImage directly won't work -> load it using KDCRaw + QByteArray mFormatHint = url.fileName().section('.', -1).toAscii().toLower(); + if (KDcrawIface::KDcraw::rawFilesList().contains(QString(mFormatHint))) { + if (!KDcrawIface::KDcraw::loadEmbeddedPreview(expectedImage, url.toLocalFile())) { + QSKIP("Not running this test: failed to get expectedImage. Try running ./fetch_testing_raw.sh\ + in the tests/data directory and then rerun the tests.", SkipSingle); + } + } + if (expectedKind != MimeTypeUtils::KIND_SVG_IMAGE) { if (expectedImage.isNull()) { QSKIP("Not running this test: QImage failed to load the test image", SkipSingle); @@ -146,6 +157,10 @@ testLoad_newRow("png-with-jpeg-extension.jpg", "png"); testLoad_newRow("jpg-with-gif-extension.gif", "jpeg"); + // RAW preview + testLoad_newRow("CANON-EOS350D-02.CR2", "cr2", MimeTypeUtils::KIND_RASTER_IMAGE, false); + testLoad_newRow("dsc_0093.nef", "nef", MimeTypeUtils::KIND_RASTER_IMAGE, false); + // SVG testLoad_newRow("test.svg", "", MimeTypeUtils::KIND_SVG_IMAGE); // FIXME: Test svgz @@ -354,6 +369,20 @@ doc->startLoadingFullImage(); doc->waitUntilLoaded(); QCOMPARE(image, doc->image()); + + // RAW preview on rotated image + url = urlForTestFile("dsd_1838.nef"); + if (!KDcrawIface::KDcraw::loadEmbeddedPreview(image, url.toLocalFile())) { + QSKIP("Not running this test: failed to get image. Try running ./fetch_testing_raw.sh\ + in the tests/data directory and then rerun the tests.", SkipSingle); + } + matrix = ImageUtils::transformMatrix(ROT_270); + image = image.transformed(matrix); + + doc = DocumentFactory::instance()->load(url); + doc->startLoadingFullImage(); + doc->waitUntilLoaded(); + QCOMPARE(image, doc->image()); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-4.12.97/tests/auto/semanticinfobackendtest.cpp new/gwenview-4.13.0/tests/auto/semanticinfobackendtest.cpp --- old/gwenview-4.12.97/tests/auto/semanticinfobackendtest.cpp 2014-03-20 09:46:44.000000000 +0100 +++ new/gwenview-4.13.0/tests/auto/semanticinfobackendtest.cpp 2014-04-08 10:24:19.000000000 +0200 @@ -107,6 +107,9 @@ mBackEnd->storeSemanticInfo(url, semanticInfo); } +#if 0 +// Disabled because Baloo does not work like Nepomuk: it does not create tags +// independently of files. void SemanticInfoBackEndTest::testTagForLabel() { QSignalSpy spy(mBackEnd, SIGNAL(tagAdded(SemanticInfoTag,QString))); @@ -129,5 +132,6 @@ QString label2 = mBackEnd->labelForTag(tag2); QCOMPARE(label, label2); } +#endif } // namespace diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-4.12.97/tests/auto/semanticinfobackendtest.h new/gwenview-4.13.0/tests/auto/semanticinfobackendtest.h --- old/gwenview-4.12.97/tests/auto/semanticinfobackendtest.h 2014-03-20 09:46:44.000000000 +0100 +++ new/gwenview-4.13.0/tests/auto/semanticinfobackendtest.h 2014-04-08 10:24:19.000000000 +0200 @@ -65,7 +65,9 @@ void init(); void cleanup(); void testRating(); + #if 0 void testTagForLabel(); + #endif private: AbstractSemanticInfoBackEnd* mBackEnd; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-4.12.97/tests/data/.gitignore new/gwenview-4.13.0/tests/data/.gitignore --- old/gwenview-4.12.97/tests/data/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/gwenview-4.13.0/tests/data/.gitignore 2014-04-08 10:24:19.000000000 +0200 @@ -0,0 +1,3 @@ +# Skip raw data +*.nef +*.CR2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-4.12.97/tests/data/fetch_testing_raw.sh new/gwenview-4.13.0/tests/data/fetch_testing_raw.sh --- old/gwenview-4.12.97/tests/data/fetch_testing_raw.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/gwenview-4.13.0/tests/data/fetch_testing_raw.sh 2014-04-08 10:24:19.000000000 +0200 @@ -0,0 +1,26 @@ +#!/bin/bash +# This script detects if there is one of wget/curl downloaders availabe and downloads +# three raw files from the digikam's store. +# If there is none of the two present in the system, the script suggests manual download. + +DOWNLOADER="" + +which wget &>/dev/null && DOWNLOADER="wget -O " +[ "$DOWNLOADER" == "" ] && which curl &>/dev/null && DOWNLOADER="curl -o " + +if [ "$DOWNLOADER" != "" ] ; then + echo "Fetching CANON-EOS350D-02.CR2 (1/3)" + $DOWNLOADER CANON-EOS350D-02.CR2 http://digikam3rdparty.free.fr/TEST_IMAGES/RAW/HORIZONTAL/CANON-EOS350D-02.C... + echo "Fetching dsc_0093.nef (2/3)" + $DOWNLOADER dsc_0093.nef http://digikam3rdparty.free.fr/TEST_IMAGES/RAW/HORIZONTAL/dsc_0093.nef + echo "Fetching dsd_1838.nef (3/3)" + $DOWNLOADER dsd_1838.nef http://digikam3rdparty.free.fr/TEST_IMAGES/RAW/VERTICAL/dsd_1838.nef +else + echo "Unable to detect downloader. Please install one of wget/curl and try again or" + echo "fetch manually the following files:" + echo " http://digikam3rdparty.free.fr/TEST_IMAGES/RAW/HORIZONTAL/CANON-EOS350D-02.C..." + echo " http://digikam3rdparty.free.fr/TEST_IMAGES/RAW/HORIZONTAL/dsc_0093.nef" + echo " http://digikam3rdparty.free.fr/TEST_IMAGES/RAW/VERTICAL/dsd_1838.nef" + echo "in the tests/data directory." + exit 1 +fi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org