Attachment 231689 Details for Bug 261839 – patch

[patch] patch

0001-archivers-file-roller-switch-from-p7zip-to-7-zip.patch (text/plain), 1.99 KB, created by Max Brazhnikov on 2022-02-09 19:24:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Max Brazhnikov

Created: 2022-02-09 19:24:33 UTC

Size: 1.99 KB

patch

obsolete

>From dab401d9364a45da57d1e651b2d07cb642dcd445 Mon Sep 17 00:00:00 2001
>From: Max Brazhnikov <makc@FreeBSD.org>
>Date: Wed, 9 Feb 2022 22:19:59 +0300
>Subject: archivers/file-roller: switch from p7zip to 7-zip
>
>---
> archivers/file-roller/Makefile                   |  5 +++++
> .../file-roller/files/patch-src_fr-command-7z.c  | 16 ++++++++++++++++
> 2 files changed, 21 insertions(+)
> create mode 100644 archivers/file-roller/files/patch-src_fr-command-7z.c
>
>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 <bsd.port.mk>
>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)
>-- 
>2.34.1
>

Actions: View | Diff

Attachments on bug 261839: 231689