Hello community, here is the log from the commit of package okular for openSUSE:Factory checked in at 2014-01-27 11:16:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-12-19 13:17:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.okular.new/okular.changes 2014-01-27 11:16:09.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Jan 11 15:41:45 UTC 2014 - [email protected] + +- Update to 4.12.1 + * KDE 4.12.1 release + * See http://www.kde.org/announcements/announce-4.12.1.php + +------------------------------------------------------------------- Old: ---- okular-4.12.0.tar.xz New: ---- okular-4.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ okular.spec ++++++ --- /var/tmp/diff_new_pack.zitOS7/_old 2014-01-27 11:16:10.000000000 +0100 +++ /var/tmp/diff_new_pack.zitOS7/_new 2014-01-27 11:16:10.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package okular # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: okular -Version: 4.12.0 +Version: 4.12.1 Release: 0 Summary: Document Viewer License: GPL-2.0+ ++++++ okular-4.12.0.tar.xz -> okular-4.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.12.0/VERSION new/okular-4.12.1/VERSION --- old/okular-4.12.0/VERSION 2013-12-11 20:14:18.000000000 +0100 +++ new/okular-4.12.1/VERSION 2014-01-09 00:27:35.000000000 +0100 @@ -1 +1 @@ -okular v0.18.0 +okular v0.18.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.12.0/core/document.cpp new/okular-4.12.1/core/document.cpp --- old/okular-4.12.0/core/document.cpp 2013-12-11 20:14:18.000000000 +0100 +++ new/okular-4.12.1/core/document.cpp 2014-01-09 00:27:35.000000000 +0100 @@ -3400,6 +3400,10 @@ void Document::resetSearch( int searchID ) { + // if we are closing down, don't bother doing anything + if ( !d->m_generator ) + return; + // check if searchID is present in runningSearches QMap< int, RunningSearch * >::iterator searchIt = d->m_searches.find( searchID ); if ( searchIt == d->m_searches.end() ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.12.0/core/fileprinter.cpp new/okular-4.12.1/core/fileprinter.cpp --- old/okular-4.12.0/core/fileprinter.cpp 2013-12-11 20:14:18.000000000 +0100 +++ new/okular-4.12.1/core/fileprinter.cpp 2014-01-09 00:27:35.000000000 +0100 @@ -430,7 +430,8 @@ } if ( version.startsWith( "lpr" ) ) { - return QStringList("-J") << printer.docName(); + const QString shortenedDocName = QString::fromUtf8(printer.docName().toUtf8().left(255)); + return QStringList("-J") << shortenedDocName; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.12.0/core/version.h new/okular-4.12.1/core/version.h --- old/okular-4.12.0/core/version.h 2013-12-11 20:14:18.000000000 +0100 +++ new/okular-4.12.1/core/version.h 2014-01-09 00:27:35.000000000 +0100 @@ -10,10 +10,10 @@ #ifndef _OKULAR_VERSION_H_ #define _OKULAR_VERSION_H_ -#define OKULAR_VERSION_STRING "0.18.0" +#define OKULAR_VERSION_STRING "0.18.1" #define OKULAR_VERSION_MAJOR 0 #define OKULAR_VERSION_MINOR 18 -#define OKULAR_VERSION_RELEASE 0 +#define OKULAR_VERSION_RELEASE 1 #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.12.0/generators/mobipocket/okularApplication_mobi.desktop new/okular-4.12.1/generators/mobipocket/okularApplication_mobi.desktop --- old/okular-4.12.0/generators/mobipocket/okularApplication_mobi.desktop 2013-12-11 20:14:18.000000000 +0100 +++ new/okular-4.12.1/generators/mobipocket/okularApplication_mobi.desktop 2014-01-09 00:27:35.000000000 +0100 @@ -138,6 +138,7 @@ X-KDE-Keywords[cs]=mobipocket X-KDE-Keywords[da]=mobipocket X-KDE-Keywords[de]=Mobipocket +X-KDE-Keywords[el]=mobipocket X-KDE-Keywords[es]=mobipocket X-KDE-Keywords[fi]=mobipocket X-KDE-Keywords[fr]=mobipocket diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.12.0/generators/ooo/converter.cpp new/okular-4.12.1/generators/ooo/converter.cpp --- old/okular-4.12.0/generators/ooo/converter.cpp 2013-12-11 20:14:18.000000000 +0100 +++ new/okular-4.12.1/generators/ooo/converter.cpp 2014-01-09 00:27:35.000000000 +0100 @@ -585,4 +585,4 @@ emit addAnnotation( annotation, position, position + 3 ); return true; -} \ No newline at end of file +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.12.0/generators/ooo/document.cpp new/okular-4.12.1/generators/ooo/document.cpp --- old/okular-4.12.0/generators/ooo/document.cpp 2013-12-11 20:14:18.000000000 +0100 +++ new/okular-4.12.1/generators/ooo/document.cpp 2014-01-09 00:27:35.000000000 +0100 @@ -65,28 +65,22 @@ mContent = file->data(); } - if ( !entries.contains( "styles.xml" ) ) { - setError( i18n( "Invalid document structure (styles.xml is missing)" ) ); - return false; + if ( entries.contains( "styles.xml" ) ) { + file = static_cast<const KArchiveFile*>( directory->entry( "styles.xml" ) ); + if ( mManifest->testIfEncrypted( "styles.xml" ) ) { + mStyles = mManifest->decryptFile( "styles.xml", file->data() ); + } else { + mStyles = file->data(); + } } - file = static_cast<const KArchiveFile*>( directory->entry( "styles.xml" ) ); - if ( mManifest->testIfEncrypted( "styles.xml" ) ) { - mStyles = mManifest->decryptFile( "styles.xml", file->data() ); - } else { - mStyles = file->data(); - } - - if ( !entries.contains( "meta.xml" ) ) { - setError( i18n( "Invalid document structure (meta.xml is missing)" ) ); - return false; - } - - file = static_cast<const KArchiveFile*>( directory->entry( "meta.xml" ) ); - if ( mManifest->testIfEncrypted( "meta.xml" ) ) { - mMeta = mManifest->decryptFile( "meta.xml", file->data() ); - } else { - mMeta = file->data(); + if ( entries.contains( "meta.xml" ) ) { + file = static_cast<const KArchiveFile*>( directory->entry( "meta.xml" ) ); + if ( mManifest->testIfEncrypted( "meta.xml" ) ) { + mMeta = mManifest->decryptFile( "meta.xml", file->data() ); + } else { + mMeta = file->data(); + } } if ( entries.contains( "Pictures" ) ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.12.0/generators/ooo/styleparser.cpp new/okular-4.12.1/generators/ooo/styleparser.cpp --- old/okular-4.12.0/generators/ooo/styleparser.cpp 2013-12-11 20:14:18.000000000 +0100 +++ new/okular-4.12.1/generators/ooo/styleparser.cpp 2014-01-09 00:27:35.000000000 +0100 @@ -70,6 +70,9 @@ bool StyleParser::parseStyleFile() { + if ( mDocument->styles().isEmpty() ) + return true; + QXmlSimpleReader reader; QXmlInputSource source; @@ -106,6 +109,9 @@ bool StyleParser::parseMetaFile() { + if ( mDocument->meta().isEmpty() ) + return true; + QXmlSimpleReader reader; QXmlInputSource source; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.12.0/part.cpp new/okular-4.12.1/part.cpp --- old/okular-4.12.0/part.cpp 2013-12-11 20:14:18.000000000 +0100 +++ new/okular-4.12.1/part.cpp 2014-01-09 00:27:35.000000000 +0100 @@ -1238,7 +1238,7 @@ m_showProperties->setEnabled( ok ); bool hasEmbeddedFiles = ok && m_document->embeddedFiles() && m_document->embeddedFiles()->count() > 0; if ( m_showEmbeddedFiles ) m_showEmbeddedFiles->setEnabled( hasEmbeddedFiles ); - m_topMessage->setVisible( hasEmbeddedFiles ); + m_topMessage->setVisible( hasEmbeddedFiles && Okular::Settings::showOSD() ); // Warn the user that XFA forms are not supported yet (NOTE: poppler generator only) if ( ok && m_document->metaData( "HasUnsupportedXfaForm" ).toBool() == true ) @@ -2268,6 +2268,8 @@ return; bool reallyShow = false; + const bool currentPage = page && page->number() == m_document->viewport().pageNumber; + if (!m_actionsSearched) { // the quest for options_show_menubar @@ -2300,7 +2302,8 @@ if (page) { popup->addTitle( i18n( "Page %1", page->number() + 1 ) ); - if ( m_document->bookmarkManager()->isBookmarked( m_document->viewport() ) ) + if ( ( !currentPage && m_document->bookmarkManager()->isBookmarked( page->number() ) ) || + ( currentPage && m_document->bookmarkManager()->isBookmarked( m_document->viewport() ) ) ) removeBookmark = popup->addAction( KIcon("edit-delete-bookmark"), i18n("Remove Bookmark") ); else addBookmark = popup->addAction( KIcon("bookmark-new"), i18n("Add Bookmark") ); @@ -2332,9 +2335,24 @@ QAction *res = popup->exec(point); if (res) { - if (res == addBookmark) m_document->bookmarkManager()->addBookmark( m_document->viewport() ); - else if (res == removeBookmark) m_document->bookmarkManager()->removeBookmark( m_document->viewport() ); - else if (res == fitPageWidth) m_pageView->fitPageWidth( page->number() ); + if (res == addBookmark) + { + if (currentPage) + m_document->bookmarkManager()->addBookmark( m_document->viewport() ); + else + m_document->bookmarkManager()->addBookmark( page->number() ); + } + else if (res == removeBookmark) + { + if (currentPage) + m_document->bookmarkManager()->removeBookmark( m_document->viewport() ); + else + m_document->bookmarkManager()->removeBookmark( page->number() ); + } + else if (res == fitPageWidth) + { + m_pageView->fitPageWidth( page->number() ); + } } } delete popup; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
