Hello community, here is the log from the commit of package gwenview for openSUSE:Factory checked in at 2013-07-30 15:56:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-07-22 16:41:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gwenview.new/gwenview.changes 2013-07-30 15:56:43.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jul 25 22:23:08 UTC 2013 - [email protected] + +- Update to 4.10.97 + * KDE 4.11 RC 2 release + * See http://www.kde.org/announcements/announce-4.11-rc2.php + +------------------------------------------------------------------- Old: ---- gwenview-4.10.95.tar.xz New: ---- gwenview-4.10.97.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gwenview.spec ++++++ --- /var/tmp/diff_new_pack.XLhv7X/_old 2013-07-30 15:56:44.000000000 +0200 +++ /var/tmp/diff_new_pack.XLhv7X/_new 2013-07-30 15:56:44.000000000 +0200 @@ -17,7 +17,7 @@ Name: gwenview -Version: 4.10.95 +Version: 4.10.97 Release: 0 Summary: Simple Image Viewer for KDE License: GPL-2.0+ ++++++ gwenview-4.10.95.tar.xz -> gwenview-4.10.97.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-4.10.95/lib/archiveutils.cpp new/gwenview-4.10.97/lib/archiveutils.cpp --- old/gwenview-4.10.95/lib/archiveutils.cpp 2013-07-10 01:13:58.000000000 +0200 +++ new/gwenview-4.10.97/lib/archiveutils.cpp 2013-07-24 00:20:13.000000000 +0200 @@ -56,6 +56,13 @@ return it.value(); } + if (mimeType == "image/svg+xml-compressed") { + // We don't want .svgz to be considered as archives because QtSvg knows + // how to decode gzip-ed svg files + cache.insert(mimeType, QString()); + return QString(); + } + QString protocol = KProtocolManager::protocolForArchiveMimetype(mimeType); if (protocol.isEmpty()) { // No protocol, try with mimeType parents. This is useful for .cbz for diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-4.10.95/lib/documentview/svgviewadapter.cpp new/gwenview-4.10.97/lib/documentview/svgviewadapter.cpp --- old/gwenview-4.10.95/lib/documentview/svgviewadapter.cpp 2013-07-10 01:13:58.000000000 +0200 +++ new/gwenview-4.10.97/lib/documentview/svgviewadapter.cpp 2013-07-24 00:20:13.000000000 +0200 @@ -51,11 +51,19 @@ void SvgImageView::loadFromDocument() { Document::Ptr doc = document(); - if (!doc) { - return; + GV_RETURN_IF_FAIL(doc); + + if (doc->loadingState() < Document::Loaded) { + connect(doc.data(), SIGNAL(loaded(KUrl)), + SLOT(finishLoadFromDocument())); + } else { + QMetaObject::invokeMethod(this, "finishLoadFromDocument", Qt::QueuedConnection); } +} - QSvgRenderer* renderer = doc->svgRenderer(); +void SvgImageView::finishLoadFromDocument() +{ + QSvgRenderer* renderer = document()->svgRenderer(); GV_RETURN_IF_FAIL(renderer); mSvgItem->setSharedRenderer(renderer); if (zoomToFit()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-4.10.95/lib/documentview/svgviewadapter.h new/gwenview-4.10.97/lib/documentview/svgviewadapter.h --- old/gwenview-4.10.95/lib/documentview/svgviewadapter.h 2013-07-10 01:13:58.000000000 +0200 +++ new/gwenview-4.10.97/lib/documentview/svgviewadapter.h 2013-07-24 00:20:13.000000000 +0200 @@ -49,6 +49,9 @@ void onImageOffsetChanged(); void onScrollPosChanged(const QPointF& oldPos); +private Q_SLOTS: + void finishLoadFromDocument(); + private: QGraphicsSvgItem* mSvgItem; void adjustItemPos(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-4.10.95/lib/urlutils.cpp new/gwenview-4.10.97/lib/urlutils.cpp --- old/gwenview-4.10.95/lib/urlutils.cpp 2013-07-10 01:13:58.000000000 +0200 +++ new/gwenview-4.10.97/lib/urlutils.cpp 2013-07-24 00:20:13.000000000 +0200 @@ -31,6 +31,7 @@ #include <kde_file.h> #include <KIO/NetAccess> #include <kmountpoint.h> +#include <KProtocolManager> #include <KUrl> // Local @@ -101,8 +102,13 @@ QString mimeType = MimeTypeUtils::urlMimeType(out); const QString protocol = ArchiveUtils::protocolForMimeType(mimeType); + if (!protocol.isEmpty()) { - out.setProtocol(protocol); + KUrl tmp = out; + tmp.setProtocol(protocol); + if (KProtocolManager::supportsListing(tmp)) { + out = tmp; + } } return out; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-4.10.95/lib/version.h new/gwenview-4.10.97/lib/version.h --- old/gwenview-4.10.95/lib/version.h 2013-07-10 01:13:58.000000000 +0200 +++ new/gwenview-4.10.97/lib/version.h 2013-07-24 00:20:13.000000000 +0200 @@ -33,6 +33,6 @@ https://bugs.kde.org/editversions.cgi?product=gwenview */ -#define GWENVIEW_VERSION "4.11.0 rc1" +#define GWENVIEW_VERSION "4.11.0 rc2" #endif /* VERSION_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-4.10.95/tests/auto/urlutilstest.cpp new/gwenview-4.10.97/tests/auto/urlutilstest.cpp --- old/gwenview-4.10.95/tests/auto/urlutilstest.cpp 2013-07-10 01:13:58.000000000 +0200 +++ new/gwenview-4.10.97/tests/auto/urlutilstest.cpp 2013-07-24 00:20:13.000000000 +0200 @@ -52,4 +52,6 @@ NEW_ROW("file://" + pwd + "/example.zip", "zip:" + pwd + "/example.zip"); NEW_ROW("file://" + pwd + "/example.cbz", "zip:" + pwd + "/example.cbz"); NEW_ROW("file://" + pwd + "/example.jpg", "file://" + pwd + "/example.jpg"); + // Check it does not get turned into gzip://... + NEW_ROW("file://" + pwd + "/example.svgz", "file://" + pwd + "/example.svgz"); } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
