From nobody Wed Feb 09 21:49:00 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8882419C5CD1; Wed, 9 Feb 2022 21:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JvD6N3S3Pz3CQ7; Wed, 9 Feb 2022 21:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644443340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Puh1Qd2DWdYtBrzGFgNLQyZXFrQH+5tzJL0luqwKHrI=; b=b9aDqeghgw8L9h10aaq38BfO4xuye1RG4/hHwvFlP64uDMKmX112I358+ZOk5L5AX6WPuU +sn3K7D3vnVmE/BP9JjIn9akNbwJ0IaKmiDvjSHr5co/TVEz0lxs6cbSrosyf68zvUXxV+ PG4T8CVfYV1ZKzAz0s5shX2fho6iT/tX0oPkFUO6g5j/nd6JDNG3dpG6tm8w0tYhBeu1RM 0cPDxvP/ggy3X0AhS/yz+o67K4tZEqHUhI0ardTQS9UKXhEyTAcfwrx3JwbkBt5I+CjWgO dcZNFJaIuRnhJ29xT3P0Y85ijrgjfoEw61eOX9kQKoXexhPTl/QvwaNjgl++VA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 534C414A72; Wed, 9 Feb 2022 21:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 219Ln0Ft068912; Wed, 9 Feb 2022 21:49:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 219Ln0Fr068911; Wed, 9 Feb 2022 21:49:00 GMT (envelope-from git) Date: Wed, 9 Feb 2022 21:49:00 GMT Message-Id: <202202092149.219Ln0Fr068911@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Max Brazhnikov Subject: git: 160358b8d28b - main - archivers/ark: switch from p7zip to 7-zip List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: makc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 160358b8d28b1fd286c6ddfb3b3ac9427a3d0a55 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644443340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Puh1Qd2DWdYtBrzGFgNLQyZXFrQH+5tzJL0luqwKHrI=; b=SBEYqmYKLRZbemg79itWYPiyv0eyzw43sIlxK79n9JjWQTgnBxOtEIwhSfjJ4NiqGVP6Xm EkiHzUu+FfsiM247ZdnjW21jjrSDaY4wU6VjBvo5gsEUF52hetq9iMMNeVjARCA0l/UV7K hJQCrY3CPxpPpxWTOfFtqCB1iBcNFOXY78gRhs4FTbIu39eS+dYvkihwL4B251Wrdpdj2i fHiDvKltu9K2WD8jgp6HQ0XBe6BrZNauXzRGNJZB0C3SK31moxc+MpOHrcx0sni/RcYnZ+ qd1XymNYVTHcTTnHipUp//MMvttGr9YLjZJ+5G4Q2nKKODbvRGMVwp2JfarkzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644443340; a=rsa-sha256; cv=none; b=NiGrnKijZrnX/ZuRAHiY9KXVwKUrUN/CvMad7JCCGH1XX3EjTJAE3AHcp0SFLingtXYbHr KmOLLMpKVLq69JF4mb0wIkk35zZ+7PmR0rE1mTBaT3dUFyF9SN8qM8tn4uJkICCIfPMcI7 ntZyBpmqXXbchjd5odMVwpCG2G71U+zZ1iVfV5ShmHPXnPrbePWf6T93a5L7EOG+PnAJbX Yp8kQAq/KcEULT0XK0PUznIVsXogfWuAbOLN02VQyH2Q/HpZhH4hI1X/tGePrg1x2rF5v5 WnG1ZM2uytKojixY5dLnxJ4+W2yJ+Z32iZztHzfoGYJPv2TxWaypoz2/wFOPvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=160358b8d28b1fd286c6ddfb3b3ac9427a3d0a55 commit 160358b8d28b1fd286c6ddfb3b3ac9427a3d0a55 Author: Max Brazhnikov AuthorDate: 2022-02-09 21:47:29 +0000 Commit: Max Brazhnikov CommitDate: 2022-02-09 21:47:29 +0000 archivers/ark: switch from p7zip to 7-zip Add support for original 7-Zip and use it instead of p7zip. Full patch has been submitted upstream: https://invent.kde.org/utilities/ark/-/merge_requests/90 PR: 260866 261368 --- archivers/ark/Makefile | 11 +++++- archivers/ark/files/patch-7zip | 76 ++++++++++++++++++++++++++++++++++++++++++ archivers/ark/pkg-message | 2 +- 3 files changed, 87 insertions(+), 2 deletions(-) diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile index d7a9ac2a2516..97639f0e54de 100644 --- a/archivers/ark/Makefile +++ b/archivers/ark/Makefile @@ -1,5 +1,6 @@ PORTNAME= ark DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= archivers kde kde-applications MAINTAINER= kde@FreeBSD.org @@ -19,6 +20,8 @@ USE_QT= concurrent core dbus gui network widgets xml \ USE_LDCONFIG= yes +PATCH_STRIP= -p1 + OPTIONS_DEFINE= 7ZIP RAR ZIP DOCS OPTIONS_DEFAULT= 7ZIP ZIP DOCS OPTIONS_DEFAULT_i386= RAR @@ -28,7 +31,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 \ @@ -41,4 +44,10 @@ ZIP_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_LibZip # Override shared library version KDE_APPLICATIONS_SHLIB_VER= ${KDE_APPLICATIONS_VERSION} +post-patch: + ${REINPLACE_CMD} '/Program/s,"7z","7zz",' \ + ${WRKSRC}/plugins/cli7zplugin/cliplugin.cpp + ${REINPLACE_CMD} 's,"7z","7zz",' \ + ${WRKSRC}/plugins/cli7zplugin/kerfuffle_cli7z.json.cmake + .include diff --git a/archivers/ark/files/patch-7zip b/archivers/ark/files/patch-7zip new file mode 100644 index 000000000000..2f642beb1791 --- /dev/null +++ b/archivers/ark/files/patch-7zip @@ -0,0 +1,76 @@ +diff --git a/plugins/cli7zplugin/CMakeLists.txt b/plugins/cli7zplugin/CMakeLists.txt +index 735c833a..3450a504 100644 +--- a/plugins/cli7zplugin/CMakeLists.txt ++++ b/plugins/cli7zplugin/CMakeLists.txt +@@ -7,7 +7,7 @@ set(kerfuffle_cli7z_SRCS cliplugin.cpp) + ecm_qt_declare_logging_category(kerfuffle_cli7z_SRCS + HEADER ark_debug.h + IDENTIFIER ARK +- CATEGORY_NAME ark.cli7z DESCRIPTION "Ark p7zip" EXPORT ARK) ++ CATEGORY_NAME ark.cli7z DESCRIPTION "Ark 7-Zip" EXPORT ARK) + + # NOTE: the first double-quotes of the first mime and the last + # double-quotes of the last mime must NOT be escaped. +@@ -24,9 +24,9 @@ kerfuffle_add_plugin(kerfuffle_cli7z ${kerfuffle_cli7z_SRCS}) + 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) +-if(P7ZIP) +- message(STATUS "Found p7zip executable: ${P7ZIP}") ++find_program(7ZIP 7z) ++if(7ZIP) ++ message(STATUS "Found 7-Zip executable: ${7ZIP}") + else() + message(WARNING "Could not find the 7z executable. Ark won't be able to handle the 7z archive format.") + endif() +diff --git a/plugins/cli7zplugin/cliplugin.cpp b/plugins/cli7zplugin/cliplugin.cpp +index 1781117a..3450ad22 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", QStringLiteral("a")); + + m_cliProps->setProperty("deleteProgram", QStringLiteral("7z")); + m_cliProps->setProperty("deleteSwitch", QStringLiteral("d")); +@@ -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 .* ([\\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; + +@@ -294,7 +293,7 @@ bool CliPlugin::readDeleteLine(const QString &line) + { + if (line.startsWith(QLatin1String("Error: ")) && + line.endsWith(QLatin1String(" is not supported archive"))) { +- Q_EMIT error(i18n("Delete operation failed. Try upgrading p7zip or disabling the p7zip plugin in the configuration dialog.")); ++ Q_EMIT error(i18n("Delete operation failed. Try upgrading 7-Zip or disabling the 7-Zip plugin in the configuration dialog.")); + return false; + } + +@@ -333,7 +332,7 @@ void CliPlugin::handleMethods(const QStringList &methods) + + bool CliPlugin::isPasswordPrompt(const QString &line) + { +- return line.startsWith(QLatin1String("Enter password (will not be echoed):")); ++ return line.startsWith(QLatin1String("Enter password")); + } + + bool CliPlugin::isWrongPasswordMsg(const QString &line) diff --git a/archivers/ark/pkg-message b/archivers/ark/pkg-message index efe88273d6d6..1a56cbe9881f 100644 --- a/archivers/ark/pkg-message +++ b/archivers/ark/pkg-message @@ -3,7 +3,7 @@ message: <