From nobody Wed Jan 12 20:08:25 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 90C5719464B6; Wed, 12 Jan 2022 20:08:26 +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 4JYzCF4C5rz3N2X; Wed, 12 Jan 2022 20:08:25 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 6D0FC13589; Wed, 12 Jan 2022 20:08:25 +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 20CK8PLI099720; Wed, 12 Jan 2022 20:08:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20CK8Pf5099719; Wed, 12 Jan 2022 20:08:25 GMT (envelope-from git) Date: Wed, 12 Jan 2022 20:08:25 GMT Message-Id: <202201122008.20CK8Pf5099719@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: 04a6dbb444fb - main - graphics/qcomicbook: 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: 04a6dbb444fb2496f31aa7dd3cda4f6b44a86136 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642018105; 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=+8jhdJCffscUsdSiv+qOgN/abj/ZYf5dYkfTjMOwlV4=; b=MuKwqA4uR+piYbfwyz+UtNvcGdVhsZNIu2a7aXqsV5PhZuNOgeNb0WDuYEORYkKI+ThXrv WSCViqs9awu2G/3nsSrGLDgclB/X8Dz4qCMSV7/Af67ynQdED12D+4f8SqMOKFzzujeTN/ sUXFpBohP/MwVNoExfoW74JjoKG4e1LG/ACdWiWmEZbRuHZ6kzh46oljuALfOzgDDsh6xI pX9gCqwUlLXluQR+BQTbJ/98ny45mxVj7qxcfIon1vwCdobJ4HmJkKUYZueajJ3eSatfx3 eceZFVyvbXgKrCjBuGWytjGuWVZ+O5GFj5LF4TSOmMWDYK8YVG57AtqFL9wkLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642018105; a=rsa-sha256; cv=none; b=fGHZBNOT/v01jjcJjzhGpNfhmfpV9xQpkO2rIbxHrbI3tSQW7XXZxf4Su3qDWEmxsBNaUK QD7HLRmely4XAjYJ3/7zo3lg1927ZxHpMpu6K0hEe28sej87Dy46Q72HnE9jQ801OSTB2P rryKdKWy0GCC1aapd8Gxe8c9jcFr8fso8WF3r1VootPMYdCr+2IJHZHWPHUAylquAy50Jc 6EMRNUpXpFgqPS1GaYV6sJuNm58+ykxCCx1x6dg2Qc1nx4gnSjEuGo9FDC+zop0YQY6lIq f/qQgdbpRc+byehZ4RoY4DCWuliTaJLpzbXleE6Paq1iTTZ8lkPnxjbWlTTjDg== 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=04a6dbb444fb2496f31aa7dd3cda4f6b44a86136 commit 04a6dbb444fb2496f31aa7dd3cda4f6b44a86136 Author: Max Brazhnikov AuthorDate: 2022-01-12 20:07:32 +0000 Commit: Max Brazhnikov CommitDate: 2022-01-12 20:07:32 +0000 graphics/qcomicbook: switch from p7zip to 7-zip PR: 260866 --- graphics/qcomicbook/Makefile | 2 +- .../patch-src_Archivers_P7zipArchiverStrategy.cpp | 25 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/graphics/qcomicbook/Makefile b/graphics/qcomicbook/Makefile index 8de015e6617d..357ec204f3e4 100644 --- a/graphics/qcomicbook/Makefile +++ b/graphics/qcomicbook/Makefile @@ -21,7 +21,7 @@ USE_QT= core gui printsupport widgets x11extras\ OPTIONS_DEFINE= 7ZIP ACE RAR 7ZIP_DESC= 7-Zip (.cb7) comic book archives support -7ZIP_RUN_DEPENDS= 7z:archivers/p7zip +7ZIP_RUN_DEPENDS= 7zz:archivers/7-zip ACE_DESC= ACE (.cba) comic book archives support ACE_RUN_DEPENDS= unace:archivers/unace diff --git a/graphics/qcomicbook/files/patch-src_Archivers_P7zipArchiverStrategy.cpp b/graphics/qcomicbook/files/patch-src_Archivers_P7zipArchiverStrategy.cpp new file mode 100644 index 000000000000..bfda595cec1b --- /dev/null +++ b/graphics/qcomicbook/files/patch-src_Archivers_P7zipArchiverStrategy.cpp @@ -0,0 +1,25 @@ +--- src/Archivers/P7zipArchiverStrategy.cpp.orig 2016-11-22 17:45:10 UTC ++++ src/Archivers/P7zipArchiverStrategy.cpp +@@ -30,7 +30,7 @@ void P7zipArchiverStrategy::configure() + addExtension(".7z"); + addExtension(".cb7"); + +- setExecutables("7z", "7zr"); ++ setExecutables("7z", "7zz"); + + if (which("7z") != QString::null) + { +@@ -38,10 +38,10 @@ void P7zipArchiverStrategy::configure() + setListArguments("7z l @F"); + setSupported(); + } +- else if (which("7zr") != QString::null) ++ else if (which("7zz") != QString::null) + { +- setExtractArguments("7zr x @F"); +- setListArguments("7zr l @F"); ++ setExtractArguments("7zz x @F"); ++ setListArguments("7zz l @F"); + setSupported(); + } + }