Hello community, here is the log from the commit of package okular for openSUSE:Factory checked in at 2013-05-16 18:12:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-04-18 10:38:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.okular.new/okular.changes 2013-05-16 18:12:05.000000000 +0200 @@ -1,0 +2,8 @@ +Sat May 4 17:02:08 UTC 2013 - [email protected] + +- Update to 4.10.3 + * Bugfix release + * See http://www.kde.org/announcements/announce-4.10.3.php + * resolves bnc#818500 + +------------------------------------------------------------------- Old: ---- okular-4.10.2.tar.xz New: ---- okular-4.10.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ okular.spec ++++++ --- /var/tmp/diff_new_pack.NbWooS/_old 2013-05-16 18:12:06.000000000 +0200 +++ /var/tmp/diff_new_pack.NbWooS/_new 2013-05-16 18:12:06.000000000 +0200 @@ -17,7 +17,7 @@ Name: okular -Version: 4.10.2 +Version: 4.10.3 Release: 0 Summary: Document Viewer License: GPL-2.0+ ++++++ okular-4.10.2.tar.xz -> okular-4.10.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.10.2/VERSION new/okular-4.10.3/VERSION --- old/okular-4.10.2/VERSION 2013-03-29 08:05:07.000000000 +0100 +++ new/okular-4.10.3/VERSION 2013-05-03 06:40:58.000000000 +0200 @@ -1 +1 @@ -okular v0.16.2 +okular v0.16.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.10.2/active/app/active-documentviewer.desktop new/okular-4.10.3/active/app/active-documentviewer.desktop --- old/okular-4.10.2/active/app/active-documentviewer.desktop 2013-03-29 08:05:07.000000000 +0100 +++ new/okular-4.10.3/active/app/active-documentviewer.desktop 2013-05-03 06:40:54.000000000 +0200 @@ -28,6 +28,7 @@ Name[pt]=Leitor Name[pt_BR]=Leitor Name[ro]=Cititor +Name[ru]=Просмотрщик Name[sk]=Čítačka Name[sl]=Bralnik Name[sr]=Читач diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.10.2/conf/settings.kcfgc new/okular-4.10.3/conf/settings.kcfgc --- old/okular-4.10.2/conf/settings.kcfgc 2013-03-01 08:03:09.000000000 +0100 +++ new/okular-4.10.3/conf/settings.kcfgc 2013-05-03 06:40:58.000000000 +0200 @@ -4,6 +4,5 @@ Inherits=SettingsCore Mutators=true Singleton=true -Visibility=OKULAR_EXPORT -IncludeFiles=core/okular_export.h, settings_core.h +IncludeFiles=settings_core.h MemberVariables=dpointer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.10.2/core/document.cpp new/okular-4.10.3/core/document.cpp --- old/okular-4.10.2/core/document.cpp 2013-03-01 08:03:09.000000000 +0100 +++ new/okular-4.10.3/core/document.cpp 2013-05-03 06:40:58.000000000 +0200 @@ -1294,8 +1294,6 @@ for ( ; it != itEnd; ++it ) { QSize size = (*it).m_pixmap->size(); - if ( (*it).m_rotation % 2 ) - size.transpose(); PixmapRequest * p = new PixmapRequest( it.key(), pageNumber, size.width(), size.height(), 1, true ); p->d->mForce = true; requestedPixmaps.push_back( p ); @@ -1797,7 +1795,7 @@ QByteArray filedata; qint64 document_size = -1; bool isstdin = url.fileName( KUrl::ObeyTrailingSlash ) == QLatin1String( "-" ); - bool loadingMimeByContent = false; + bool triedMimeFromFileContent = false; if ( !isstdin ) { if ( mime.count() <= 0 ) @@ -1815,23 +1813,23 @@ d->m_docFileName = docFile; if ( url.isLocalFile() && !d->m_archiveData ) { - QString fn = url.fileName(); - document_size = fileReadTest.size(); - fn = QString::number( document_size ) + '.' + fn + ".xml"; - QString newokular = "okular/docdata/" + fn; - QString newokularfile = KStandardDirs::locateLocal( "data", newokular ); - if ( !QFile::exists( newokularfile ) ) - { - QString oldkpdf = "kpdf/" + fn; - QString oldkpdffile = KStandardDirs::locateLocal( "data", oldkpdf ); - if ( QFile::exists( oldkpdffile ) ) + QString fn = url.fileName(); + document_size = fileReadTest.size(); + fn = QString::number( document_size ) + '.' + fn + ".xml"; + QString newokular = "okular/docdata/" + fn; + QString newokularfile = KStandardDirs::locateLocal( "data", newokular ); + if ( !QFile::exists( newokularfile ) ) { - // ### copy or move? - if ( !QFile::copy( oldkpdffile, newokularfile ) ) - return false; + QString oldkpdf = "kpdf/" + fn; + QString oldkpdffile = KStandardDirs::locateLocal( "data", oldkpdf ); + if ( QFile::exists( oldkpdffile ) ) + { + // ### copy or move? + if ( !QFile::copy( oldkpdffile, newokularfile ) ) + return false; + } } - } - d->m_xmlFileName = newokularfile; + d->m_xmlFileName = newokularfile; } } else @@ -1843,22 +1841,34 @@ if ( !mime || mime->name() == QLatin1String( "application/octet-stream" ) ) return false; document_size = filedata.size(); - loadingMimeByContent = true; + triedMimeFromFileContent = true; } // 0. load Generator // request only valid non-disabled plugins suitable for the mimetype QString constraint("([X-KDE-Priority] > 0) and (exist Library)") ; KService::List offers = KMimeTypeTrader::self()->query(mime->name(),"okular/Generator",constraint); - if ( offers.isEmpty() && !isstdin ) + if ( offers.isEmpty() && !triedMimeFromFileContent ) { KMimeType::Ptr newmime = KMimeType::findByFileContent( docFile ); - loadingMimeByContent = true; + triedMimeFromFileContent = true; if ( newmime->name() != mime->name() ) { mime = newmime; offers = KMimeTypeTrader::self()->query( mime->name(), "okular/Generator", constraint ); } + if ( offers.isEmpty() ) + { + // There's still no offers, do a final mime search based on the filename + // We need this becuase sometimes (e.g. when downloading from a webserver) the mimetype we + // use is the one feeded by the server, that may be wrong + newmime = KMimeType::findByUrl( docFile ); + if ( newmime->name() != mime->name() ) + { + mime = newmime; + offers = KMimeTypeTrader::self()->query( mime->name(), "okular/Generator", constraint ); + } + } } if (offers.isEmpty()) { @@ -1894,10 +1904,10 @@ KService::Ptr offer = offers.at( hRank ); // 1. load Document bool openOk = d->openDocumentInternal( offer, isstdin, docFile, filedata ); - if ( !openOk && !loadingMimeByContent ) + if ( !openOk && !triedMimeFromFileContent ) { KMimeType::Ptr newmime = KMimeType::findByFileContent( docFile ); - loadingMimeByContent = true; + triedMimeFromFileContent = true; if ( newmime->name() != mime->name() ) { mime = newmime; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.10.2/core/version.h new/okular-4.10.3/core/version.h --- old/okular-4.10.2/core/version.h 2013-03-29 08:05:07.000000000 +0100 +++ new/okular-4.10.3/core/version.h 2013-05-03 06:40:58.000000000 +0200 @@ -10,10 +10,10 @@ #ifndef _OKULAR_VERSION_H_ #define _OKULAR_VERSION_H_ -#define OKULAR_VERSION_STRING "0.16.2" +#define OKULAR_VERSION_STRING "0.16.3" #define OKULAR_VERSION_MAJOR 0 #define OKULAR_VERSION_MINOR 16 -#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 \ Files old/okular-4.10.2/doc/index.cache.bz2 and new/okular-4.10.3/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.10.2/generators/spectre/okularApplication_ghostview.desktop new/okular-4.10.3/generators/spectre/okularApplication_ghostview.desktop --- old/okular-4.10.2/generators/spectre/okularApplication_ghostview.desktop 2013-03-29 08:05:07.000000000 +0100 +++ new/okular-4.10.3/generators/spectre/okularApplication_ghostview.desktop 2013-05-03 06:40:58.000000000 +0200 @@ -137,12 +137,20 @@ X-KDE-Keywords[de]=PS, PostScript X-KDE-Keywords[el]=PS, PostScript X-KDE-Keywords[es]=PS, PostScript +X-KDE-Keywords[fi]=PS, PostScript +X-KDE-Keywords[gl]=PS, Ghostscript +X-KDE-Keywords[hu]=PS, PostScript X-KDE-Keywords[ia]=PS, PostScript X-KDE-Keywords[it]=PS, PostScript X-KDE-Keywords[kk]=PS, PostScript +X-KDE-Keywords[lt]=PS, PostScript +X-KDE-Keywords[mr]=पीएस, पोस्टस्क्रिप्ट +X-KDE-Keywords[nb]=PS, PostScript X-KDE-Keywords[nl]=PS, PostScript +X-KDE-Keywords[pl]=PS, PostScript X-KDE-Keywords[pt]=PS, PostScript X-KDE-Keywords[pt_BR]=PS, PostScript +X-KDE-Keywords[ru]=PS, PostScript X-KDE-Keywords[sk]=PS, PostScript X-KDE-Keywords[sr]=PS,PostScript,постскрипт,ПС X-KDE-Keywords[sr@ijekavian]=PS,PostScript,постскрипт,ПС -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
