Hello community, here is the log from the commit of package okular for openSUSE:Factory checked in at 2016-10-10 17:34:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-09-14 23:20:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.okular.new/okular.changes 2016-10-10 17:34:38.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Oct 1 13:52:02 UTC 2016 - wba...@tmo.at + +- Add mimeinfo17.patch to fix opening CBR files with + shared-mime-info 1.7 (kde#369078) + +------------------------------------------------------------------- New: ---- mimeinfo17.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ okular.spec ++++++ --- /var/tmp/diff_new_pack.RXjb9O/_old 2016-10-10 17:34:40.000000000 +0200 +++ /var/tmp/diff_new_pack.RXjb9O/_new 2016-10-10 17:34:40.000000000 +0200 @@ -27,6 +27,8 @@ Patch0: fix-priority-okular.diff # PATCH-FIX-UPSTREAM kde4_includes.patch -- search for includes in standard kde4 include directory (don't assume it's hardcoded to include/ ) Patch1: kde4_includes.patch +# PATCH-FIX-UPSTREAM mimeinfo17.patch kde#369078 -- fix opening CBR files with shared-mime-info 1.7 +Patch2: mimeinfo17.patch BuildRequires: OpenEXR-devel BuildRequires: chmlib-devel BuildRequires: fdupes @@ -81,6 +83,7 @@ %setup -q %patch0 -p0 %patch1 -p1 +%patch2 -p1 %build %cmake_kde4 -d build ++++++ mimeinfo17.patch ++++++ From: Albert Astals Cid <aa...@kde.org> Date: Sat, 01 Oct 2016 13:39:31 +0000 Subject: Open CBR files with shared-mime-info >= 1.7 X-Git-Url: http://quickgit.kde.org/?p=okular.git&a=commitdiff&h=f2b2d94897cfedcec91b82a6bed0450546686b51 --- Open CBR files with shared-mime-info >= 1.7 Not ideal fix surely but it'll do for the moment BUGS: 369078 --- --- a/generators/comicbook/document.cpp +++ b/generators/comicbook/document.cpp @@ -75,7 +75,7 @@ if ( !processArchive() ) { return false; } - } else if ( mime->is( "application/x-cbr" ) || mime->name() == "application/x-rar" ) { + } else if ( mime->is( "application/x-cbr" ) || mime->name() == "application/x-rar" || mime->name() == "application/vnd.rar" ) { if ( !Unrar::isAvailable() ) { mLastErrorString = i18n( "Cannot open document, unrar was not found." ); return false;
