Hello community, here is the log from the commit of package okular for openSUSE:Factory checked in at 2014-06-19 13:16: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-05-22 06:51:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.okular.new/okular.changes 2014-06-19 13:16:32.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Jun 8 18:37:01 UTC 2014 - [email protected] + +- Update to 4.13.2 + * KDE 4.13 release + * See http://www.kde.org/announcements/announce-4.13.2.php + +------------------------------------------------------------------- Old: ---- okular-4.13.1.tar.xz New: ---- okular-4.13.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ okular.spec ++++++ --- /var/tmp/diff_new_pack.AmS8jo/_old 2014-06-19 13:16:33.000000000 +0200 +++ /var/tmp/diff_new_pack.AmS8jo/_new 2014-06-19 13:16:33.000000000 +0200 @@ -17,7 +17,7 @@ Name: okular -Version: 4.13.1 +Version: 4.13.2 Release: 0 Summary: Document Viewer License: GPL-2.0+ ++++++ okular-4.13.1.tar.xz -> okular-4.13.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.13.1/VERSION new/okular-4.13.2/VERSION --- old/okular-4.13.1/VERSION 2014-05-04 19:43:44.000000000 +0200 +++ new/okular-4.13.2/VERSION 2014-06-04 23:42:42.000000000 +0200 @@ -1 +1 @@ -okular v0.19.1 +okular v0.19.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.13.1/core/document.cpp new/okular-4.13.2/core/document.cpp --- old/okular-4.13.1/core/document.cpp 2014-05-04 19:43:44.000000000 +0200 +++ new/okular-4.13.2/core/document.cpp 2014-06-04 23:42:42.000000000 +0200 @@ -109,7 +109,7 @@ } KTemporaryFile document; - QString metadataFileName; + KTemporaryFile metadataFile; }; struct RunningSearch @@ -613,12 +613,12 @@ if ( m_xmlFileName.isEmpty() ) return; - loadDocumentInfo( m_xmlFileName ); + QFile infoFile( m_xmlFileName ); + loadDocumentInfo( infoFile ); } -void DocumentPrivate::loadDocumentInfo( const QString &fileName ) +void DocumentPrivate::loadDocumentInfo( QFile &infoFile ) { - QFile infoFile( fileName ); if ( !infoFile.exists() || !infoFile.open( QIODevice::ReadOnly ) ) return; @@ -936,7 +936,9 @@ QApplication::setOverrideCursor( Qt::WaitCursor ); - m_generator->setDPI(Utils::realDpi(m_widget)); + const QSizeF dpi = Utils::realDpi(m_widget); + kDebug() << "Output DPI:" << dpi; + m_generator->setDPI(dpi); bool openOk = false; if ( !isstdin ) @@ -2263,7 +2265,7 @@ // 2. load Additional Data (bookmarks, local annotations and metadata) about the document if ( d->m_archiveData ) { - d->loadDocumentInfo( d->m_archiveData->metadataFileName ); + d->loadDocumentInfo( d->m_archiveData->metadataFile ); d->m_annotationsNeedSaveAs = true; } else @@ -3320,11 +3322,6 @@ search->continueOnPage = -1; searchIt = d->m_searches.insert( searchID, search ); } - if (d->m_lastSearchID != searchID) - { - resetSearch(d->m_lastSearchID); - } - d->m_lastSearchID = searchID; RunningSearch * s = *searchIt; // update search structure @@ -4197,19 +4194,15 @@ archiveData->document.close(); } - std::auto_ptr< KTemporaryFile > tempMetadataFileName; const KArchiveEntry * metadataEntry = mainDir->entry( metadataFileName ); if ( metadataEntry && metadataEntry->isFile() ) { std::auto_ptr< QIODevice > metadataEntryDevice( static_cast< const KZipFileEntry * >( metadataEntry )->createDevice() ); - tempMetadataFileName.reset( new KTemporaryFile() ); - tempMetadataFileName->setSuffix( ".xml" ); - tempMetadataFileName->setAutoRemove( false ); - if ( tempMetadataFileName->open() ) - { - copyQIODevice( metadataEntryDevice.get(), tempMetadataFileName.get() ); - archiveData->metadataFileName = tempMetadataFileName->fileName(); - tempMetadataFileName->close(); + archiveData->metadataFile.setSuffix( ".xml" ); + if ( archiveData->metadataFile.open() ) + { + copyQIODevice( metadataEntryDevice.get(), &archiveData->metadataFile ); + archiveData->metadataFile.close(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.13.1/core/document_p.h new/okular-4.13.2/core/document_p.h --- old/okular-4.13.1/core/document_p.h 2014-05-04 19:43:44.000000000 +0200 +++ new/okular-4.13.2/core/document_p.h 2014-06-04 23:42:42.000000000 +0200 @@ -29,6 +29,7 @@ class QUndoStack; class QEventLoop; +class QFile; class QTimer; class KTemporaryFile; @@ -85,7 +86,6 @@ public: DocumentPrivate( Document *parent ) : m_parent( parent ), - m_lastSearchID( -1 ), m_tempFile( 0 ), m_docSize( -1 ), m_allocatedPixmapsTotalMemory( 0 ), @@ -122,7 +122,7 @@ qulonglong getTotalMemory(); qulonglong getFreeMemory( qulonglong *freeSwap = 0 ); void loadDocumentInfo(); - void loadDocumentInfo( const QString &fileName ); + void loadDocumentInfo( QFile &infoFile ); void loadViewsInfo( View *view, const QDomElement &e ); void saveViewsInfo( View *view, QDomElement &e ) const; QString giveAbsolutePath( const QString & fileName ) const; @@ -195,7 +195,6 @@ // find descriptors, mapped by ID (we handle multiple searches) QMap< int, RunningSearch * > m_searches; - int m_lastSearchID; bool m_searchCancelled; // needed because for remote documents docFileName is a local file and diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.13.1/core/utils.cpp new/okular-4.13.2/core/utils.cpp --- old/okular-4.13.1/core/utils.cpp 2014-05-04 19:43:44.000000000 +0200 +++ new/okular-4.13.2/core/utils.cpp 2014-06-04 23:42:42.000000000 +0200 @@ -79,6 +79,7 @@ { const QDesktopWidget* w = QApplication::desktop(); if (w->width() > 0 && w->widthMM() > 0) { + kDebug() << "Pix:" << w->width() << "MM:" << w->widthMM(); return (double(w->width()) * 25.4) / double(w->widthMM()); } else { return dpiX(); @@ -89,6 +90,7 @@ { const QDesktopWidget* w = QApplication::desktop(); if (w->height() > 0 && w->heightMM() > 0) { + kDebug() << "Pix:" << w->height() << "MM:" << w->heightMM(); return (double(w->height()) * 25.4) / double(w->heightMM()); } else { return dpiY(); @@ -148,10 +150,17 @@ kDebug() << "Output is vertical, transposing DPI rect"; res.transpose(); } - kDebug() << "Output DPI is " << res; return res; } } + else + { + kDebug() << "Didn't find a KScreen selectedOutput to calculate DPI. Falling back"; + } + } + else + { + kDebug() << "Didn't find a KScreen config to calculate DPI. Falling back"; } #endif } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.13.1/core/version.h new/okular-4.13.2/core/version.h --- old/okular-4.13.1/core/version.h 2014-05-04 19:43:44.000000000 +0200 +++ new/okular-4.13.2/core/version.h 2014-06-04 23:42:42.000000000 +0200 @@ -10,10 +10,10 @@ #ifndef _OKULAR_VERSION_H_ #define _OKULAR_VERSION_H_ -#define OKULAR_VERSION_STRING "0.19.1" +#define OKULAR_VERSION_STRING "0.19.2" #define OKULAR_VERSION_MAJOR 0 #define OKULAR_VERSION_MINOR 19 -#define OKULAR_VERSION_RELEASE 1 +#define OKULAR_VERSION_RELEASE 2 #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.13.1/generators/mobipocket/okularApplication_mobi.desktop new/okular-4.13.2/generators/mobipocket/okularApplication_mobi.desktop --- old/okular-4.13.1/generators/mobipocket/okularApplication_mobi.desktop 2014-05-04 19:43:44.000000000 +0200 +++ new/okular-4.13.2/generators/mobipocket/okularApplication_mobi.desktop 2014-06-04 23:42:42.000000000 +0200 @@ -141,6 +141,7 @@ X-KDE-Keywords[de]=Mobipocket X-KDE-Keywords[el]=mobipocket X-KDE-Keywords[es]=mobipocket +X-KDE-Keywords[et]=mobipocket X-KDE-Keywords[fi]=mobipocket X-KDE-Keywords[fr]=mobipocket X-KDE-Keywords[gl]=mobipocket diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.13.1/generators/spectre/active-documentviewer_ghostview.desktop new/okular-4.13.2/generators/spectre/active-documentviewer_ghostview.desktop --- old/okular-4.13.1/generators/spectre/active-documentviewer_ghostview.desktop 2014-05-04 19:43:44.000000000 +0200 +++ new/okular-4.13.2/generators/spectre/active-documentviewer_ghostview.desktop 2014-06-04 23:42:42.000000000 +0200 @@ -153,6 +153,7 @@ X-KDE-Keywords[de]=PS, PostScript X-KDE-Keywords[el]=PS, PostScript X-KDE-Keywords[es]=PS, PostScript +X-KDE-Keywords[et]=PS, PostScript X-KDE-Keywords[fi]=PS, PostScript X-KDE-Keywords[fr]=PS, PostScript X-KDE-Keywords[gl]=PS, PostScript diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.13.1/generators/spectre/okularApplication_ghostview.desktop new/okular-4.13.2/generators/spectre/okularApplication_ghostview.desktop --- old/okular-4.13.1/generators/spectre/okularApplication_ghostview.desktop 2014-05-04 19:43:44.000000000 +0200 +++ new/okular-4.13.2/generators/spectre/okularApplication_ghostview.desktop 2014-06-04 23:42:42.000000000 +0200 @@ -139,6 +139,7 @@ X-KDE-Keywords[de]=PS, PostScript X-KDE-Keywords[el]=PS, PostScript X-KDE-Keywords[es]=PS, PostScript +X-KDE-Keywords[et]=PS, PostScript X-KDE-Keywords[fi]=PS, PostScript X-KDE-Keywords[fr]=PS, PostScript X-KDE-Keywords[gl]=PS, PostScript diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.13.1/generators/txt/active-documentviewer_txt.desktop new/okular-4.13.2/generators/txt/active-documentviewer_txt.desktop --- old/okular-4.13.1/generators/txt/active-documentviewer_txt.desktop 2014-05-04 19:43:44.000000000 +0200 +++ new/okular-4.13.2/generators/txt/active-documentviewer_txt.desktop 2014-06-04 23:42:42.000000000 +0200 @@ -153,6 +153,7 @@ X-KDE-Keywords[de]=Text X-KDE-Keywords[el]=txt X-KDE-Keywords[es]=txt +X-KDE-Keywords[et]=txt X-KDE-Keywords[fi]=txt X-KDE-Keywords[fr]=txt X-KDE-Keywords[gl]=txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.13.1/generators/txt/libokularGenerator_txt.desktop new/okular-4.13.2/generators/txt/libokularGenerator_txt.desktop --- old/okular-4.13.1/generators/txt/libokularGenerator_txt.desktop 2014-05-04 19:43:44.000000000 +0200 +++ new/okular-4.13.2/generators/txt/libokularGenerator_txt.desktop 2014-06-04 23:42:42.000000000 +0200 @@ -10,6 +10,7 @@ Name[de]=Text Name[el]=txt Name[es]=txt +Name[et]=txt Name[fi]=txt Name[fr]=txt Name[gl]=txt @@ -52,6 +53,7 @@ Comment[de]=Anzeigemodul für Text in Okular Comment[el]=Σύστημα υποστήριξης txt για το Okular Comment[es]=Motor Txt para Okular +Comment[et]=Okulari txt-i taustaprogramm Comment[fi]=TXT-taustaosa Okularille Comment[fr]=Moteur Txt pour Okular Comment[gl]=Infraestrutura de Txt para Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.13.1/generators/txt/okularApplication_txt.desktop new/okular-4.13.2/generators/txt/okularApplication_txt.desktop --- old/okular-4.13.1/generators/txt/okularApplication_txt.desktop 2014-05-04 19:43:44.000000000 +0200 +++ new/okular-4.13.2/generators/txt/okularApplication_txt.desktop 2014-06-04 23:42:42.000000000 +0200 @@ -140,6 +140,7 @@ X-KDE-Keywords[de]=Text X-KDE-Keywords[el]=txt X-KDE-Keywords[es]=txt +X-KDE-Keywords[et]=txt X-KDE-Keywords[fi]=txt X-KDE-Keywords[fr]=txt X-KDE-Keywords[gl]=txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.13.1/ui/fileprinterpreview.cpp new/okular-4.13.2/ui/fileprinterpreview.cpp --- old/okular-4.13.1/ui/fileprinterpreview.cpp 2014-05-04 19:43:44.000000000 +0200 +++ new/okular-4.13.2/ui/fileprinterpreview.cpp 2014-06-04 23:42:42.000000000 +0200 @@ -69,8 +69,12 @@ kDebug(500) << "querying trader for application/ps service"; KPluginFactory *factory(0); + /* Explicitly look for the Okular/Ghostview part: no other PostScript + parts are available now; other parts which handles text are not + suitable here (PostScript source code) */ KService::List offers = - KMimeTypeTrader::self()->query("application/postscript", "KParts/ReadOnlyPart"); + KMimeTypeTrader::self()->query("application/postscript", "KParts/ReadOnlyPart", + "[DesktopEntryName] == 'okularghostview'"); KService::List::ConstIterator it = offers.constBegin(); while (!factory && it != offers.constEnd()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.13.1/ui/formwidgets.cpp new/okular-4.13.2/ui/formwidgets.cpp --- old/okular-4.13.1/ui/formwidgets.cpp 2014-05-04 19:43:44.000000000 +0200 +++ new/okular-4.13.2/ui/formwidgets.cpp 2014-06-04 23:42:42.000000000 +0200 @@ -319,7 +319,10 @@ setVisible( m_form->isVisible() ); setCursor( Qt::ArrowCursor ); - connect( this, SIGNAL(clicked()), this, SLOT(slotClicked()) ); + if ( !m_form->isReadOnly() ) + { + connect( this, SIGNAL(clicked()), this, SLOT(slotClicked()) ); + } } void PushButtonEdit::slotClicked() @@ -396,8 +399,11 @@ m_prevCursorPos = cursorPosition(); m_prevAnchorPos = cursorPosition(); - connect( this, SIGNAL( textEdited( QString ) ), this, SLOT( slotChanged() ) ); - connect( this, SIGNAL( cursorPositionChanged( int, int ) ), this, SLOT( slotChanged() ) ); + if ( !m_form->isReadOnly() ) + { + connect( this, SIGNAL( textEdited( QString ) ), this, SLOT( slotChanged() ) ); + connect( this, SIGNAL( cursorPositionChanged( int, int ) ), this, SLOT( slotChanged() ) ); + } setVisible( m_form->isVisible() ); } @@ -510,12 +516,13 @@ setReadOnly( m_form->isReadOnly() ); setUndoRedoEnabled( false ); - connect( this, SIGNAL( textChanged() ), this, SLOT( slotChanged() ) ); - connect( this, SIGNAL( cursorPositionChanged() ), this, SLOT( slotChanged() ) ); - - connect( this, SIGNAL( aboutToShowContextMenu( QMenu* ) ), - this, SLOT( slotUpdateUndoAndRedoInContextMenu( QMenu* ) ) ); - + if ( !m_form->isReadOnly() ) + { + connect( this, SIGNAL( textChanged() ), this, SLOT( slotChanged() ) ); + connect( this, SIGNAL( cursorPositionChanged() ), this, SLOT( slotChanged() ) ); + connect( this, SIGNAL( aboutToShowContextMenu( QMenu* ) ), + this, SLOT( slotUpdateUndoAndRedoInContextMenu( QMenu* ) ) ); + } m_prevCursorPos = textCursor().position(); m_prevAnchorPos = textCursor().anchor(); setVisible( m_form->isVisible() ); @@ -622,8 +629,11 @@ m_prevCursorPos = lineEdit()->cursorPosition(); m_prevAnchorPos = lineEdit()->cursorPosition(); - connect( this, SIGNAL( textChanged( QString ) ), this, SLOT( slotChanged() ) ); - connect( lineEdit(), SIGNAL( cursorPositionChanged( int, int ) ), this, SLOT( slotChanged() ) ); + if ( !m_form->isReadOnly() ) + { + connect( this, SIGNAL( textChanged( QString ) ), this, SLOT( slotChanged() ) ); + connect( lineEdit(), SIGNAL( cursorPositionChanged( int, int ) ), this, SLOT( slotChanged() ) ); + } setVisible( m_form->isVisible() ); } @@ -757,7 +767,10 @@ } setEnabled( !m_form->isReadOnly() ); - connect( this, SIGNAL(itemSelectionChanged()), this, SLOT(slotSelectionChanged()) ); + if ( !m_form->isReadOnly() ) + { + connect( this, SIGNAL(itemSelectionChanged()), this, SLOT(slotSelectionChanged()) ); + } setVisible( m_form->isVisible() ); setCursor( Qt::ArrowCursor ); } @@ -816,9 +829,12 @@ if ( m_form->isEditable() && !m_form->editChoice().isEmpty() ) lineEdit()->setText( m_form->editChoice() ); - connect( this, SIGNAL(currentIndexChanged(int)), this, SLOT(slotValueChanged()) ); - connect( this, SIGNAL(editTextChanged(QString)), this, SLOT(slotValueChanged()) ); - connect( lineEdit(), SIGNAL(cursorPositionChanged(int,int)), this, SLOT(slotValueChanged())); + if ( !m_form->isReadOnly() ) + { + connect( this, SIGNAL(currentIndexChanged(int)), this, SLOT(slotValueChanged()) ); + connect( this, SIGNAL(editTextChanged(QString)), this, SLOT(slotValueChanged()) ); + connect( lineEdit(), SIGNAL(cursorPositionChanged(int,int)), this, SLOT(slotValueChanged()) ); + } setVisible( m_form->isVisible() ); setCursor( Qt::ArrowCursor ); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
