diff options
Diffstat (limited to 'archivers/file-roller/files')
| -rw-r--r-- | archivers/file-roller/files/patch-src_fr-command-lrzip.c | 11 | ||||
| -rw-r--r-- | archivers/file-roller/files/patch-src_fr-command-zip.c | 13 |
2 files changed, 6 insertions, 18 deletions
diff --git a/archivers/file-roller/files/patch-src_fr-command-lrzip.c b/archivers/file-roller/files/patch-src_fr-command-lrzip.c deleted file mode 100644 index ae2d7d440482..000000000000 --- a/archivers/file-roller/files/patch-src_fr-command-lrzip.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/fr-command-lrzip.c.orig 2010-08-26 12:40:56.000000000 -0400 -+++ src/fr-command-lrzip.c 2010-08-26 12:41:41.000000000 -0400 -@@ -53,7 +53,7 @@ list__process_line (char *line, - struct stat st; - time_t tt; - if (stat (comm->filename, &st) == 0) -- fdata->modified = st.st_mtim.tv_sec; -+ fdata->modified = st.st_mtime; - else - time(&(fdata->modified)); - fdata->modified; diff --git a/archivers/file-roller/files/patch-src_fr-command-zip.c b/archivers/file-roller/files/patch-src_fr-command-zip.c index ee9ec93de8c1..5995813eb3b6 100644 --- a/archivers/file-roller/files/patch-src_fr-command-zip.c +++ b/archivers/file-roller/files/patch-src_fr-command-zip.c @@ -1,6 +1,6 @@ ---- src/fr-command-zip.c.orig 2010-01-02 17:02:44.000000000 -0500 -+++ src/fr-command-zip.c 2010-01-02 17:08:03.000000000 -0500 -@@ -187,7 +187,11 @@ fr_command_zip_list (FrCommand *comm) +--- src/fr-command-zip.c.orig 2010-11-16 08:32:18.000000000 +0000 ++++ src/fr-command-zip.c 2011-01-20 16:55:45.000000000 +0000 +@@ -186,7 +186,11 @@ fr_command_zip_list (FrCommand *comm) { fr_process_set_out_line_func (comm->process, list__process_line, comm); @@ -12,7 +12,7 @@ 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 +306,11 @@ fr_command_zip_extract (FrCommand *comm +@@ -301,7 +305,11 @@ fr_command_zip_extract (FrCommand *comm process_line__common, comm); @@ -24,15 +24,14 @@ if (dest_dir != NULL) { fr_process_add_arg (comm->process, "-d"); -@@ -334,7 +342,11 @@ fr_command_zip_extract (FrCommand *comm +@@ -333,7 +341,11 @@ fr_command_zip_extract (FrCommand *comm static void fr_command_zip_test (FrCommand *comm) { -- fr_process_begin_command (comm->process, "unzip"); +#ifdef __FreeBSD__ + fr_process_begin_command (comm->process, "%%LOCALBASE%%/bin/unzip"); +#else -+ fr_process_begin_command (comm->process, "%%LOCALBASE%%/bin/unzip"); + fr_process_begin_command (comm->process, "unzip"); +#endif fr_process_add_arg (comm->process, "-t"); add_password_arg (comm, comm->password); |