Hello community, here is the log from the commit of package okular for openSUSE:Factory checked in at 2015-02-11 16:41:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-01-21 22:13:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.okular.new/okular.changes 2015-02-11 16:41:48.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Feb 1 11:11:23 UTC 2015 - [email protected] + +- Update to KDE Applications 14.12.2 + * KDE Applications 14.12.2 + * See https://www.kde.org/announcements/announce-applications-14.12.2.php + +------------------------------------------------------------------- Old: ---- okular-14.12.1.tar.xz New: ---- okular-14.12.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ okular.spec ++++++ --- /var/tmp/diff_new_pack.L9VDuG/_old 2015-02-11 16:41:49.000000000 +0100 +++ /var/tmp/diff_new_pack.L9VDuG/_new 2015-02-11 16:41:49.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package okular # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX 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: 14.12.1 +Version: 14.12.2 Release: 0 Summary: Document Viewer License: GPL-2.0+ ++++++ okular-14.12.1.tar.xz -> okular-14.12.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-14.12.1/VERSION new/okular-14.12.2/VERSION --- old/okular-14.12.1/VERSION 2015-01-07 00:17:35.000000000 +0100 +++ new/okular-14.12.2/VERSION 2015-01-29 19:52:52.000000000 +0100 @@ -1 +1 @@ -okular v0.21.1 +okular v0.21.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-14.12.1/core/version.h new/okular-14.12.2/core/version.h --- old/okular-14.12.1/core/version.h 2015-01-07 00:17:35.000000000 +0100 +++ new/okular-14.12.2/core/version.h 2015-01-29 19:52:52.000000000 +0100 @@ -10,10 +10,10 @@ #ifndef _OKULAR_VERSION_H_ #define _OKULAR_VERSION_H_ -#define OKULAR_VERSION_STRING "0.21.1" +#define OKULAR_VERSION_STRING "0.21.2" #define OKULAR_VERSION_MAJOR 0 #define OKULAR_VERSION_MINOR 21 -#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-14.12.1/generators/comicbook/active-documentviewer_comicbook.desktop new/okular-14.12.2/generators/comicbook/active-documentviewer_comicbook.desktop --- old/okular-14.12.1/generators/comicbook/active-documentviewer_comicbook.desktop 2015-01-07 00:17:35.000000000 +0100 +++ new/okular-14.12.2/generators/comicbook/active-documentviewer_comicbook.desktop 2015-01-29 19:52:52.000000000 +0100 @@ -196,6 +196,6 @@ X-KDE-Keywords[sv]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[tr]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[uk]=cbr,cbz,cbt,Comic Book,комікс -X-KDE-Keywords[x-test]=xxcbr, cbz, cbt, Comic Bookxx +X-KDE-Keywords[x-test]=xxcbrxx,xx cbzxx,xx cbtxx,xx Comic Bookxx X-KDE-Keywords[zh_CN]=cbr, cbz, cbt, Comic Book,漫画书,漫画,连环画 X-KDE-Keywords[zh_TW]=cbr, cbz, cbt, Comic Book diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-14.12.1/generators/comicbook/okularApplication_comicbook.desktop new/okular-14.12.2/generators/comicbook/okularApplication_comicbook.desktop --- old/okular-14.12.1/generators/comicbook/okularApplication_comicbook.desktop 2015-01-07 00:17:35.000000000 +0100 +++ new/okular-14.12.2/generators/comicbook/okularApplication_comicbook.desktop 2015-01-29 19:52:52.000000000 +0100 @@ -176,6 +176,6 @@ X-KDE-Keywords[sv]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[tr]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[uk]=cbr,cbz,cbt,Comic Book,комікс -X-KDE-Keywords[x-test]=xxcbr, cbz, cbt, Comic Bookxx +X-KDE-Keywords[x-test]=xxcbrxx,xx cbzxx,xx cbtxx,xx Comic Bookxx X-KDE-Keywords[zh_CN]=cbr, cbz, cbt, Comic Book,漫画书,漫画,连环画 X-KDE-Keywords[zh_TW]=cbr, cbz, cbt, Comic Book diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-14.12.1/generators/epub/active-documentviewer_epub.desktop new/okular-14.12.2/generators/epub/active-documentviewer_epub.desktop --- old/okular-14.12.1/generators/epub/active-documentviewer_epub.desktop 2015-01-07 00:17:35.000000000 +0100 +++ new/okular-14.12.2/generators/epub/active-documentviewer_epub.desktop 2015-01-29 19:52:52.000000000 +0100 @@ -196,6 +196,6 @@ X-KDE-Keywords[sv]=epub, e-bok X-KDE-Keywords[tr]=epub, e-book X-KDE-Keywords[uk]=epub,e-book,електронна,книга -X-KDE-Keywords[x-test]=xxepub, e-bookxx +X-KDE-Keywords[x-test]=xxepubxx,xx e-bookxx X-KDE-Keywords[zh_CN]=epub, e-book,电子书 X-KDE-Keywords[zh_TW]=epub, e-book diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-14.12.1/generators/epub/okularApplication_epub.desktop new/okular-14.12.2/generators/epub/okularApplication_epub.desktop --- old/okular-14.12.1/generators/epub/okularApplication_epub.desktop 2015-01-07 00:17:35.000000000 +0100 +++ new/okular-14.12.2/generators/epub/okularApplication_epub.desktop 2015-01-29 19:52:52.000000000 +0100 @@ -176,6 +176,6 @@ X-KDE-Keywords[sv]=epub, e-bok X-KDE-Keywords[tr]=epub, e-book X-KDE-Keywords[uk]=epub,e-book,електронна,книга -X-KDE-Keywords[x-test]=xxepub, e-bookxx +X-KDE-Keywords[x-test]=xxepubxx,xx e-bookxx X-KDE-Keywords[zh_CN]=epub, e-book,电子书 X-KDE-Keywords[zh_TW]=epub, e-book diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-14.12.1/generators/fictionbook/active-documentviewer_fb.desktop new/okular-14.12.2/generators/fictionbook/active-documentviewer_fb.desktop --- old/okular-14.12.1/generators/fictionbook/active-documentviewer_fb.desktop 2015-01-07 00:17:35.000000000 +0100 +++ new/okular-14.12.2/generators/fictionbook/active-documentviewer_fb.desktop 2015-01-29 19:52:52.000000000 +0100 @@ -196,6 +196,6 @@ X-KDE-Keywords[sv]=FictionBook, e-bok, fb2 X-KDE-Keywords[tr]=FictionBook, e-book, fb2 X-KDE-Keywords[uk]=FictionBook,fb2,електронна,книга -X-KDE-Keywords[x-test]=xxFictionBook, e-book, fb2xx +X-KDE-Keywords[x-test]=xxFictionBookxx,xx e-bookxx,xx fb2xx X-KDE-Keywords[zh_CN]=FictionBook, e-book, fb2,电子书,虚拟书籍 X-KDE-Keywords[zh_TW]=FictionBook, e-book, fb2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-14.12.1/generators/fictionbook/okularApplication_fb.desktop new/okular-14.12.2/generators/fictionbook/okularApplication_fb.desktop --- old/okular-14.12.1/generators/fictionbook/okularApplication_fb.desktop 2015-01-07 00:17:35.000000000 +0100 +++ new/okular-14.12.2/generators/fictionbook/okularApplication_fb.desktop 2015-01-29 19:52:52.000000000 +0100 @@ -176,6 +176,6 @@ X-KDE-Keywords[sv]=FictionBook, e-bok, fb2 X-KDE-Keywords[tr]=FictionBook, e-book, fb2 X-KDE-Keywords[uk]=FictionBook,fb2,електронна,книга -X-KDE-Keywords[x-test]=xxFictionBook, e-book, fb2xx +X-KDE-Keywords[x-test]=xxFictionBookxx,xx e-bookxx,xx fb2xx X-KDE-Keywords[zh_CN]=FictionBook, e-book, fb2,电子书,虚拟书籍 X-KDE-Keywords[zh_TW]=FictionBook, e-book, fb2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-14.12.1/generators/poppler/active-documentviewer_pdf.desktop new/okular-14.12.2/generators/poppler/active-documentviewer_pdf.desktop --- old/okular-14.12.1/generators/poppler/active-documentviewer_pdf.desktop 2015-01-07 00:17:35.000000000 +0100 +++ new/okular-14.12.2/generators/poppler/active-documentviewer_pdf.desktop 2015-01-29 19:52:52.000000000 +0100 @@ -196,6 +196,6 @@ X-KDE-Keywords[sv]=PDF, Portabelt dokumentformat X-KDE-Keywords[tr]=PDF, Taşınabilir Belge Biçimi X-KDE-Keywords[uk]=PDF,Portable Document Format,пдф -X-KDE-Keywords[x-test]=xxPDF, Portable Document Formatxx +X-KDE-Keywords[x-test]=xxPDFxx,xx Portable Document Formatxx X-KDE-Keywords[zh_CN]=PDF, Portable Document Format,开放文档格式 X-KDE-Keywords[zh_TW]=PDF, Portable Document Format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-14.12.1/generators/poppler/okularApplication_pdf.desktop new/okular-14.12.2/generators/poppler/okularApplication_pdf.desktop --- old/okular-14.12.1/generators/poppler/okularApplication_pdf.desktop 2015-01-07 00:17:35.000000000 +0100 +++ new/okular-14.12.2/generators/poppler/okularApplication_pdf.desktop 2015-01-29 19:52:52.000000000 +0100 @@ -175,7 +175,7 @@ X-KDE-Keywords[sv]=PDF, Portabelt dokumentformat X-KDE-Keywords[tr]=PDF, Taşınabilir Belge Biçimi X-KDE-Keywords[uk]=PDF,Portable Document Format,пдф -X-KDE-Keywords[x-test]=xxPDF, Portable Document Formatxx +X-KDE-Keywords[x-test]=xxPDFxx,xx Portable Document Formatxx X-KDE-Keywords[zh_CN]=PDF, Portable Document Format,开放文档格式 X-KDE-Keywords[zh_TW]=PDF, Portable Document Format NoDisplay=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-14.12.1/generators/spectre/active-documentviewer_ghostview.desktop new/okular-14.12.2/generators/spectre/active-documentviewer_ghostview.desktop --- old/okular-14.12.1/generators/spectre/active-documentviewer_ghostview.desktop 2015-01-07 00:17:35.000000000 +0100 +++ new/okular-14.12.2/generators/spectre/active-documentviewer_ghostview.desktop 2015-01-29 19:52:52.000000000 +0100 @@ -191,6 +191,6 @@ X-KDE-Keywords[sv]=PS, Postscript X-KDE-Keywords[tr]=PS, PostScript X-KDE-Keywords[uk]=PS, PostScript -X-KDE-Keywords[x-test]=xxPS, PostScriptxx +X-KDE-Keywords[x-test]=xxPSxx,xx PostScriptxx X-KDE-Keywords[zh_CN]=PS, PostScript X-KDE-Keywords[zh_TW]=PS, PostScript diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-14.12.1/generators/spectre/okularApplication_ghostview.desktop new/okular-14.12.2/generators/spectre/okularApplication_ghostview.desktop --- old/okular-14.12.1/generators/spectre/okularApplication_ghostview.desktop 2015-01-07 00:17:35.000000000 +0100 +++ new/okular-14.12.2/generators/spectre/okularApplication_ghostview.desktop 2015-01-29 19:52:52.000000000 +0100 @@ -170,7 +170,7 @@ X-KDE-Keywords[sv]=PS, Postscript X-KDE-Keywords[tr]=PS, PostScript X-KDE-Keywords[uk]=PS, PostScript -X-KDE-Keywords[x-test]=xxPS, PostScriptxx +X-KDE-Keywords[x-test]=xxPSxx,xx PostScriptxx X-KDE-Keywords[zh_CN]=PS, PostScript X-KDE-Keywords[zh_TW]=PS, PostScript NoDisplay=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-14.12.1/part.cpp new/okular-14.12.2/part.cpp --- old/okular-14.12.1/part.cpp 2015-01-07 00:17:35.000000000 +0100 +++ new/okular-14.12.2/part.cpp 2015-01-29 19:52:52.000000000 +0100 @@ -1325,18 +1325,20 @@ if ( !isstdin && !fileInfo.exists() ) return false; KMimeType::Ptr pathMime = KMimeType::findByPath( fileNameToOpen ); - if ( !arguments().mimeType().isEmpty() ) + const QString argMimeType = arguments().mimeType(); + + if ( !argMimeType.isEmpty() ) { - KMimeType::Ptr argMime = KMimeType::mimeType( arguments().mimeType() ); + KMimeType::Ptr argMime = KMimeType::mimeType( argMimeType ); // Select the "childmost" mimetype, if none of them // inherits the other trust more what pathMime says // but still do a second try if that one fails - if ( argMime->is( pathMime->name() ) ) + if ( argMime && argMime->is( pathMime->name() ) ) { mimes << argMime; } - else if ( pathMime->is( argMime->name() ) ) + else if ( !argMime || pathMime->is( argMime->name() ) ) { mimes << pathMime; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
