From d5e5d7473248db25ecb40b10b75ea29179514aaa Mon Sep 17 00:00:00 2001 From: ahoka Date: Sat, 19 Sep 2009 07:46:56 +0000 Subject: Missed this patch in my last unzip commit. --- archivers/file-roller/patches/patch-unzip | 48 +++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 archivers/file-roller/patches/patch-unzip (limited to 'archivers/file-roller/patches') diff --git a/archivers/file-roller/patches/patch-unzip b/archivers/file-roller/patches/patch-unzip new file mode 100644 index 00000000000..a945c8b56ee --- /dev/null +++ b/archivers/file-roller/patches/patch-unzip @@ -0,0 +1,48 @@ +$NetBSD: patch-unzip,v 1.1 2009/09/19 07:46:56 ahoka Exp $ + +--- src/fr-command-zip.c.orig 2009-06-30 01:32:59.000000000 +0200 ++++ src/fr-command-zip.c +@@ -33,6 +33,7 @@ + #include "fr-command.h" + #include "fr-command-zip.h" + ++#define FR_UNZIP_COMMAND "@@UNZIP_COMMAND@@" + #define EMPTY_ARCHIVE_WARNING "Empty zipfile." + #define ZIP_SPECIAL_CHARACTERS "[]*?!^-\\" + +@@ -187,7 +188,7 @@ fr_command_zip_list (FrCommand *comm) + { + fr_process_set_out_line_func (comm->process, list__process_line, comm); + +- fr_process_begin_command (comm->process, "unzip"); ++ fr_process_begin_command (comm->process, FR_UNZIP_COMMAND); + fr_process_set_begin_func (comm->process, list__begin, comm); + fr_process_add_arg (comm->process, "-ZTs"); + fr_process_add_arg (comm->process, comm->filename); +@@ -302,7 +303,7 @@ fr_command_zip_extract (FrCommand *comm + process_line__common, + comm); + +- fr_process_begin_command (comm->process, "unzip"); ++ fr_process_begin_command (comm->process, FR_UNZIP_COMMAND); + + if (dest_dir != NULL) { + fr_process_add_arg (comm->process, "-d"); +@@ -334,7 +335,7 @@ fr_command_zip_extract (FrCommand *comm + static void + fr_command_zip_test (FrCommand *comm) + { +- fr_process_begin_command (comm->process, "unzip"); ++ fr_process_begin_command (comm->process, FR_UNZIP_COMMAND); + fr_process_add_arg (comm->process, "-t"); + add_password_arg (comm, comm->password); + fr_process_add_arg (comm->process, comm->filename); +@@ -399,7 +400,7 @@ fr_command_zip_get_capabilities (FrComma + else + capabilities |= FR_COMMAND_CAN_READ_WRITE; + } +- else if (is_program_in_path ("unzip")) ++ else if (is_program_in_path (FR_UNZIP_COMMAND)) + capabilities |= FR_COMMAND_CAN_READ; + + return capabilities; -- cgit v1.2.3