Attachment 231193 Details for Bug 261368 – archivers/ark: switch from p7zip to 7-zip

[patch] archivers/ark: switch from p7zip to 7-zip

pathc-ark.diff (text/plain), 5.14 KB, created by Eric Camachat on 2022-01-20 20:11:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Camachat

Created: 2022-01-20 20:11:13 UTC

Size: 5.14 KB

patch

obsolete

>diff --git archivers/ark/Makefile archivers/ark/Makefile
>index 0c8231a976f2..e49c45a770ef 100644
>--- archivers/ark/Makefile
>+++ archivers/ark/Makefile
>@@ -29,7 +29,7 @@ OPTIONS_SUB=		YES
> # The 7ZIP and RAR options only need runtime dependencies;
> # the port builds identically with or without them.
> 7ZIP_DESC=	Support for 7-Zip archives (runtime)
>-7ZIP_RUN_DEPENDS=	7z:archivers/p7zip
>+7ZIP_RUN_DEPENDS=	7zz:archivers/7-zip
> 
> RAR_DESC=	Support for RAR archives (runtime)
> RAR_RUN_DEPENDS=	unrar:archivers/unrar \
>diff --git archivers/ark/files/patch-plugins_cli7zplugin_CMakeLists.txt archivers/ark/files/patch-plugins_cli7zplugin_CMakeLists.txt
>new file mode 100644
>index 000000000000..76ce5b4efed9
>--- /dev/null
>+++ archivers/ark/files/patch-plugins_cli7zplugin_CMakeLists.txt
>@@ -0,0 +1,11 @@
>+--- plugins/cli7zplugin/CMakeLists.txt.orig	2022-01-03 15:30:07.000000000 -0600
>++++ plugins/cli7zplugin/CMakeLists.txt	2022-01-20 11:39:54.168999000 -0600
>+@@ -24,7 +24,7 @@ kerfuffle_add_plugin(kerfuffle_cli7z ${kerfuffle_cli7z
>+ set(SUPPORTED_ARK_MIMETYPES "${SUPPORTED_ARK_MIMETYPES}${SUPPORTED_CLI7Z_MIMETYPES}" PARENT_SCOPE)
>+ set(INSTALLED_KERFUFFLE_PLUGINS "${INSTALLED_KERFUFFLE_PLUGINS}kerfuffle_cli7z;" PARENT_SCOPE)
>+ 
>+-find_program(P7ZIP 7z)
>++find_program(P7ZIP 7zz)
>+ if(P7ZIP)
>+     message(STATUS "Found p7zip executable: ${P7ZIP}")
>+ else()
>diff --git archivers/ark/files/patch-plugins_cli7zplugin_cliplugin.cpp archivers/ark/files/patch-plugins_cli7zplugin_cliplugin.cpp
>new file mode 100644
>index 000000000000..356d87120310
>--- /dev/null
>+++ archivers/ark/files/patch-plugins_cli7zplugin_cliplugin.cpp
>@@ -0,0 +1,53 @@
>+--- plugins/cli7zplugin/cliplugin.cpp.orig	2022-01-03 15:30:07.000000000 -0600
>++++ plugins/cli7zplugin/cliplugin.cpp	2022-01-20 13:50:17.536486000 -0600
>+@@ -49,25 +49,24 @@ 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("addProgram", QStringLiteral("7zz"));
>++    m_cliProps->setProperty("addSwitch", QStringList{QStringLiteral("a")});
>+ 
>+-    m_cliProps->setProperty("deleteProgram", QStringLiteral("7z"));
>++    m_cliProps->setProperty("deleteProgram", QStringLiteral("7zz"));
>+     m_cliProps->setProperty("deleteSwitch", QStringLiteral("d"));
>+ 
>+-    m_cliProps->setProperty("extractProgram", QStringLiteral("7z"));
>++    m_cliProps->setProperty("extractProgram", QStringLiteral("7zz"));
>+     m_cliProps->setProperty("extractSwitch", QStringList{QStringLiteral("x")});
>+     m_cliProps->setProperty("extractSwitchNoPreserve", QStringList{QStringLiteral("e")});
>+ 
>+-    m_cliProps->setProperty("listProgram", QStringLiteral("7z"));
>++    m_cliProps->setProperty("listProgram", QStringLiteral("7zz"));
>+     m_cliProps->setProperty("listSwitch", QStringList{QStringLiteral("l"),
>+                                                   QStringLiteral("-slt")});
>+ 
>+-    m_cliProps->setProperty("moveProgram", QStringLiteral("7z"));
>++    m_cliProps->setProperty("moveProgram", QStringLiteral("7zz"));
>+     m_cliProps->setProperty("moveSwitch", QStringLiteral("rn"));
>+ 
>+-    m_cliProps->setProperty("testProgram", QStringLiteral("7z"));
>++    m_cliProps->setProperty("testProgram", QStringLiteral("7zz"));
>+     m_cliProps->setProperty("testSwitch", QStringLiteral("t"));
>+ 
>+     m_cliProps->setProperty("passwordSwitch", QStringList{QStringLiteral("-p$Password")});
>+@@ -111,7 +110,7 @@ bool CliPlugin::readListLine(const QString& line)
>+         return false;
>+     }
>+ 
>+-    const QRegularExpression rxVersionLine(QStringLiteral("^p7zip Version ([\\d\\.]+) .*$"));
>++    const QRegularExpression rxVersionLine(QStringLiteral("^7-Zip \$z\$ ([\\d\\.]+) .*$"));
>+     QRegularExpressionMatch matchVersion;
>+ 
>+     switch (m_parseState) {
>+@@ -120,7 +119,7 @@ bool CliPlugin::readListLine(const QString& line)
>+         if (matchVersion.hasMatch()) {
>+             m_parseState = ParseStateHeader;
>+             const QString p7zipVersion = matchVersion.captured(1);
>+-            qCDebug(ARK) << "p7zip version" << p7zipVersion << "detected";
>++            qCDebug(ARK) << "7-Zip version" << p7zipVersion << "detected";
>+         }
>+         break;
>+ 
>diff --git archivers/ark/files/patch-plugins_cli7zplugin_kerfuffle_cli7z.json.cmake archivers/ark/files/patch-plugins_cli7zplugin_kerfuffle_cli7z.json.cmake
>new file mode 100644
>index 000000000000..1793e5a35273
>--- /dev/null
>+++ archivers/ark/files/patch-plugins_cli7zplugin_kerfuffle_cli7z.json.cmake
>@@ -0,0 +1,16 @@
>+--- plugins/cli7zplugin/kerfuffle_cli7z.json.cmake.orig	2022-01-03 15:30:07.000000000 -0600
>++++ plugins/cli7zplugin/kerfuffle_cli7z.json.cmake	2022-01-20 11:39:54.177204000 -0600
>+@@ -89,11 +89,11 @@
>+         "Version": "@RELEASE_SERVICE_VERSION@"
>+     },
>+     "X-KDE-Kerfuffle-ReadOnlyExecutables": [
>+-        "7z"
>++        "7zz"
>+     ],
>+     "X-KDE-Kerfuffle-ReadWrite": true,
>+     "X-KDE-Kerfuffle-ReadWriteExecutables": [
>+-        "7z"
>++        "7zz"
>+     ],
>+     "X-KDE-Priority": 180,
>+     "application/x-7z-compressed": {

Actions: View | Diff

Attachments on bug 261368: 231193