From nobody Thu Feb 10 17:33:08 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 C449319C9F24; Thu, 10 Feb 2022 17:33:08 +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 4JvkNh52Vtz3P4f; Thu, 10 Feb 2022 17:33:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644514388; 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=EIwqJJh/sde+YmoWJsvYIWwoRpi8+xru2zLqVyqLwPY=; b=eR+cmCkOPixfuBI21q3ZxkAImWFQQHITXz6uENKMxu/vK/ytCyniqf0AzRYLNDbsurOsuG uhe0geDmAMPN0snDw3VEfOD4r30vV350kjUEWXmuyZnPvjqfSp545Btbr7OkxBTZRxmk7t GkZcXpHUOUfUeTp4XVuUWDh+vkjPfKhz6DJfxThjsP+KQVHFtCPp/ttX3JgiZjH/9c2qkz CC2NOy2+wY4J9gnbtgZOwW1/8Y4dJU6E0mpSx2sA9i//Si/wWyPsoK/P4YWATLgcZQh7UA JQV3g0M40Gq7YrIfbgOPO0que9C6RB+0+S4H1nr8nE4Ze6Nlwgn2syjlvU5YPQ== 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 8DC6B24AAF; Thu, 10 Feb 2022 17:33:08 +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 21AHX84i059620; Thu, 10 Feb 2022 17:33:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21AHX8uA059619; Thu, 10 Feb 2022 17:33:08 GMT (envelope-from git) Date: Thu, 10 Feb 2022 17:33:08 GMT Message-Id: <202202101733.21AHX8uA059619@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: 6f3872ab47a6 - main - archivers/file-roller: 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: 6f3872ab47a6bbceb3743e022611ec838ad450d0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644514388; 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=EIwqJJh/sde+YmoWJsvYIWwoRpi8+xru2zLqVyqLwPY=; b=bis5r7r/wQa3pcj6dznbYMI9fqN6MlAeWM7GtGp8H7pqibc0zdNkZoZrieBrzfxT0iFOxd vg6cUdsEHw6z/AElzrBl0J0uVeNJwHCOcovXiPQL8RMUZSee8C8kqMZxNWJXq9QzsS8utd F307MV7xrL96LpVlhfAQqe1zRYapnzvR+T92HsGiTuvnF3QtSxqILZMtXeJxKhG7YGZjDq tJnp+y8LqfRWM6J9J8QW+7D7KwNynejQcWHBQZrXhsrvj9JDJ3VsTGy7SJ+QLcH4utGCVw fC5MsSj6r5HAJc5bRXsBNFt9vN57xT0Zm9r0HJxDoUSKROXtp06n/xHJ9X2tIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644514388; a=rsa-sha256; cv=none; b=bGMQgGb1xuosX1IHYfLrcp4NgEZDLBKP2L1K4SA95jsSvVxhLd786xdVnU8LTe4YUpdgQi KLgxAd4NtQLqMNjEuvcywlZM8S/h1UGkFUlRrrFJQPi+SbPsAC3c1k4+hl6psGLM3RoQ+u OqHQKQlbQ7YTwxanWS2PmVrsDcI6rKxUP7t7QQh6wSTciazfUHaNHEpNiin8DiWSsL3wXq Q+FatTy03oOsWhNvPR8Vf3yNbyznqxyXNXYqW24YvB6Xe2fc1FdIotNbtCDgsiqBzzQue1 25VXtwlquTpDxOqfm/ubcn0refKqhVQyaFKCEJPNXu+t8TuLqakBdtOXN1QnHw== 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=6f3872ab47a6bbceb3743e022611ec838ad450d0 commit 6f3872ab47a6bbceb3743e022611ec838ad450d0 Author: Max Brazhnikov AuthorDate: 2022-02-10 17:29:02 +0000 Commit: Max Brazhnikov CommitDate: 2022-02-10 17:29:15 +0000 archivers/file-roller: switch from p7zip to 7-zip PR: 260866 261839 Approved by: tcberner@ --- archivers/file-roller/Makefile | 5 +++++ archivers/file-roller/files/patch-src_fr-command-7z.c | 16 ++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index 10554cdcde03..51bb6b0f775b 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -2,6 +2,7 @@ PORTNAME= file-roller PORTVERSION= 3.40.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= archivers gnome MASTER_SITES= GNOME @@ -62,5 +63,9 @@ post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/src/fr-command-tar.c \ ${WRKSRC}/src/fr-command-zip.c + @${REINPLACE_CMD} -e 's|"7z"|"7zz"|g' \ + ${WRKSRC}/src/fr-archive-libarchive.c \ + ${WRKSRC}/src/fr-command-7z.c \ + ${WRKSRC}/src/fr-command-tar.c .include diff --git a/archivers/file-roller/files/patch-src_fr-command-7z.c b/archivers/file-roller/files/patch-src_fr-command-7z.c new file mode 100644 index 000000000000..9a9297f2190f --- /dev/null +++ b/archivers/file-roller/files/patch-src_fr-command-7z.c @@ -0,0 +1,16 @@ +--- src/fr-command-7z.c.orig 2021-05-01 19:02:13 UTC ++++ src/fr-command-7z.c +@@ -325,8 +325,11 @@ fr_command_7z_add (FrCommand *command, + fr_process_add_arg (command->process, "-bd"); + fr_process_add_arg (command->process, "-bb1"); + fr_process_add_arg (command->process, "-y"); +- if (follow_links) +- fr_process_add_arg (command->process, "-l"); ++ if (! follow_links) ++ { ++ fr_process_add_arg (command->process, "-snh"); ++ fr_process_add_arg (command->process, "-snl"); ++ } + add_password_arg (command, archive->password, FALSE); + if ((archive->password != NULL) + && (*archive->password != 0)