Part two of the GNOME 3.6 update.

Submitted by:	Gustau Perez


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18422 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 0 insertions, 81 deletions

diff --git a/archivers/file-roller3/files/patch-src_fr-command-lrzip.c b/archivers/file-roller3/files/patch-src_fr-command-lrzip.c
deleted file mode 100644
index ae2d7d440..000000000
--- a/archivers/file-roller3/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-roller3/files/patch-src_fr-command-tar.c b/archivers/file-roller3/files/patch-src_fr-command-tar.c
deleted file mode 100644
index 78843a28c..000000000
--- a/archivers/file-roller3/files/patch-src_fr-command-tar.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/fr-command-tar.c.orig	Sun Oct 15 12:33:56 2006
-+++ src/fr-command-tar.c	Mon Oct 16 19:18:03 2006
-@@ -231,6 +231,9 @@
- #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);
diff --git a/archivers/file-roller3/files/patch-src_fr-command-zip.c b/archivers/file-roller3/files/patch-src_fr-command-zip.c
deleted file mode 100644
index 5995813eb..000000000
--- a/archivers/file-roller3/files/patch-src_fr-command-zip.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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);
- 
-+#ifdef __FreeBSD__
-+	fr_process_begin_command (comm->process, "%%LOCALBASE%%/bin/unzip");
-+#else
- 	fr_process_begin_command (comm->process, "unzip");
-+#endif
- 	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);
-@@ -301,7 +305,11 @@ fr_command_zip_extract (FrCommand  *comm
- 				      process_line__common,
- 				      comm);
- 
-+#ifdef __FreeBSD__
-+	fr_process_begin_command (comm->process, "%%LOCALBASE%%/bin/unzip");
-+#else
- 	fr_process_begin_command (comm->process, "unzip");
-+#endif
- 
- 	if (dest_dir != NULL) {
- 		fr_process_add_arg (comm->process, "-d");
-@@ -333,7 +341,11 @@ fr_command_zip_extract (FrCommand  *comm
- static void
- fr_command_zip_test (FrCommand   *comm)
- {
-+#ifdef __FreeBSD__
-+	fr_process_begin_command (comm->process, "%%LOCALBASE%%/bin/unzip");
-+#else
- 	fr_process_begin_command (comm->process, "unzip");
-+#endif
- 	fr_process_add_arg (comm->process, "-t");
- 	add_password_arg (comm, comm->password);
- 	fr_process_add_arg (comm->process, comm->filename);
diff --git a/archivers/file-roller3/files/patch-src_fr-window.c b/archivers/file-roller3/files/patch-src_fr-window.c
deleted file mode 100644
index 4b1304ad7..000000000
--- a/archivers/file-roller3/files/patch-src_fr-window.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/fr-window.c.orig	2012-06-29 16:17:21.000000000 +0200
-+++ src/fr-window.c	2012-06-29 16:18:38.000000000 +0200
-@@ -6797,7 +6797,7 @@
- 			g_object_unref (info);
- 			g_object_unref (file);
- 
--			return;
-+			return FALSE;
- 		}
- 
- 		g_object_unref (info);
-@@ -6807,7 +6807,7 @@
- 	if (do_not_extract) {
- 		fr_window_stop_batch (odata->window);
- 		g_free (odata);
--		return;
-+		return FALSE;
- 	}
- 
- 	odata->edata->overwrite = FR_OVERWRITE_YES;