diff --git a/abuild.patch b/abuild.patch
new file mode 100644
index 0000000..f5f043a
--- /dev/null
+++ b/abuild.patch
@@ -0,0 +1,13 @@
+Index: file-roller-2.19.2/src/file-utils.c
+===================================================================
+--- file-roller-2.19.2.orig/src/file-utils.c
++++ file-roller-2.19.2/src/file-utils.c
+@@ -1206,7 +1206,7 @@ get_uri_from_path (const char *path)
+ {
+ 	if (path == NULL)
+ 		return NULL;
+-	if ((path == "") || (path[0] == '/'))
++	if ((!strcmp (path, "")) || (path[0] == '/'))
+ 		return g_strconcat ("file://", path, NULL);
+ 	return g_strdup (path);
+ }
diff --git a/bug-187126_file-roller-batch-extract-all.patch b/bug-187126_file-roller-batch-extract-all.patch
index b0a2861..1895228 100644
--- a/bug-187126_file-roller-batch-extract-all.patch
+++ b/bug-187126_file-roller-batch-extract-all.patch
@@ -14,45 +14,40 @@ Original bug: https://launchpad.net/distros/ubuntu/+source/file-roller/+bug/4089
 	* src/window.c (window_archive__open_extract): tell
 	  window_fake_load that we are batch extracting all
 
-Index: file-roller-2.18.0/src/window.h
+Index: file-roller-2.19.2/src/fr-window.c
 ===================================================================
---- file-roller-2.18.0.orig/src/window.h
-+++ file-roller-2.18.0/src/window.h
-@@ -201,6 +201,7 @@ typedef struct {
- 					 * operation.  */
+--- file-roller-2.19.2.orig/src/fr-window.c
++++ file-roller-2.19.2/src/fr-window.c
+@@ -309,6 +309,7 @@ struct _FrWindowPrivateData {
+ 	gboolean   extract_interact_use_default_dir;
+ 	gboolean   update_dropped_files;
+ 	gboolean   batch_adding_one_file;
++	gboolean   batch_extracting_all;
  
- 	gboolean batch_adding_one_file;
-+	gboolean batch_extracting_all;
- 
- 	/* progress dialog data */
- 
-Index: file-roller-2.18.0/src/window.c
-===================================================================
---- file-roller-2.18.0.orig/src/window.c
-+++ file-roller-2.18.0/src/window.c
-@@ -3309,7 +3309,8 @@ window_fake_load (FRArchive *archive,
- 	return (window->batch_mode
- 		&& ! (window->add_after_opening && window->update_dropped_files && ! archive->command->propAddCanUpdate)
- 		&& ! (window->add_after_opening && ! window->update_dropped_files && ! archive->command->propAddCanReplace)
--		&& archive->command->propCanExtractAll);
-+		&& ! (window->batch_extracting_all && !archive->command->propCanExtractAll));
-+
+ 	GtkWindow *load_error_parent_window;
+ };
+@@ -3762,7 +3763,7 @@ fr_window_fake_load (FrArchive *archive,
+ 	return (window->priv->batch_mode
+ 		&& ! (add_after_opening && window->priv->update_dropped_files && ! archive->command->propAddCanUpdate)
+ 		&& ! (add_after_opening && ! window->priv->update_dropped_files && ! archive->command->propAddCanReplace)
+-		&& ! (extract_after_opening && !archive->command->propCanExtractAll));
++		&& ! (window->priv->batch_extracting_all && !(extract_after_opening && !archive->command->propCanExtractAll)));
  }
  
  
-@@ -3682,6 +3683,7 @@ window_new (void)
- 	window->stoppable = TRUE;
+@@ -4120,6 +4121,7 @@ fr_window_construct (FrWindow *window)
+ 	window->priv->stoppable = TRUE;
  
- 	window->batch_adding_one_file = FALSE;
-+	window->batch_extracting_all = FALSE;
+ 	window->priv->batch_adding_one_file = FALSE;
++	window->priv->batch_extracting_all = FALSE;
  
- 	window->path_clicked = NULL;
+ 	window->priv->path_clicked = NULL;
  
