Hello community, here is the log from the commit of package ark for openSUSE:Factory checked in at 2016-01-07 00:24:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ark (Old) and /work/SRC/openSUSE:Factory/.ark.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ark" Changes: -------- --- /work/SRC/openSUSE:Factory/ark/ark.changes 2015-11-15 12:28:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ark.new/ark.changes 2016-01-07 00:24:09.000000000 +0100 @@ -1,0 +2,21 @@ +Wed Dec 23 19:55:01 UTC 2015 - wba...@tmo.at + +- Add Fallback-to-read-only-mode-if-there-are-no-read-write-executables.patch: + fixes opening archives when the executable to create a new + archive (e.g. rar or zip) is not installed (boo#959996, kde#357057) + +------------------------------------------------------------------- +Tue Dec 22 11:02:09 UTC 2015 - wba...@tmo.at + +- Add Fix-ark-cannout-open-rar-file-with-space-in-archive-file-path.patch: + fixes opening rar files with a space in the file path (boo#959996) + +------------------------------------------------------------------- +Sun Dec 13 12:47:35 UTC 2015 - tittiatc...@gmail.com + +- Update to KDE Applications 15.12.0 + * KDE Applications 15.12.0 + * https://www.kde.org/announcements/announce-applications-15.12.0.php + * boo#958887 + +------------------------------------------------------------------- Old: ---- ark-15.08.3.tar.xz New: ---- Fallback-to-read-only-mode-if-there-are-no-read-write-executables.patch Fix-ark-cannout-open-rar-file-with-space-in-archive-file-path.patch ark-15.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ark.spec ++++++ --- /var/tmp/diff_new_pack.iHTDJm/_old 2016-01-07 00:24:10.000000000 +0100 +++ /var/tmp/diff_new_pack.iHTDJm/_new 2016-01-07 00:24:10.000000000 +0100 @@ -17,13 +17,17 @@ Name: ark -Version: 15.08.3 +Version: 15.12.0 Release: 0 Summary: KDE Archiver Tool License: GPL-2.0+ Group: Productivity/Other Url: http://www.kde.org Source0: ark-%{version}.tar.xz +# PATCH-FIX-UPSTREAM Fix-ark-cannout-open-rar-file-with-space-in-archive-file-path.patch boo#959996 -- fixes opening rar files with a space in the file path +Patch0: Fix-ark-cannout-open-rar-file-with-space-in-archive-file-path.patch +# PATCH-FIX-UPSTREAM Fallback-to-read-only-mode-if-there-are-no-read-write-executables.patch boo#959996, kde#357057 -- fixes opening archives when the executable to create a new archive (e.g. rar or zip) is not installed +Patch1: Fallback-to-read-only-mode-if-there-are-no-read-write-executables.patch BuildRequires: extra-cmake-modules >= 1.7.0 BuildRequires: karchive-devel >= 5.2.0 BuildRequires: kconfig-devel >= 5.2.0 @@ -60,6 +64,8 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build %cmake_kf5 -d build @@ -68,7 +74,6 @@ %install %{kf5_makeinstall} -C build %suse_update_desktop_file org.kde.ark System Archiving - rm %{buildroot}%{_kf5_libdir}/libkerfuffle.so %post -n libkerfuffle15 -p /sbin/ldconfig ++++++ Fallback-to-read-only-mode-if-there-are-no-read-write-executables.patch ++++++ From: Elvis Angelaccio <elvis.angelac...@kdemail.net> Date: Wed, 23 Dec 2015 16:19:29 +0000 Subject: Fallback to read-only mode if there are no read-write executables X-Git-Url: http://quickgit.kde.org/?p=ark.git&a=commitdiff&h=087e5aab49c60ac5930742fe892fa930048e2f43 --- Fallback to read-only mode if there are no read-write executables Commit 2d000a0 introduced executables check when loading a plugin. However the current behavior is too restrictive: if one wants only to open a rar or a zip archive, there is no need to require also the rar or zip program to be installed. Plus, some distributions (e.g. Archlinux) ship only unrar in their official repositories. With this commit, Ark is able to understand that e.g. unrar is installed but rar is not. In this case, Ark can and should fallback to read-only mode, to disable the Add/Delete actions in the toolbar. BUG: 357057 FIXED-IN: 15.12.1 CC: rthoms...@gmail.com --- --- a/kerfuffle/archive_kerfuffle.cpp +++ b/kerfuffle/archive_kerfuffle.cpp @@ -173,6 +173,9 @@ if (iface->findExecutables(!isReadOnly)) { return new Archive(iface, isReadOnly, parent); + } else if (!isReadOnly && iface->findExecutables(false)) { + qCWarning(ARK) << "Failed to find read-write executables: falling back to read-only mode for read-write plugin" << pluginName; + return new Archive(iface, true, parent); } else { qCWarning(ARK) << "Failed to find needed executables for plugin" << pluginName; } ++++++ Fix-ark-cannout-open-rar-file-with-space-in-archive-file-path.patch ++++++ From: Weng Xuetian <wen...@gmail.com> Date: Thu, 17 Dec 2015 06:20:36 +0000 Subject: Fix ark cannout open rar file with space in archive file path X-Git-Url: http://quickgit.kde.org/?p=ark.git&a=commitdiff&h=24b0afbec552f56b30d91fc041fc727add5b6e58 --- Fix ark cannout open rar file with space in archive file path REVIEW: 126360 --- --- a/plugins/clirarplugin/cliplugin.cpp +++ b/plugins/clirarplugin/cliplugin.cpp @@ -172,7 +172,8 @@ if (m_parseState == ParseStateComment) { // RegExp matching end of comment field. - QRegularExpression rxCommentEnd(QStringLiteral("^Archive: \\S+$")); + // FIXME: Comment itself could also contain the Archive path string here. + QRegularExpression rxCommentEnd(QStringLiteral("^Archive: .+$")); if (rxCommentEnd.match(line).hasMatch()) { m_parseState = ParseStateHeader; @@ -293,7 +294,8 @@ if (m_parseState == ParseStateComment) { // RegExp matching end of comment field. - QRegularExpression rxCommentEnd(QStringLiteral("^(Solid archive|Archive|Volume) \\S+$")); + // FIXME: Comment itself could also contain the Archive path string here. + QRegularExpression rxCommentEnd(QStringLiteral("^(Solid archive|Archive|Volume) .+$")); if (rxCommentEnd.match(line).hasMatch()) { ++++++ ark-15.08.3.tar.xz -> ark-15.12.0.tar.xz ++++++ ++++ 9253 lines of diff (skipped)
