diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-11-19 09:25:04 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-11-19 09:25:04 +0800 |
| commit | 05d5dfa20082329bff5c3cf61a517726b9957d68 (patch) | |
| tree | 5e780262b63311a3786245b7ab7364a3e3d77613 /archivers/file-roller | |
| parent | 2feb676a88c0dc2a3dad18cfa77ccc062f84adb5 (diff) | |
| download | marcuscom-ports-05d5dfa20082329bff5c3cf61a517726b9957d68.tar marcuscom-ports-05d5dfa20082329bff5c3cf61a517726b9957d68.tar.gz marcuscom-ports-05d5dfa20082329bff5c3cf61a517726b9957d68.tar.bz2 marcuscom-ports-05d5dfa20082329bff5c3cf61a517726b9957d68.tar.lz marcuscom-ports-05d5dfa20082329bff5c3cf61a517726b9957d68.tar.xz marcuscom-ports-05d5dfa20082329bff5c3cf61a517726b9957d68.tar.zst marcuscom-ports-05d5dfa20082329bff5c3cf61a517726b9957d68.zip | |
Remove a no longer needed patch, and fix a bad merge of the ISO patch.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7935 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'archivers/file-roller')
| -rw-r--r-- | archivers/file-roller/files/patch-src_file-utils.h | 16 | ||||
| -rw-r--r-- | archivers/file-roller/files/patch-src_fr-command-iso.c | 18 |
2 files changed, 13 insertions, 21 deletions
diff --git a/archivers/file-roller/files/patch-src_file-utils.h b/archivers/file-roller/files/patch-src_file-utils.h deleted file mode 100644 index d3223290f..000000000 --- a/archivers/file-roller/files/patch-src_file-utils.h +++ /dev/null @@ -1,16 +0,0 @@ ---- src/file-utils.h.orig Sun Jul 3 19:11:59 2005 -+++ src/file-utils.h Sun Jul 3 19:12:52 2005 -@@ -25,8 +25,13 @@ - - #include <sys/types.h> - #include <time.h> -+#include <stdlib.h> -+#include <limits.h> - #include <libgnomevfs/gnome-vfs-file-size.h> - #include <libgnomevfs/gnome-vfs-mime-handlers.h> -+ -+#undef fr_atoll -+#define fr_atoll(nptr) strtoll(nptr, (char **)NULL, 10) - - - #define FILENAME_MAX_LENGTH 30 /* FIXME: find out the best value */ diff --git a/archivers/file-roller/files/patch-src_fr-command-iso.c b/archivers/file-roller/files/patch-src_fr-command-iso.c index e312c2a08..ad26ca03f 100644 --- a/archivers/file-roller/files/patch-src_fr-command-iso.c +++ b/archivers/file-roller/files/patch-src_fr-command-iso.c @@ -1,5 +1,5 @@ ---- src/fr-command-iso.c.orig Sat Nov 18 20:04:49 2006 -+++ src/fr-command-iso.c Sat Nov 18 20:05:00 2006 +--- src/fr-command-iso.c.orig Tue Nov 7 04:03:30 2006 ++++ src/fr-command-iso.c Sat Nov 18 20:22:18 2006 @@ -159,6 +159,7 @@ fr_command_iso_extract (FRCommand *comm gboolean junk_paths, const char *password) @@ -8,7 +8,15 @@ char *e_dest_dir; GList *scan; -@@ -181,6 +182,8 @@ fr_command_iso_extract (FRCommand *comm +@@ -166,6 +167,7 @@ fr_command_iso_extract (FRCommand *comm + + for (scan = file_list; scan; scan = scan->next) { + char *path = scan->data; ++ char *extract_path; + const char *filename; + char *file_dir, *e_temp_dest_dir = NULL, *temp_dest_dir = NULL; + +@@ -180,6 +182,8 @@ fr_command_iso_extract (FRCommand *comm if (e_temp_dest_dir == NULL) continue; @@ -17,7 +25,7 @@ temp_dest_dir = unescape_str (e_temp_dest_dir); ensure_dir_exists (temp_dest_dir, 0700); -@@ -189,13 +192,14 @@ fr_command_iso_extract (FRCommand *comm +@@ -188,13 +192,14 @@ fr_command_iso_extract (FRCommand *comm fr_process_add_arg (comm->process, "-i"); fr_process_add_arg (comm->process, comm->e_filename); fr_process_add_arg (comm->process, "-x"); @@ -26,7 +34,7 @@ fr_process_add_arg (comm->process, ">"); fr_process_add_arg (comm->process, filename); fr_process_end_command (comm->process); - + g_free (e_temp_dest_dir); g_free (temp_dest_dir); + g_free (extract_path); |