diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-04-06 04:54:18 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-04-06 04:54:18 +0800 |
commit | 638b97f5a5d741cee963b662efa43f26ddf9d04c (patch) | |
tree | c4dfb23a4708ce0260562560cd232bdef6bb6711 /archivers/file-roller/files | |
parent | 9062210343a87551bd420e59ca2d4e52f1365fe3 (diff) | |
download | marcuscom-ports-638b97f5a5d741cee963b662efa43f26ddf9d04c.tar marcuscom-ports-638b97f5a5d741cee963b662efa43f26ddf9d04c.tar.gz marcuscom-ports-638b97f5a5d741cee963b662efa43f26ddf9d04c.tar.bz2 marcuscom-ports-638b97f5a5d741cee963b662efa43f26ddf9d04c.tar.lz marcuscom-ports-638b97f5a5d741cee963b662efa43f26ddf9d04c.tar.xz marcuscom-ports-638b97f5a5d741cee963b662efa43f26ddf9d04c.tar.zst marcuscom-ports-638b97f5a5d741cee963b662efa43f26ddf9d04c.zip |
Garbage collection GNOME 2.5. Next stop, GNOME 2.7.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2260 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'archivers/file-roller/files')
-rw-r--r-- | archivers/file-roller/files/patch-configure | 10 | ||||
-rw-r--r-- | archivers/file-roller/files/patch-src_fr-command-tar.c | 72 |
2 files changed, 0 insertions, 82 deletions
diff --git a/archivers/file-roller/files/patch-configure b/archivers/file-roller/files/patch-configure deleted file mode 100644 index 53e3c8877..000000000 --- a/archivers/file-roller/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig Tue Dec 10 23:18:40 2002 -+++ configure Tue Dec 10 23:18:59 2002 -@@ -6403,6 +6403,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/archivers/file-roller/files/patch-src_fr-command-tar.c b/archivers/file-roller/files/patch-src_fr-command-tar.c deleted file mode 100644 index 728ff0bce..000000000 --- a/archivers/file-roller/files/patch-src_fr-command-tar.c +++ /dev/null @@ -1,72 +0,0 @@ ---- src/fr-command-tar.c.orig Mon Mar 8 18:20:07 2004 -+++ src/fr-command-tar.c Sun Mar 14 00:14:41 2004 -@@ -196,6 +196,11 @@ - return g_strndup (f_start + 1, f_end - f_start); - } - -+static char *months[] = { -+ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", -+ "Nov", "Dec" -+}; -+ - - static void - process_line (char *line, -@@ -204,28 +209,36 @@ - FileData *fdata; - FRCommand *comm = FR_COMMAND (data); - char **fields; -- int date_idx; -- char *field_date, *field_time, *field_size, *field_name; -+ int i; -+ struct tm tm = {0, }; -+ char **time_fields; -+ const char *field_name; - - g_return_if_fail (line != NULL); - - fdata = file_data_new (); - -- date_idx = get_index_from_pattern (line, "%n%n%n%n-%n%n-%n%n %n%n:%n%n"); -+ fields = split_line (line, 7); - -- field_size = get_prev_field (line, date_idx, 1); -- fdata->size = atol (field_size); -- g_free (field_size); -- -- field_date = get_next_field (line, date_idx, 1); -- field_time = get_next_field (line, date_idx, 2); -- fdata->modified = mktime_from_string (field_date, field_time); -- g_free (field_date); -- g_free (field_time); -+ fdata->size = atol (fields[2]); -+ for (i = 0; i < 12; i++) { -+ if (!strncmp(fields[3], months[i], 3)) break; -+ } -+ tm.tm_mon = i; -+ tm.tm_year = atoi (fields[6]) - 1900; -+ tm.tm_mday = atoi (fields[4]); -+ time_fields = g_strsplit(fields[5], ":", 2); -+ tm.tm_hour = atoi (time_fields[0]); -+ tm.tm_min = atoi (time_fields[1]); -+ tm.tm_sec = 0; -+ tm.tm_isdst = -1; -+ fdata->modified = mktime(&tm); -+ g_strfreev (fields); -+ g_strfreev (time_fields); - - /* Full path */ - -- field_name = get_next_field (line, date_idx, 3); -+ field_name = get_last_field (line, 8); - fields = g_strsplit (field_name, " -> ", 2); - - if (fields[1] == NULL) { -@@ -244,7 +257,6 @@ - if (fields[1] != NULL) - fdata->link = g_strdup (fields[1]); - g_strfreev (fields); -- g_free (field_name); - - fdata->name = g_strdup (file_name_from_path (fdata->full_path)); - fdata->path = remove_level_from_path (fdata->full_path); |