Attachment #231193 for bug #261368

View | Details | Raw Unified | Return to bug 261368
Collapse All | Expand All

Lines 29-35 OPTIONS_SUB= YES Link Here

(-)archivers/ark/Makefile (-1 / +1 lines)
29	# The 7ZIP and RAR options only need runtime dependencies;	29	# The 7ZIP and RAR options only need runtime dependencies;
30	# the port builds identically with or without them.	30	# the port builds identically with or without them.
31	7ZIP_DESC= Support for 7-Zip archives (runtime)	31	7ZIP_DESC= Support for 7-Zip archives (runtime)
32	7ZIP_RUN_DEPENDS= 7z:archivers/p7zip	32	7ZIP_RUN_DEPENDS= 7zz:archivers/7-zip
33		33
34	RAR_DESC= Support for RAR archives (runtime)	34	RAR_DESC= Support for RAR archives (runtime)
35	RAR_RUN_DEPENDS= unrar:archivers/unrar \	35	RAR_RUN_DEPENDS= unrar:archivers/unrar \

Added Link Here

(-)archivers/ark/files/patch-plugins_cli7zplugin_CMakeLists.txt (+11 lines)
1	--- plugins/cli7zplugin/CMakeLists.txt.orig 2022-01-03 15:30:07.000000000 -0600
2	+++ plugins/cli7zplugin/CMakeLists.txt 2022-01-20 11:39:54.168999000 -0600
3	@@ -24,7 +24,7 @@ kerfuffle_add_plugin(kerfuffle_cli7z ${kerfuffle_cli7z
4	set(SUPPORTED_ARK_MIMETYPES "${SUPPORTED_ARK_MIMETYPES}${SUPPORTED_CLI7Z_MIMETYPES}" PARENT_SCOPE)
5	set(INSTALLED_KERFUFFLE_PLUGINS "${INSTALLED_KERFUFFLE_PLUGINS}kerfuffle_cli7z;" PARENT_SCOPE)
6
7	-find_program(P7ZIP 7z)
8	+find_program(P7ZIP 7zz)
9	if(P7ZIP)
10	message(STATUS "Found p7zip executable: ${P7ZIP}")
11	else()




--- 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;
 




--- 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": {

Return to bug 261368

Added Link Here

(-)archivers/ark/files/patch-plugins_cli7zplugin_cliplugin.cpp (+53 lines)
1	--- plugins/cli7zplugin/cliplugin.cpp.orig 2022-01-03 15:30:07.000000000 -0600
2	+++ plugins/cli7zplugin/cliplugin.cpp 2022-01-20 13:50:17.536486000 -0600
3	@@ -49,25 +49,24 @@ void CliPlugin::setupCliProperties()
4
5	m_cliProps->setProperty("captureProgress", false);
6
7	- m_cliProps->setProperty("addProgram", QStringLiteral("7z"));
8	- m_cliProps->setProperty("addSwitch", QStringList{QStringLiteral("a"),
9	- QStringLiteral("-l")});
10	+ m_cliProps->setProperty("addProgram", QStringLiteral("7zz"));
11	+ m_cliProps->setProperty("addSwitch", QStringList{QStringLiteral("a")});
12
13	- m_cliProps->setProperty("deleteProgram", QStringLiteral("7z"));
14	+ m_cliProps->setProperty("deleteProgram", QStringLiteral("7zz"));
15	m_cliProps->setProperty("deleteSwitch", QStringLiteral("d"));
16
17	- m_cliProps->setProperty("extractProgram", QStringLiteral("7z"));
18	+ m_cliProps->setProperty("extractProgram", QStringLiteral("7zz"));
19	m_cliProps->setProperty("extractSwitch", QStringList{QStringLiteral("x")});
20	m_cliProps->setProperty("extractSwitchNoPreserve", QStringList{QStringLiteral("e")});
21
22	- m_cliProps->setProperty("listProgram", QStringLiteral("7z"));
23	+ m_cliProps->setProperty("listProgram", QStringLiteral("7zz"));
24	m_cliProps->setProperty("listSwitch", QStringList{QStringLiteral("l"),
25	QStringLiteral("-slt")});
26
27	- m_cliProps->setProperty("moveProgram", QStringLiteral("7z"));
28	+ m_cliProps->setProperty("moveProgram", QStringLiteral("7zz"));
29	m_cliProps->setProperty("moveSwitch", QStringLiteral("rn"));
30
31	- m_cliProps->setProperty("testProgram", QStringLiteral("7z"));
32	+ m_cliProps->setProperty("testProgram", QStringLiteral("7zz"));
33	m_cliProps->setProperty("testSwitch", QStringLiteral("t"));
34
35	m_cliProps->setProperty("passwordSwitch", QStringList{QStringLiteral("-p$Password")});
36	@@ -111,7 +110,7 @@ bool CliPlugin::readListLine(const QString& line)
37	return false;
38	}
39
40	- const QRegularExpression rxVersionLine(QStringLiteral("^p7zip Version ([\\d\\.]+) .*$"));
41	+ const QRegularExpression rxVersionLine(QStringLiteral("^7-Zip \\(z\\) ([\\d\\.]+) .*$"));
42	QRegularExpressionMatch matchVersion;
43
44	switch (m_parseState) {
45	@@ -120,7 +119,7 @@ bool CliPlugin::readListLine(const QString& line)
46	if (matchVersion.hasMatch()) {
47	m_parseState = ParseStateHeader;
48	const QString p7zipVersion = matchVersion.captured(1);
49	- qCDebug(ARK) << "p7zip version" << p7zipVersion << "detected";
50	+ qCDebug(ARK) << "7-Zip version" << p7zipVersion << "detected";
51	}
52	break;
53

Added Link Here

(-)archivers/ark/files/patch-plugins_cli7zplugin_kerfuffle_cli7z.json.cmake (+16 lines)
1	--- plugins/cli7zplugin/kerfuffle_cli7z.json.cmake.orig 2022-01-03 15:30:07.000000000 -0600
2	+++ plugins/cli7zplugin/kerfuffle_cli7z.json.cmake 2022-01-20 11:39:54.177204000 -0600
3	@@ -89,11 +89,11 @@
4	"Version": "@RELEASE_SERVICE_VERSION@"
5	},
6	"X-KDE-Kerfuffle-ReadOnlyExecutables": [
7	- "7z"
8	+ "7zz"
9	],
10	"X-KDE-Kerfuffle-ReadWrite": true,
11	"X-KDE-Kerfuffle-ReadWriteExecutables": [
12	- "7z"
13	+ "7zz"
14	],
15	"X-KDE-Priority": 180,
16	"application/x-7z-compressed": {