Hello community, here is the log from the commit of package okular for openSUSE:Factory checked in at 2014-11-19 20:26:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/okular (Old) and /work/SRC/openSUSE:Factory/.okular.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "okular" Changes: -------- --- /work/SRC/openSUSE:Factory/okular/okular.changes 2014-10-16 18:13:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.okular.new/okular.changes 2014-11-19 20:29:37.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Nov 9 20:38:24 UTC 2014 - [email protected] + +- Update to 4.14.3 + * KDE 4.14.3 SC Bugfix Release + * See http://www.kde.org/announcements/announce-4.14.3.php + +------------------------------------------------------------------- Old: ---- okular-4.14.2.tar.xz New: ---- okular-4.14.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ okular.spec ++++++ --- /var/tmp/diff_new_pack.azMx9g/_old 2014-11-19 20:29:38.000000000 +0100 +++ /var/tmp/diff_new_pack.azMx9g/_new 2014-11-19 20:29:38.000000000 +0100 @@ -17,7 +17,7 @@ Name: okular -Version: 4.14.2 +Version: 4.14.3 Release: 0 Summary: Document Viewer License: GPL-2.0+ ++++++ okular-4.14.2.tar.xz -> okular-4.14.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.2/VERSION new/okular-4.14.3/VERSION --- old/okular-4.14.2/VERSION 2014-10-09 21:32:34.000000000 +0200 +++ new/okular-4.14.3/VERSION 2014-11-06 23:38:13.000000000 +0100 @@ -1 +1 @@ -okular v0.20.2 +okular v0.20.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.2/core/version.h new/okular-4.14.3/core/version.h --- old/okular-4.14.2/core/version.h 2014-10-09 21:32:34.000000000 +0200 +++ new/okular-4.14.3/core/version.h 2014-11-06 23:38:13.000000000 +0100 @@ -10,10 +10,10 @@ #ifndef _OKULAR_VERSION_H_ #define _OKULAR_VERSION_H_ -#define OKULAR_VERSION_STRING "0.20.2" +#define OKULAR_VERSION_STRING "0.20.3" #define OKULAR_VERSION_MAJOR 0 #define OKULAR_VERSION_MINOR 20 -#define OKULAR_VERSION_RELEASE 2 +#define OKULAR_VERSION_RELEASE 3 #define OKULAR_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) #define OKULAR_VERSION \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.2/generators/comicbook/unrar.cpp new/okular-4.14.3/generators/comicbook/unrar.cpp --- old/okular-4.14.2/generators/comicbook/unrar.cpp 2014-10-09 21:32:34.000000000 +0200 +++ new/okular-4.14.3/generators/comicbook/unrar.cpp 2014-11-06 23:38:13.000000000 +0100 @@ -39,11 +39,11 @@ K_GLOBAL_STATIC( UnrarHelper, helper ) -static UnrarFlavour* detectUnrar( const QString &unrarPath ) +static UnrarFlavour* detectUnrar( const QString &unrarPath, const QString &versionCommand ) { UnrarFlavour* kind = 0; QProcess proc; - proc.start( unrarPath, QStringList() << "--version" ); + proc.start( unrarPath, QStringList() << versionCommand ); bool ok = proc.waitForFinished( -1 ); Q_UNUSED( ok ) const QStringList lines = QString::fromLocal8Bit( proc.readAllStandardOutput() ).split( '\n', QString::SkipEmptyParts ); @@ -69,7 +69,10 @@ path = KStandardDirs::findExe( "rar" ); if ( !path.isEmpty() ) - kind = detectUnrar( path ); + kind = detectUnrar( path, "--version" ); + + if ( !kind ) + kind = detectUnrar( path, "-v" ); if ( !kind ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.2/ui/presentationwidget.cpp new/okular-4.14.3/ui/presentationwidget.cpp --- old/okular-4.14.2/ui/presentationwidget.cpp 2014-10-09 21:32:34.000000000 +0200 +++ new/okular-4.14.3/ui/presentationwidget.cpp 2014-11-06 23:38:13.000000000 +0100 @@ -1218,9 +1218,14 @@ double pageDuration = m_frameIndex >= 0 && m_frameIndex < (int)m_frames.count() ? m_frames[ m_frameIndex ]->page->duration() : -1; if ( m_advanceSlides || pageDuration >= 0.0 ) { - double secs = pageDuration < 0.0 - ? Okular::SettingsCore::slidesAdvanceTime() - : qMin<double>( pageDuration, Okular::SettingsCore::slidesAdvanceTime() ); + double secs; + if ( pageDuration < 0.0 ) + secs = Okular::SettingsCore::slidesAdvanceTime(); + else if ( m_advanceSlides ) + secs = qMin<double>( pageDuration, Okular::SettingsCore::slidesAdvanceTime() ); + else + secs = pageDuration; + m_nextPageTimer->start( (int)( secs * 1000 ) ); } } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