-@@ -6738,6 +6740,7 @@ window_archive__open_extract_here (FRWin
+@@ -7038,6 +7040,7 @@ fr_window_new_batch (FrWindow *window)
+ {
+ 	fr_window_free_batch_data (window);
+ 	window->priv->non_interactive = TRUE;
++	window->priv->batch_extracting_all = TRUE;
+ }
  
- 	window->non_interactive = TRUE;
  
-+	window->batch_extracting_all = TRUE;
- 	window_batch_mode_add_action (window,
- 				      FR_BATCH_ACTION_OPEN,
- 				      g_strdup (filename),
diff --git a/file-roller-2.12.2-no-cmdline-overflow.patch b/file-roller-2.12.2-no-cmdline-overflow.patch
index 2ade411..f69740f 100644
--- a/file-roller-2.12.2-no-cmdline-overflow.patch
+++ b/file-roller-2.12.2-no-cmdline-overflow.patch
@@ -1,8 +1,8 @@
-Index: file-roller-2.18.0/src/fr-archive.c
+Index: file-roller-2.19.2/src/fr-archive.c
 ===================================================================
---- file-roller-2.18.0.orig/src/fr-archive.c
-+++ file-roller-2.18.0/src/fr-archive.c
-@@ -1487,7 +1487,7 @@ move_files_to_dir (FRArchive  *archive,
+--- file-roller-2.19.2.orig/src/fr-archive.c
++++ file-roller-2.19.2/src/fr-archive.c
+@@ -2703,7 +2703,7 @@ move_files_to_dir (FrArchive  *archive,
  		else
  			sprintf (path, "%s/%s", source_dir, e_filename);
  
@@ -11,11 +11,11 @@ Index: file-roller-2.18.0/src/fr-archive.c
  
  		g_free (e_filename);
  	}
-Index: file-roller-2.18.0/src/fr-command-ar.c
+Index: file-roller-2.19.2/src/fr-command-ar.c
 ===================================================================
---- file-roller-2.18.0.orig/src/fr-command-ar.c
-+++ file-roller-2.18.0/src/fr-command-ar.c
-@@ -225,7 +225,7 @@ fr_command_ar_add (FRCommand     *comm,
+--- file-roller-2.19.2.orig/src/fr-command-ar.c
++++ file-roller-2.19.2/src/fr-command-ar.c
+@@ -225,7 +225,7 @@ fr_command_ar_add (FrCommand     *comm,
  	fr_process_add_arg (comm->process, comm->e_filename);
  
  	for (scan = file_list; scan; scan = scan->next) 
@@ -24,7 +24,7 @@ Index: file-roller-2.18.0/src/fr-command-ar.c
  
  	fr_process_end_command (comm->process);
  }
-@@ -243,7 +243,7 @@ fr_command_ar_delete (FRCommand *comm,
+@@ -243,7 +243,7 @@ fr_command_ar_delete (FrCommand *comm,
  	fr_process_add_arg (comm->process, comm->e_filename);
  
  	for (scan = file_list; scan; scan = scan->next)
@@ -33,7 +33,7 @@ Index: file-roller-2.18.0/src/fr-command-ar.c
  	fr_process_end_command (comm->process);
  }
  
-@@ -268,7 +268,7 @@ fr_command_ar_extract (FRCommand  *comm,
+@@ -268,7 +268,7 @@ fr_command_ar_extract (FrCommand  *comm,
  	fr_process_add_arg (comm->process, comm->e_filename);
  
  	for (scan = file_list; scan; scan = scan->next)
@@ -42,20 +42,20 @@ Index: file-roller-2.18.0/src/fr-command-ar.c
  
  	fr_process_end_command (comm->process);
  }
-Index: file-roller-2.18.0/src/fr-command-arj.c
+Index: file-roller-2.19.2/src/fr-command-arj.c
 ===================================================================
---- file-roller-2.18.0.orig/src/fr-command-arj.c
-+++ file-roller-2.18.0/src/fr-command-arj.c
-@@ -217,7 +217,7 @@ fr_command_arj_add (FRCommand     *comm,
+--- file-roller-2.19.2.orig/src/fr-command-arj.c
++++ file-roller-2.19.2/src/fr-command-arj.c
+@@ -217,7 +217,7 @@ fr_command_arj_add (FrCommand     *comm,
  	fr_process_add_arg (comm->process, comm->e_filename);
  
- 	for (scan = file_list; scan; scan = scan->next) 
+ 	for (scan = file_list; scan; scan = scan->next)
 -		fr_process_add_arg (comm->process, (gchar*) scan->data);
 +		fr_process_add_file_arg (comm->process, (gchar*) scan->data);
  
  	fr_process_end_command (comm->process);
  }
-@@ -239,7 +239,7 @@ fr_command_arj_delete (FRCommand *comm,
+@@ -239,7 +239,7 @@ fr_command_arj_delete (FrCommand *comm,
  	fr_process_add_arg (comm->process, comm->e_filename);
  
  	for (scan = file_list; scan; scan = scan->next)
@@ -64,7 +64,7 @@ Index: file-roller-2.18.0/src/fr-command-arj.c
  	fr_process_end_command (comm->process);
  }
  
-@@ -290,7 +290,7 @@ fr_command_arj_extract (FRCommand  *comm
+@@ -290,7 +290,7 @@ fr_command_arj_extract (FrCommand  *comm
  	fr_process_add_arg (comm->process, comm->e_filename);
  
  	for (scan = file_list; scan; scan = scan->next)
@@ -73,11 +73,11 @@ Index: file-roller-2.18.0/src/fr-command-arj.c
  
  	fr_process_end_command (comm->process);
  }
-Index: file-roller-2.18.0/src/fr-command-lha.c
+Index: file-roller-2.19.2/src/fr-command-lha.c
 ===================================================================
---- file-roller-2.18.0.orig/src/fr-command-lha.c
-+++ file-roller-2.18.0/src/fr-command-lha.c
-@@ -234,7 +234,7 @@ fr_command_lha_add (FRCommand     *comm,
+--- file-roller-2.19.2.orig/src/fr-command-lha.c
++++ file-roller-2.19.2/src/fr-command-lha.c
+@@ -242,7 +242,7 @@ fr_command_lha_add (FrCommand     *comm,
  		fr_process_add_arg (comm->process, "a");
  	fr_process_add_arg (comm->process, comm->e_filename);
  	for (scan = file_list; scan; scan = scan->next) 
@@ -86,7 +86,7 @@ Index: file-roller-2.18.0/src/fr-command-lha.c
  	fr_process_end_command (comm->process);
  }
  
-@@ -250,7 +250,7 @@ fr_command_lha_delete (FRCommand *comm,
+@@ -258,7 +258,7 @@ fr_command_lha_delete (FrCommand *comm,
  	fr_process_add_arg (comm->process, comm->e_filename);
  
  	for (scan = file_list; scan; scan = scan->next)
@@ -95,7 +95,7 @@ Index: file-roller-2.18.0/src/fr-command-lha.c
  	fr_process_end_command (comm->process);
  }
  
-@@ -288,7 +288,7 @@ fr_command_lha_extract (FRCommand  *comm
+@@ -296,7 +296,7 @@ fr_command_lha_extract (FrCommand  *comm
  	fr_process_add_arg (comm->process, comm->e_filename);
  
  	for (scan = file_list; scan; scan = scan->next)
@@ -104,20 +104,20 @@ Index: file-roller-2.18.0/src/fr-command-lha.c
  
  	fr_process_end_command (comm->process);
  }
-Index: file-roller-2.18.0/src/fr-command-rar.c
+Index: file-roller-2.19.2/src/fr-command-rar.c
 ===================================================================
---- file-roller-2.18.0.orig/src/fr-command-rar.c
-+++ file-roller-2.18.0/src/fr-command-rar.c
-@@ -263,7 +263,7 @@ fr_command_rar_add (FRCommand     *comm,
+--- file-roller-2.19.2.orig/src/fr-command-rar.c
++++ file-roller-2.19.2/src/fr-command-rar.c
+@@ -263,7 +263,7 @@ fr_command_rar_add (FrCommand     *comm,
  	fr_process_add_arg (comm->process, comm->e_filename);
  
- 	for (scan = file_list; scan; scan = scan->next) 
+ 	for (scan = file_list; scan; scan = scan->next)
 -		fr_process_add_arg (comm->process, (gchar*) scan->data);
 +		fr_process_add_file_arg (comm->process, (gchar*) scan->data);
  
  	fr_process_end_command (comm->process);
  }
-@@ -284,7 +284,7 @@ fr_command_rar_delete (FRCommand *comm,
+@@ -284,7 +284,7 @@ fr_command_rar_delete (FrCommand *comm,
  	fr_process_add_arg (comm->process, comm->e_filename);
  
  	for (scan = file_list; scan; scan = scan->next)
@@ -126,7 +126,7 @@ Index: file-roller-2.18.0/src/fr-command-rar.c
  	fr_process_end_command (comm->process);
  }
  
-@@ -329,7 +329,7 @@ fr_command_rar_extract (FRCommand  *comm
+@@ -329,7 +329,7 @@ fr_command_rar_extract (FrCommand  *comm
  	fr_process_add_arg (comm->process, comm->e_filename);
  
  	for (scan = file_list; scan; scan = scan->next)
@@ -135,11 +135,11 @@ Index: file-roller-2.18.0/src/fr-command-rar.c
  
  	if (dest_dir != NULL) {
  		char *e_dest_dir = fr_command_escape (comm, dest_dir);
-Index: file-roller-2.18.0/src/fr-command-rpm.c
+Index: file-roller-2.19.2/src/fr-command-rpm.c
 ===================================================================
---- file-roller-2.18.0.orig/src/fr-command-rpm.c
-+++ file-roller-2.18.0/src/fr-command-rpm.c
-@@ -177,7 +177,7 @@ fr_command_rpm_extract (FRCommand  *comm
+--- file-roller-2.19.2.orig/src/fr-command-rpm.c
++++ file-roller-2.19.2/src/fr-command-rpm.c
+@@ -177,7 +177,7 @@ fr_command_rpm_extract (FrCommand  *comm
  	fr_process_add_arg (comm->process, "| cpio -idu");
  	for (scan = file_list; scan; scan = scan->next) {
  		char *filename = (char*) scan->data;
@@ -148,11 +148,11 @@ Index: file-roller-2.18.0/src/fr-command-rpm.c
  	}
  	fr_process_end_command (comm->process);
  	fr_process_start (comm->process);
-Index: file-roller-2.18.0/src/fr-command-tar.c
+Index: file-roller-2.19.2/src/fr-command-tar.c
 ===================================================================
---- file-roller-2.18.0.orig/src/fr-command-tar.c
-+++ file-roller-2.18.0/src/fr-command-tar.c
-@@ -325,7 +325,7 @@ fr_command_tar_add (FRCommand     *comm,
+--- file-roller-2.19.2.orig/src/fr-command-tar.c
++++ file-roller-2.19.2/src/fr-command-tar.c
+@@ -327,7 +327,7 @@ fr_command_tar_add (FrCommand     *comm,
  	fr_process_add_arg (comm->process, c_tar->uncomp_filename);
  	fr_process_add_arg (comm->process, "--");
  	for (scan = file_list; scan; scan = scan->next)
@@ -161,7 +161,7 @@ Index: file-roller-2.18.0/src/fr-command-tar.c
  	fr_process_end_command (comm->process);
  }
  
-@@ -368,7 +368,7 @@ fr_command_tar_delete (FRCommand *comm,
+@@ -371,7 +371,7 @@ fr_command_tar_delete (FrCommand *comm,
  
  	fr_process_add_arg (comm->process, "--");
  	for (scan = file_list; scan; scan = scan->next)
@@ -170,8 +170,8 @@ Index: file-roller-2.18.0/src/fr-command-tar.c
  	fr_process_end_command (comm->process);
  }
  
-@@ -413,7 +413,7 @@ fr_command_tar_extract (FRCommand  *comm
- 
+@@ -418,7 +418,7 @@ fr_command_tar_extract (FrCommand  *comm
+ 	
  	fr_process_add_arg (comm->process, "--");
  	for (scan = file_list; scan; scan = scan->next)
 -		fr_process_add_arg (comm->process, scan->data);
@@ -179,11 +179,11 @@ Index: file-roller-2.18.0/src/fr-command-tar.c
  
  	fr_process_end_command (comm->process);
  }
-Index: file-roller-2.18.0/src/fr-command-unstuff.c
+Index: file-roller-2.19.2/src/fr-command-unstuff.c
 ===================================================================
---- file-roller-2.18.0.orig/src/fr-command-unstuff.c
-+++ file-roller-2.18.0/src/fr-command-unstuff.c
-@@ -249,7 +249,7 @@ fr_command_unstuff_extract (FRCommand  *
+--- file-roller-2.19.2.orig/src/fr-command-unstuff.c
++++ file-roller-2.19.2/src/fr-command-unstuff.c
+@@ -249,7 +249,7 @@ fr_command_unstuff_extract (FrCommand  *
  	/* FIXME it is not possible to unpack only some files */
  #if 0
  	for (scan = file_list; scan; scan = scan->next)
@@ -192,11 +192,11 @@ Index: file-roller-2.18.0/src/fr-command-unstuff.c
  #endif
  
  	fr_process_end_command (comm->process);
-Index: file-roller-2.18.0/src/fr-command-zip.c
+Index: file-roller-2.19.2/src/fr-command-zip.c
 ===================================================================
---- file-roller-2.18.0.orig/src/fr-command-zip.c
-+++ file-roller-2.18.0/src/fr-command-zip.c
-@@ -319,7 +319,7 @@ fr_command_zip_add (FRCommand     *comm,
+--- file-roller-2.19.2.orig/src/fr-command-zip.c
++++ file-roller-2.19.2/src/fr-command-zip.c
+@@ -317,7 +317,7 @@ fr_command_zip_add (FrCommand     *comm,
  
  	for (scan = file_list; scan; scan = scan->next) {
  		char *temp = prepend_path_separator ((char*) scan->data);
@@ -205,7 +205,7 @@ Index: file-roller-2.18.0/src/fr-command-zip.c
  		g_free (temp);
  	}
  
-@@ -343,7 +343,7 @@ fr_command_zip_delete (FRCommand *comm,
+@@ -341,7 +341,7 @@ fr_command_zip_delete (FrCommand *comm,
  
  	for (scan = file_list; scan; scan = scan->next) {
  		char *temp = prepend_path_separator_zip_escape ((char*) scan->data);
@@ -214,7 +214,7 @@ Index: file-roller-2.18.0/src/fr-command-zip.c
  		g_free (temp);
  	}
  
-@@ -392,7 +392,7 @@ fr_command_zip_extract (FRCommand  *comm
+@@ -390,7 +390,7 @@ fr_command_zip_extract (FrCommand  *comm
  
  	for (scan = file_list; scan; scan = scan->next) {
  		char *temp = prepend_path_separator_zip_escape ((char*) scan->data);
@@ -223,11 +223,11 @@ Index: file-roller-2.18.0/src/fr-command-zip.c
  		g_free (temp);
  	}
  
-Index: file-roller-2.18.0/src/fr-command-zoo.c
+Index: file-roller-2.19.2/src/fr-command-zoo.c
 ===================================================================
---- file-roller-2.18.0.orig/src/fr-command-zoo.c
-+++ file-roller-2.18.0/src/fr-command-zoo.c
-@@ -257,7 +257,7 @@ fr_command_zoo_add (FRCommand     *comm,
+--- file-roller-2.19.2.orig/src/fr-command-zoo.c
++++ file-roller-2.19.2/src/fr-command-zoo.c
+@@ -257,7 +257,7 @@ fr_command_zoo_add (FrCommand     *comm,
  	fr_process_add_arg (comm->process, comm->e_filename);
  
  	for (scan = file_list; scan; scan = scan->next)
@@ -236,7 +236,7 @@ Index: file-roller-2.18.0/src/fr-command-zoo.c
  	fr_process_end_command (comm->process);
  }
  
-@@ -275,7 +275,7 @@ fr_command_zoo_delete (FRCommand *comm,
+@@ -275,7 +275,7 @@ fr_command_zoo_delete (FrCommand *comm,
  	fr_process_add_arg (comm->process, comm->e_filename);
  
  	for (scan = file_list; scan; scan = scan->next)
@@ -245,7 +245,7 @@ Index: file-roller-2.18.0/src/fr-command-zoo.c
  	fr_process_end_command (comm->process);
  }
  
-@@ -304,7 +304,7 @@ fr_command_zoo_extract (FRCommand  *comm
+@@ -304,7 +304,7 @@ fr_command_zoo_extract (FrCommand  *comm
  		fr_process_set_working_dir (comm->process, dest_dir);
  
  	for (scan = file_list; scan; scan = scan->next)
@@ -254,10 +254,10 @@ Index: file-roller-2.18.0/src/fr-command-zoo.c
  
  	fr_process_end_command (comm->process);
  }
-Index: file-roller-2.18.0/src/fr-process.c
+Index: file-roller-2.19.2/src/fr-process.c
 ===================================================================
---- file-roller-2.18.0.orig/src/fr-process.c
-+++ file-roller-2.18.0/src/fr-process.c
+--- file-roller-2.19.2.orig/src/fr-process.c
++++ file-roller-2.19.2/src/fr-process.c
 @@ -43,6 +43,11 @@ enum {
  	LAST_SIGNAL
  };
@@ -270,7 +270,7 @@ Index: file-roller-2.18.0/src/fr-process.c
  static GObjectClass *parent_class;
  static guint fr_process_signals[LAST_SIGNAL] = { 0 };
  
-@@ -67,17 +72,37 @@ fr_command_info_new ()
+@@ -67,17 +72,37 @@ fr_command_info_new (void)
  
  
  static void
@@ -309,68 +309,65 @@ Index: file-roller-2.18.0/src/fr-process.c
  	if (c_info->dir != NULL) {
  		g_free (c_info->dir);
  		c_info->dir = NULL;
-@@ -337,6 +362,25 @@ fr_process_add_arg (FRProcess  *fr_proc,
- 
- 
- void
-+fr_process_add_file_arg (FRProcess  *fr_proc, 
-+			 const char *arg)
-+{
-+	FRCommandInfo *c_info;
-+
-+	g_return_if_fail (fr_proc != NULL);
-+
-+	c_info = g_ptr_array_index (fr_proc->comm, fr_proc->current_comm);
-+	c_info->files_next = g_list_prepend (c_info->files_next, g_strdup (arg));
-+
-+	/* Insertion point for file list */
-+	if (!c_info->args || !c_info->args->data ||
-+	    c_info->args->data != file_list_insertion_point) {
-+		c_info->args = g_list_prepend (c_info->args, (gpointer) file_list_insertion_point);
-+	}
-+}
-+
-+
-+void
- fr_process_set_arg_at (FRProcess  *fr_proc,
- 		       int         n_comm,
- 		       int         n_arg,
-@@ -575,10 +619,34 @@ static void child_setup (gpointer user_d
+@@ -338,6 +363,23 @@ fr_process_add_arg (FrProcess  *fr_proc,
+ 	c_info->args = g_list_prepend (c_info->args, g_strdup (arg));
  }
  
++void
++fr_process_add_file_arg (FrProcess  *fr_proc, 
++ 			 const char *arg)
++{
++ 	FRCommandInfo *c_info;
++	
++ 	g_return_if_fail (fr_proc != NULL);
++	
++ 	c_info = g_ptr_array_index (fr_proc->comm, fr_proc->current_comm);
++ 	c_info->files_next = g_list_prepend (c_info->files_next, g_strdup (arg));
++	
++ 	/* Insertion point for file list */
++ 	if (!c_info->args || !c_info->args->data ||
++ 	    c_info->args->data != file_list_insertion_point) {
++ 		c_info->args = g_list_prepend (c_info->args, (gpointer) file_list_insertion_point);
++ 	}
++}
+ 
+ void
+ fr_process_set_arg_at (FrProcess  *fr_proc,
+@@ -577,11 +619,33 @@ static void child_setup (gpointer user_d
+ 		putenv ("LC_ALL=C");
+ }
  
 +static GList *
 +string_list_split_at_strlen (GList *strings, gint max_len)
 +{
-+	gint   len = 0;
-+	GList *l;
-+
-+	for (l = strings; l; l = l->next) {
-+		len += strlen (strings->data) + 1;
-+
-+		if (len > max_len && l->prev)
-+			break;
-+	}
-+
-+	if (l && l->prev) {
-+		l->prev->next = NULL;
-+		l->prev = NULL;
-+		return l;
-+	}
-+
-+	return NULL;
++ 	gint   len = 0;
++ 	GList *l;
++	
++ 	for (l = strings; l; l = l->next) {
++ 		len += strlen (strings->data) + 1;
++		
++ 		if (len > max_len && l->prev)
++ 			break;
++ 	}
++ 
++ 	if (l && l->prev) {
++ 		l->prev->next = NULL;
++ 		l->prev = NULL;
++ 		return l;
++ 	}
++ 
++ 	return NULL;
 +}
-+
-+
+ 
  static void
- start_current_command (FRProcess *fr_proc)
+ start_current_command (FrProcess *fr_proc)
  {
  	FRCommandInfo  *c_info;
 +	gboolean        ran_before = FALSE;
  	GList          *arg_list, *scan;
  	GString        *command;
  	char           *dir;
-@@ -592,6 +660,17 @@ start_current_command (FRProcess *fr_pro
+@@ -595,6 +659,17 @@ start_current_command (FrProcess *fr_pro
  	arg_list = c_info->args;
  	dir = c_info->dir;
  
@@ -388,7 +385,7 @@ Index: file-roller-2.18.0/src/fr-process.c
  	if (dir != NULL)
  		debug (DEBUG_INFO, "cd %s\n", dir);
  
-@@ -603,8 +682,19 @@ start_current_command (FRProcess *fr_pro
+@@ -606,8 +681,19 @@ start_current_command (FrProcess *fr_pro
  
  	command = g_string_new ("");
  	for (scan = arg_list; scan; scan = scan->next) {
@@ -410,7 +407,7 @@ Index: file-roller-2.18.0/src/fr-process.c
  		if (scan->next != NULL)
  			g_string_append_c (command, ' ');
  	}
-@@ -623,7 +713,7 @@ start_current_command (FRProcess *fr_pro
+@@ -626,7 +712,7 @@ start_current_command (FrProcess *fr_pro
  	}
  #endif
  
@@ -419,7 +416,7 @@ Index: file-roller-2.18.0/src/fr-process.c
  		(*c_info->begin_func) (c_info->begin_data);
  
  	if (! g_spawn_async_with_pipes (dir,
-@@ -756,6 +846,14 @@ check_child (gpointer data)
+@@ -760,6 +846,14 @@ check_child (gpointer data)
  	fr_proc->output_fd = 0;
  	fr_proc->error_fd = 0;
  
@@ -434,10 +431,10 @@ Index: file-roller-2.18.0/src/fr-process.c
  	/**/
  
  	if (c_info->end_func != NULL)
-Index: file-roller-2.18.0/src/fr-process.h
+Index: file-roller-2.19.2/src/fr-process.h
 ===================================================================
---- file-roller-2.18.0.orig/src/fr-process.h
-+++ file-roller-2.18.0/src/fr-process.h
+--- file-roller-2.19.2.orig/src/fr-process.h
++++ file-roller-2.19.2/src/fr-process.h
 @@ -47,7 +47,9 @@ typedef gboolean (*ContinueFunc) (gpoint
  
  
@@ -449,21 +446,20 @@ Index: file-roller-2.18.0/src/fr-process.h
  	char  *dir;               /* working directory */
  	guint  sticky : 1;        /* whether the command must be executed even
  				   * if a previous command has failed. */
-@@ -144,6 +146,9 @@ void        fr_process_set_arg_at       
- 					     int           n_comm,
- 					     int           n_arg,
- 					     const char   *arg);
-+void        fr_process_add_file_arg         (FRProcess    *fr_proc,
-+                                             const char   *arg);
-+
- void        fr_process_set_begin_func       (FRProcess    *fr_proc, 
+@@ -147,6 +149,8 @@ void        fr_process_set_arg_at       
+ void        fr_process_set_begin_func       (FrProcess    *fr_proc, 
  					     ProcFunc      func,
  					     gpointer      func_data);
-Index: file-roller-2.18.0/src/window.c
++void        fr_process_add_file_arg         (FrProcess    *fr_proc,
++					     const char *arg);
+ void        fr_process_set_end_func         (FrProcess    *fr_proc, 
+ 					     ProcFunc      func,
+ 					     gpointer      func_data);
+Index: file-roller-2.19.2/src/fr-window.c
 ===================================================================
---- file-roller-2.18.0.orig/src/window.c
-+++ file-roller-2.18.0/src/window.c
-@@ -6106,7 +6106,7 @@ window_open_files__extract_done_cb (FRAr
+--- file-roller-2.19.2.orig/src/fr-window.c
++++ file-roller-2.19.2/src/fr-window.c
+@@ -6448,7 +6448,7 @@ fr_window_open_files__extract_done_cb (F
  		fr_process_begin_command (proc, cdata->command);
  		for (scan = cdata->file_list; scan; scan = scan->next) {
  			char *filename = shell_escape (scan->data);
diff --git a/file-roller-2.18.1.tar.bz2 b/file-roller-2.18.1.tar.bz2
deleted file mode 100644
index 86cca03..0000000
--- a/file-roller-2.18.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1eed989f4ac5e81d03d227b429de8a37aeb133edc2f2f07cc397f18ccb48fc90
-size 1128245
diff --git a/file-roller-2.19.2.tar.bz2 b/file-roller-2.19.2.tar.bz2
new file mode 100644
index 0000000..cfc276a
--- /dev/null
+++ b/file-roller-2.19.2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:af6eece09499d68c61d128b48f03ff1f43e01e9fc8360d1340add60768e841bb
+size 1194490
diff --git a/file-roller.changes b/file-roller.changes
index de9e684..b093e96 100644
--- a/file-roller.changes
+++ b/file-roller.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Jul  9 23:31:05 CEST 2007 - maw@suse.de
+
+- Update to version 2.19.2
+- Can operate on remote archives
+- Improved error dialogue
+- Fixed bugzilla.gnome.org #171619, #398824, #438340, #402760,
+  #440662, and #439154.
+
 -------------------------------------------------------------------
 Fri Apr 27 12:32:12 CEST 2007 - sbrabec@suse.cz
 
diff --git a/file-roller.spec b/file-roller.spec
index 6eed2d3..cf0e3fc 100644
--- a/file-roller.spec
+++ b/file-roller.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package file-roller (Version 2.18.1)
+# spec file for package file-roller (Version 2.19.2)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -12,16 +12,17 @@
 
 Name:           file-roller
 BuildRequires:  docbook-xsl-stylesheets gnome-doc-utils-devel gnome-patch-translation gnutls-devel intltool libglade2-devel libgnomeprintui-devel libwnck-devel mDNSResponder-devel nautilus-devel perl-XML-Parser scrollkeeper update-desktop-files
-License:        GNU General Public License (GPL)
+License:        GPL v2 or later
 Group:          System/GUI/GNOME
-Version:        2.18.1
-Release:        5
+Version:        2.19.2
+Release:        1
 Summary:        An Archive Manager for GNOME
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/file-roller/2.18/%{name}-%{version}.tar.bz2
-Patch:          file-roller-ximian-defaults.patch
+Patch0:         file-roller-ximian-defaults.patch
 Patch1:         fr_59941.diff
 Patch2:         file-roller-2.12.2-no-cmdline-overflow.patch
 Patch3:         bug-187126_file-roller-batch-extract-all.patch
+Patch4:         abuild.patch
 URL:            http://fileroller.sourceforge.net
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Docdir:         %{_defaultdocdir}
@@ -72,6 +73,7 @@ gnome-patch-translation-prepare
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 gnome-patch-translation-update
 
 %build
@@ -123,6 +125,12 @@ fi
 %{_libdir}/nautilus/extensions-*/*.so
 
 %changelog
+* Mon Jul 09 2007 - maw@suse.de
+- Update to version 2.19.2
+- Can operate on remote archives
+- Improved error dialogue
+- Fixed bugzilla.gnome.org #171619, #398824, #438340, #402760,
+  [#440662], and #439154.
 * Fri Apr 27 2007 - sbrabec@suse.cz
 - Do not call meinproc (#227624).
 * Wed Apr 11 2007 - maw@suse.de