diff options
Diffstat (limited to 'archivers/file-roller/files')
| -rw-r--r-- | archivers/file-roller/files/patch-help_Makefile.in | 20 | ||||
| -rw-r--r-- | archivers/file-roller/files/patch-src_file-utils.h | 16 | ||||
| -rw-r--r-- | archivers/file-roller/files/patch-src_fr-command-tar.c | 12 |
3 files changed, 42 insertions, 6 deletions
diff --git a/archivers/file-roller/files/patch-help_Makefile.in b/archivers/file-roller/files/patch-help_Makefile.in new file mode 100644 index 000000000000..d1e1b99597dd --- /dev/null +++ b/archivers/file-roller/files/patch-help_Makefile.in @@ -0,0 +1,20 @@ +--- help/Makefile.in.orig Tue Aug 9 00:19:45 2005 ++++ help/Makefile.in Tue Aug 9 00:20:04 2005 +@@ -869,7 +869,7 @@ + @for fig in $(_DOC_C_FIGURES) $(_DOC_LC_FIGURES); do \ + if test -f "$$fig"; then d=; else d="$(srcdir)/"; fi; \ + if test -f "$$d$$fig"; then \ +- figdir=`echo $$fig | sed -e 's/^\(.*\/\).*\|.*/\1/'`; \ ++ figdir=`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$figdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$figdir"; \ + $(mkinstalldirs) "$(distdir)/$$figdir"; \ +@@ -944,7 +944,7 @@ + else \ + figfile="$(srcdir)/C/$$fig"; \ + fi; \ +- figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*\|.*/\1/'`; \ ++ figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \ + if ! test -d "$$figdir"; then \ + echo "$(mkinstalldirs) $$figdir"; \ diff --git a/archivers/file-roller/files/patch-src_file-utils.h b/archivers/file-roller/files/patch-src_file-utils.h new file mode 100644 index 000000000000..d3223290fe1c --- /dev/null +++ b/archivers/file-roller/files/patch-src_file-utils.h @@ -0,0 +1,16 @@ +--- 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-tar.c b/archivers/file-roller/files/patch-src_fr-command-tar.c index 5a046266d274..c4e3bac836f0 100644 --- a/archivers/file-roller/files/patch-src_fr-command-tar.c +++ b/archivers/file-roller/files/patch-src_fr-command-tar.c @@ -1,13 +1,13 @@ ---- src/fr-command-tar.c.orig Fri Apr 22 13:11:56 2005 -+++ src/fr-command-tar.c Fri Apr 22 13:16:00 2005 -@@ -221,6 +221,10 @@ +--- src/fr-command-tar.c.orig Fri Jul 1 14:41:32 2005 ++++ src/fr-command-tar.c Sun Jul 3 19:03:01 2005 +@@ -222,6 +223,10 @@ begin_tar_command (FRCommand *comm) + #if defined (__SVR4) && defined (__sun) if (g_file_test ("/usr/sfw/bin/gtar", G_FILE_TEST_IS_EXECUTABLE)) { command = g_strdup ("/usr/sfw/bin/gtar"); - } ++ } +#elif defined(__FreeBSD__) + if (g_file_test ("%%LOCALBASE%%/bin/gtar", G_FILE_TEST_IS_EXECUTABLE)) { + command = g_strdup ("%%LOCALBASE%%/bin/gtar"); -+ } + } #endif if (command != NULL) - fr_process_begin_command (comm->process, command); |