Hello community, here is the log from the commit of package okular for openSUSE:Factory checked in at 2013-06-11 06:08:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-16 18:12:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.okular.new/okular.changes 2013-06-11 09:34:48.000000000 +0200 @@ -1,0 +2,8 @@ +Sat Jun 1 09:46:17 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.10.4 + * Bugfix release + * See http://www.kde.org/announcements/announce-4.10.4.php + * resolves bnc#8122760 + +------------------------------------------------------------------- Old: ---- okular-4.10.3.tar.xz New: ---- okular-4.10.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ okular.spec ++++++ --- /var/tmp/diff_new_pack.5mRjay/_old 2013-06-11 09:34:48.000000000 +0200 +++ /var/tmp/diff_new_pack.5mRjay/_new 2013-06-11 09:34:48.000000000 +0200 @@ -17,7 +17,7 @@ Name: okular -Version: 4.10.3 +Version: 4.10.4 Release: 0 Summary: Document Viewer License: GPL-2.0+ ++++++ okular-4.10.3.tar.xz -> okular-4.10.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.10.3/VERSION new/okular-4.10.4/VERSION --- old/okular-4.10.3/VERSION 2013-05-03 06:40:58.000000000 +0200 +++ new/okular-4.10.4/VERSION 2013-05-28 21:28:26.000000000 +0200 @@ -1 +1 @@ -okular v0.16.3 +okular v0.16.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.10.3/core/annotations.cpp new/okular-4.10.4/core/annotations.cpp --- old/okular-4.10.3/core/annotations.cpp 2013-05-03 06:40:54.000000000 +0200 +++ new/okular-4.10.4/core/annotations.cpp 2013-05-28 21:28:26.000000000 +0200 @@ -92,13 +92,17 @@ QRect AnnotationUtils::annotationGeometry( const Annotation * ann, double scaledWidth, double scaledHeight ) { + const QRect rect = ann->transformedBoundingRectangle().geometry( (int)scaledWidth, (int)scaledHeight ); if ( ann->subType() == Annotation::AText && ( ( (TextAnnotation*)ann )->textType() == TextAnnotation::Linked ) ) { - return QRect( (int)( ann->transformedBoundingRectangle().left * scaledWidth ), - (int)( ann->transformedBoundingRectangle().top * scaledHeight ), 24, 24 ); + // To be honest i have no clue of why the 24,24 is here, maybe to make sure it's not too small? + // But why only for linked text? + const QRect rect24 = QRect( (int)( ann->transformedBoundingRectangle().left * scaledWidth ), + (int)( ann->transformedBoundingRectangle().top * scaledHeight ), 24, 24 ); + return rect24.united(rect); } - return ann->transformedBoundingRectangle().geometry( (int)scaledWidth, (int)scaledHeight ); + return rect; } //END AnnotationUtils implementation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.10.3/core/version.h new/okular-4.10.4/core/version.h --- old/okular-4.10.3/core/version.h 2013-05-03 06:40:58.000000000 +0200 +++ new/okular-4.10.4/core/version.h 2013-05-28 21:28:26.000000000 +0200 @@ -10,10 +10,10 @@ #ifndef _OKULAR_VERSION_H_ #define _OKULAR_VERSION_H_ -#define OKULAR_VERSION_STRING "0.16.3" +#define OKULAR_VERSION_STRING "0.16.4" #define OKULAR_VERSION_MAJOR 0 #define OKULAR_VERSION_MINOR 16 -#define OKULAR_VERSION_RELEASE 3 +#define OKULAR_VERSION_RELEASE 4 #define OKULAR_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) #define OKULAR_VERSION \ Files old/okular-4.10.3/doc/index.cache.bz2 and new/okular-4.10.4/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.10.3/generators/comicbook/okularApplication_comicbook.desktop new/okular-4.10.4/generators/comicbook/okularApplication_comicbook.desktop --- old/okular-4.10.3/generators/comicbook/okularApplication_comicbook.desktop 2013-05-03 06:40:54.000000000 +0200 +++ new/okular-4.10.4/generators/comicbook/okularApplication_comicbook.desktop 2013-05-29 09:16:30.000000000 +0200 @@ -138,7 +138,7 @@ X-KDE-Keywords[ca@valencia]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[cs]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[da]=cbr,cbz,cbt,Comic Book -X-KDE-Keywords[de]=cbr, cbz, cbt, Comic Book +X-KDE-Keywords[de]=cbr, cbz, cbt, Comicbook X-KDE-Keywords[el]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[es]=cbr, cbz, cbt, libro de cómic X-KDE-Keywords[et]=cbr, cbz, cbt, Comic Book, koomiks diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.10.3/generators/fictionbook/libokularGenerator_fb.desktop new/okular-4.10.4/generators/fictionbook/libokularGenerator_fb.desktop --- old/okular-4.10.3/generators/fictionbook/libokularGenerator_fb.desktop 2013-05-03 06:40:54.000000000 +0200 +++ new/okular-4.10.4/generators/fictionbook/libokularGenerator_fb.desktop 2013-05-29 09:16:30.000000000 +0200 @@ -9,7 +9,7 @@ Name[ca@valencia]=Document FictionBook Name[cs]=FictionBook dokument Name[da]=FictionBook-dokument -Name[de]=Fictionbook-Dokument +Name[de]=FictionBook-Dokument Name[el]=Έγγραφο FictionBook Name[en_GB]=FictionBook document Name[eo]=FictionBook dokumento @@ -70,7 +70,7 @@ Comment[ca@valencia]=Dorsal de FictionBook per a l'Okular Comment[cs]=Implementace FictionBook pro Okular Comment[da]=FictionBook-motor til Okular -Comment[de]=Anzeigemodul für Fictionbook in Okular +Comment[de]=Anzeigemodul für FictionBook in Okular Comment[el]=Σύστημα υποστήριξης FictionBook για το Okular Comment[en_GB]=FictionBook backend for Okular Comment[es]=Motor FictionBook para Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.10.3/generators/poppler/generator_pdf.cpp new/okular-4.10.4/generators/poppler/generator_pdf.cpp --- old/okular-4.10.3/generators/poppler/generator_pdf.cpp 2013-05-03 06:40:54.000000000 +0200 +++ new/okular-4.10.4/generators/poppler/generator_pdf.cpp 2013-05-28 21:28:26.000000000 +0200 @@ -1763,7 +1763,7 @@ } const char *name = synctex_scanner_get_name( synctex_scanner, synctex_node_tag( node ) ); - Okular::SourceReference * sourceRef = new Okular::SourceReference( QString::fromLocal8Bit( name ), line, col ); + Okular::SourceReference * sourceRef = new Okular::SourceReference( QFile::decodeName( name ), line, col ); return sourceRef; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.10.3/generators/spectre/okularApplication_ghostview.desktop new/okular-4.10.4/generators/spectre/okularApplication_ghostview.desktop --- old/okular-4.10.3/generators/spectre/okularApplication_ghostview.desktop 2013-05-03 06:40:58.000000000 +0200 +++ new/okular-4.10.4/generators/spectre/okularApplication_ghostview.desktop 2013-05-28 21:28:26.000000000 +0200 @@ -138,9 +138,11 @@ X-KDE-Keywords[el]=PS, PostScript X-KDE-Keywords[es]=PS, PostScript X-KDE-Keywords[fi]=PS, PostScript +X-KDE-Keywords[fr]=PS, PostScript X-KDE-Keywords[gl]=PS, Ghostscript X-KDE-Keywords[hu]=PS, PostScript X-KDE-Keywords[ia]=PS, PostScript +X-KDE-Keywords[is]=PS, PostScript X-KDE-Keywords[it]=PS, PostScript X-KDE-Keywords[kk]=PS, PostScript X-KDE-Keywords[lt]=PS, PostScript diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.10.3/part.cpp new/okular-4.10.4/part.cpp --- old/okular-4.10.3/part.cpp 2013-05-03 06:40:54.000000000 +0200 +++ new/okular-4.10.4/part.cpp 2013-05-28 21:28:26.000000000 +0200 @@ -184,37 +184,48 @@ static QString compressedMimeFor( const QString& mime_to_check ) { + // The compressedMimeMap is here in case you have a very old shared mime database + // that doesn't have inheritance info for things like gzeps, etc + // Otherwise the "is()" calls below are just good enough static QHash< QString, QString > compressedMimeMap; + static bool supportBzip = false; + static bool supportXz = false; + const QString app_gzip( QString::fromLatin1( "application/x-gzip" ) ); + const QString app_bzip( QString::fromLatin1( "application/x-bzip" ) ); + const QString app_xz( QString::fromLatin1( "application/x-xz" ) ); if ( compressedMimeMap.isEmpty() ) { std::auto_ptr< KFilterBase > f; - compressedMimeMap[ QString::fromLatin1( "application/x-gzip" ) ] = - QString::fromLatin1( "application/x-gzip" ); - compressedMimeMap[ QString::fromLatin1( "image/x-gzeps" ) ] = - QString::fromLatin1( "application/x-gzip" ); + compressedMimeMap[ QString::fromLatin1( "image/x-gzeps" ) ] = app_gzip; // check we can read bzip2-compressed files - f.reset( KFilterBase::findFilterByMimeType( QString::fromLatin1( "application/x-bzip" ) ) ); + f.reset( KFilterBase::findFilterByMimeType( app_bzip ) ); if ( f.get() ) { - const QString app_bzip( QString::fromLatin1( "application/x-bzip" ) ); - compressedMimeMap[ app_bzip ] = app_bzip; + supportBzip = true; compressedMimeMap[ QString::fromLatin1( "application/x-bzpdf" ) ] = app_bzip; compressedMimeMap[ QString::fromLatin1( "application/x-bzpostscript" ) ] = app_bzip; compressedMimeMap[ QString::fromLatin1( "application/x-bzdvi" ) ] = app_bzip; compressedMimeMap[ QString::fromLatin1( "image/x-bzeps" ) ] = app_bzip; } // check we can read XZ-compressed files - f.reset( KFilterBase::findFilterByMimeType( QString::fromLatin1( "application/x-xz" ) ) ); + f.reset( KFilterBase::findFilterByMimeType( app_xz ) ); if ( f.get() ) { - const QString app_xz( QString::fromLatin1( "application/x-xz" ) ); - compressedMimeMap[ app_xz ] = app_xz; + supportXz = true; } } QHash< QString, QString >::const_iterator it = compressedMimeMap.constFind( mime_to_check ); if ( it != compressedMimeMap.constEnd() ) return it.value(); + KMimeType::Ptr mime = KMimeType::mimeType( mime_to_check ); + if ( mime->is( app_gzip ) ) + return app_gzip; + else if ( supportBzip && mime->is( app_bzip ) ) + return app_bzip; + else if ( supportXz && mime->is( app_xz ) ) + return app_xz; + return QString(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.10.3/ui/pageview.cpp new/okular-4.10.4/ui/pageview.cpp --- old/okular-4.10.3/ui/pageview.cpp 2013-05-03 06:40:54.000000000 +0200 +++ new/okular-4.10.4/ui/pageview.cpp 2013-05-28 21:28:26.000000000 +0200 @@ -807,9 +807,6 @@ void PageView::selectAll() { - if ( Okular::Settings::mouseMode() == Okular::Settings::EnumMouseMode::TextSelect ) - return; - QVector< PageViewItem * >::const_iterator it = d->items.constBegin(), itEnd = d->items.constEnd(); for ( ; it < itEnd; ++it ) { -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
