Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ark for openSUSE:Factory checked in at 2022-05-14 22:53:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ark (Old) and /work/SRC/openSUSE:Factory/.ark.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ark" Sat May 14 22:53:45 2022 rev:144 rq:976997 version:22.04.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ark/ark.changes 2022-04-24 00:20:38.352309237 +0200 +++ /work/SRC/openSUSE:Factory/.ark.new.1538/ark.changes 2022-05-14 22:54:22.607156975 +0200 @@ -1,0 +2,16 @@ +Fri May 13 06:19:48 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Add patches to fix issues caused by p7zip replacement in + openSUSE (boo#1199190): + * 0001-remove-l-flag-to-7z-a.patch + * 0001-Support-7zip-as-well-as-p7zip.patch + +------------------------------------------------------------------- +Tue May 10 16:29:23 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 22.04.1 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/gear/22.04.1/ + +------------------------------------------------------------------- Old: ---- ark-22.04.0.tar.xz ark-22.04.0.tar.xz.sig New: ---- 0001-Support-7zip-as-well-as-p7zip.patch 0001-remove-l-flag-to-7z-a.patch ark-22.04.1.tar.xz ark-22.04.1.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ark.spec ++++++ --- /var/tmp/diff_new_pack.3Yo5K7/_old 2022-05-14 22:54:23.067157550 +0200 +++ /var/tmp/diff_new_pack.3Yo5K7/_new 2022-05-14 22:54:23.071157555 +0200 @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without released Name: ark -Version: 22.04.0 +Version: 22.04.1 Release: 0 Summary: KDE Archiver Tool License: GPL-2.0-or-later @@ -34,6 +34,10 @@ %endif # PATCH-FIX-OPENSUSE Patch0: 0001-Support-building-against-libarchive-3.3.2-again.patch +# PATCH-FIX-OPENSUSE -- https://invent.kde.org/utilities/ark/-/merge_requests/90 +Patch1: 0001-remove-l-flag-to-7z-a.patch +# PATCH-FIX-OPENSUSE -- https://invent.kde.org/utilities/ark/-/merge_requests/111 +Patch2: 0001-Support-7zip-as-well-as-p7zip.patch BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: libarchive-devel ++++++ 0001-Support-7zip-as-well-as-p7zip.patch ++++++ >From e74cca78262c2ed4a908302ba002ce7367e9602d Mon Sep 17 00:00:00 2001 From: David Gow <da...@ingeniumdigital.com> Date: Mon, 4 Apr 2022 19:01:00 +0800 Subject: [PATCH] Support '7zip' as well as 'p7zip' 7zip 21.0 finally provided an official native port of 7zip, and has superseded the p7zip port in some distros (openSUSE, for instance, no longer packages p7zip). The CLI interface between them is almost identical, but Ark doesn't recognise the different version string, so doesn't work with 7zip (making it impossible to open 7z archives in Ark on openSUSE). Update the 7zip CLI plugin to detect both p7zip and 7zip's version lines. --- plugins/cli7zplugin/cliplugin.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/plugins/cli7zplugin/cliplugin.cpp b/plugins/cli7zplugin/cliplugin.cpp index 1781117a..f1803c76 100644 --- a/plugins/cli7zplugin/cliplugin.cpp +++ b/plugins/cli7zplugin/cliplugin.cpp @@ -112,6 +112,7 @@ bool CliPlugin::readListLine(const QString& line) } const QRegularExpression rxVersionLine(QStringLiteral("^p7zip Version ([\\d\\.]+) .*$")); + const QRegularExpression rxVersionLine7z(QStringLiteral("^7-Zip \\(z\\) ([\\d\\.]+) .*$")); QRegularExpressionMatch matchVersion; switch (m_parseState) { @@ -121,6 +122,14 @@ bool CliPlugin::readListLine(const QString& line) m_parseState = ParseStateHeader; const QString p7zipVersion = matchVersion.captured(1); qCDebug(ARK) << "p7zip version" << p7zipVersion << "detected"; + break; + } + matchVersion = rxVersionLine7z.match(line); + if (matchVersion.hasMatch()) { + m_parseState = ParseStateHeader; + const QString l7zipVersion = matchVersion.captured(1); + qCDebug(ARK) << "7zip version" << l7zipVersion << "detected"; + break; } break; -- 2.36.1 ++++++ 0001-remove-l-flag-to-7z-a.patch ++++++ >From d367b1ff473783201b696019be31925b9286c30f Mon Sep 17 00:00:00 2001 From: "Alex Xu (Hello71)" <alex_y...@yahoo.ca> Date: Thu, 3 Mar 2022 22:06:47 -0500 Subject: [PATCH] remove -l flag to 7z a 7z a -l flag was added in ace277330b37 "[GSoC] Implement AddTo, Rename, Copy, Move, Paste Actions and Jobs" without explanation. -l causes p7zip to follow symlinks when adding files. this is inconsistent with other ark plugins, unintuitive, and not supported by upstream 7zip. therefore, remove it. --- autotests/plugins/cli7zplugin/cli7ztest.cpp | 5 ----- plugins/cli7zplugin/cliplugin.cpp | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/autotests/plugins/cli7zplugin/cli7ztest.cpp b/autotests/plugins/cli7zplugin/cli7ztest.cpp index 3ce7d484..13a24832 100644 --- a/autotests/plugins/cli7zplugin/cli7ztest.cpp +++ b/autotests/plugins/cli7zplugin/cli7ztest.cpp @@ -281,7 +281,6 @@ void Cli7zTest::testAddArgs_data() << QString() << false << 5 << QStringLiteral("LZMA2") << 0UL << QStringList { QStringLiteral("a"), - QStringLiteral("-l"), QStringLiteral("-mx=5"), QStringLiteral("-m0=LZMA2"), QStringLiteral("/tmp/foo.7z") @@ -292,7 +291,6 @@ void Cli7zTest::testAddArgs_data() << QStringLiteral("1234") << false << 5 << QStringLiteral("LZMA2") << 0UL << QStringList { QStringLiteral("a"), - QStringLiteral("-l"), QStringLiteral("-p1234"), QStringLiteral("-mx=5"), QStringLiteral("-m0=LZMA2"), @@ -304,7 +302,6 @@ void Cli7zTest::testAddArgs_data() << QStringLiteral("1234") << true << 5 << QStringLiteral("LZMA2") << 0UL << QStringList { QStringLiteral("a"), - QStringLiteral("-l"), QStringLiteral("-p1234"), QStringLiteral("-mhe=on"), QStringLiteral("-mx=5"), @@ -317,7 +314,6 @@ void Cli7zTest::testAddArgs_data() << QString() << false << 5 << QStringLiteral("LZMA2") << 2500UL << QStringList { QStringLiteral("a"), - QStringLiteral("-l"), QStringLiteral("-mx=5"), QStringLiteral("-m0=LZMA2"), QStringLiteral("-v2500k"), @@ -329,7 +325,6 @@ void Cli7zTest::testAddArgs_data() << QString() << false << 5 << QStringLiteral("BZip2") << 0UL << QStringList { QStringLiteral("a"), - QStringLiteral("-l"), QStringLiteral("-mx=5"), QStringLiteral("-m0=BZip2"), QStringLiteral("/tmp/foo.7z") diff --git a/plugins/cli7zplugin/cliplugin.cpp b/plugins/cli7zplugin/cliplugin.cpp index 1781117a..b136baee 100644 --- a/plugins/cli7zplugin/cliplugin.cpp +++ b/plugins/cli7zplugin/cliplugin.cpp @@ -50,8 +50,7 @@ void CliPlugin::setupCliProperties() m_cliProps->setProperty("captureProgress", false); m_cliProps->setProperty("addProgram", QStringLiteral("7z")); - m_cliProps->setProperty("addSwitch", QStringList{QStringLiteral("a"), - QStringLiteral("-l")}); + m_cliProps->setProperty("addSwitch", QStringList{QStringLiteral("a")}); m_cliProps->setProperty("deleteProgram", QStringLiteral("7z")); m_cliProps->setProperty("deleteSwitch", QStringLiteral("d")); -- 2.36.1 ++++++ ark-22.04.0.tar.xz -> ark-22.04.1.tar.xz ++++++ ++++ 8338 lines of diff (skipped)
