From e3e5de81a2d3ed889cd4edfc25f24747cb294957 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 24 Jan 2014 13:16:11 -0200 Subject: xarchiver-libre: fix xarchiver-0.5.2-add_unar_support.patch --- .../xarchiver-0.5.2-add_unar_support.patch | 62 +++++++++++++++------- 1 file changed, 44 insertions(+), 18 deletions(-) (limited to 'libre/xarchiver-libre/xarchiver-0.5.2-add_unar_support.patch') diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-add_unar_support.patch b/libre/xarchiver-libre/xarchiver-0.5.2-add_unar_support.patch index 457fe80e5..0168f4e63 100644 --- a/libre/xarchiver-libre/xarchiver-0.5.2-add_unar_support.patch +++ b/libre/xarchiver-libre/xarchiver-0.5.2-add_unar_support.patch @@ -70,7 +70,7 @@ diff -Nur xarchiver-0.5.2.orig/src/interface.c xarchiver-0.5.2/src/interface.c gtk_widget_set_sensitive (rename_menu,FALSE); diff -Nur xarchiver-0.5.2.orig/src/main.c xarchiver-0.5.2/src/main.c --- xarchiver-0.5.2.orig/src/main.c 2008-11-10 09:21:43.000000000 -0200 -+++ xarchiver-0.5.2/src/main.c 2014-01-24 10:59:39.108832843 -0200 ++++ xarchiver-0.5.2/src/main.c 2014-01-24 12:18:53.211684553 -0200 @@ -33,7 +33,7 @@ gchar *add_files; gboolean error_output, file_to_open, ask_and_extract, ask_and_add, multi_extract; @@ -80,7 +80,31 @@ diff -Nur xarchiver-0.5.2.orig/src/main.c xarchiver-0.5.2/src/main.c gboolean sevenzr = FALSE, sevenza = FALSE, xdg_open = FALSE; int response; extern gchar *current_open_directory; -@@ -410,24 +410,14 @@ +@@ -312,7 +312,6 @@ + delete[XARCHIVETYPE_GZIP] = 0; + delete[XARCHIVETYPE_LZMA] = 0; + delete[XARCHIVETYPE_XZ] = 0; +- delete[XARCHIVETYPE_RAR] = &xa_rar_delete; + delete[XARCHIVETYPE_RPM] = 0; + delete[XARCHIVETYPE_TAR] = delete[XARCHIVETYPE_TAR_BZ2] = delete[XARCHIVETYPE_TAR_GZ] = delete[XARCHIVETYPE_TAR_LZMA] = delete[XARCHIVETYPE_TAR_XZ] = delete[XARCHIVETYPE_TAR_LZOP] = &xa_tar_delete; + delete[XARCHIVETYPE_ZIP] = &xa_zip_delete; +@@ -325,7 +324,6 @@ + add[XARCHIVETYPE_ARJ] = &xa_arj_add; + add[XARCHIVETYPE_DEB] = 0; + add[XARCHIVETYPE_BZIP2] = add[XARCHIVETYPE_GZIP] = add[XARCHIVETYPE_LZMA] = add[XARCHIVETYPE_XZ] = &xa_tar_add; +- add[XARCHIVETYPE_RAR] = &xa_rar_add; + add[XARCHIVETYPE_RPM] = 0; + add[XARCHIVETYPE_TAR] = add[XARCHIVETYPE_TAR_BZ2] = add[XARCHIVETYPE_TAR_GZ] = add[XARCHIVETYPE_TAR_LZMA] = add[XARCHIVETYPE_TAR_XZ] = add[XARCHIVETYPE_TAR_LZOP] = &xa_tar_add; + add[XARCHIVETYPE_ZIP] = &xa_zip_add; +@@ -348,7 +346,6 @@ + test[XARCHIVETYPE_7ZIP] = &xa_7zip_test; + test[XARCHIVETYPE_ARJ] = &xa_arj_test; + test[XARCHIVETYPE_DEB] = test[XARCHIVETYPE_BZIP2] = test[XARCHIVETYPE_GZIP] = test[XARCHIVETYPE_LZMA] = test[XARCHIVETYPE_XZ] = 0; +- test[XARCHIVETYPE_RAR] = &xa_rar_test; + test[XARCHIVETYPE_RPM] = 0; + test[XARCHIVETYPE_TAR] = test[XARCHIVETYPE_TAR_BZ2] = test[XARCHIVETYPE_TAR_GZ] = test[XARCHIVETYPE_TAR_LZMA] = test[XARCHIVETYPE_TAR_XZ] = test[XARCHIVETYPE_TAR_LZOP] = 0; + test[XARCHIVETYPE_ZIP] = &xa_zip_test; +@@ -420,24 +417,14 @@ //ArchiveSuffix = g_list_append(ArchiveSuffix, ""); } @@ -143,7 +167,7 @@ diff -Nur xarchiver-0.5.2.orig/src/pref_dialog.c xarchiver-0.5.2/src/pref_dialog gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_prefered_format),archive_type->data ); diff -Nur xarchiver-0.5.2.orig/src/rar.c xarchiver-0.5.2/src/rar.c --- xarchiver-0.5.2.orig/src/rar.c 2008-11-10 06:05:07.000000000 -0200 -+++ xarchiver-0.5.2/src/rar.c 2014-01-24 10:50:11.672526720 -0200 ++++ xarchiver-0.5.2/src/rar.c 2014-01-24 13:09:12.838038687 -0200 @@ -20,7 +20,7 @@ #include "rar.h" #include @@ -248,7 +272,7 @@ diff -Nur xarchiver-0.5.2.orig/src/rar.c xarchiver-0.5.2/src/rar.c gboolean xa_rar_extract(XArchive *archive,GSList *files) { gchar *rar, *command, *e_filename = NULL; -@@ -295,10 +221,8 @@ +@@ -295,10 +221,7 @@ gboolean result = FALSE; _files = files; @@ -256,34 +280,36 @@ diff -Nur xarchiver-0.5.2.orig/src/rar.c xarchiver-0.5.2/src/rar.c - rar = "unrar"; - else - rar = "rar"; -+ (unar) -+ rar = "unar"; ++ rar = "unar"; while (_files) { -@@ -311,17 +235,13 @@ +@@ -311,42 +234,16 @@ g_slist_free(_files); if (archive->passwd != NULL) - command = g_strconcat (rar," ",archive->full_path ? "x " : "e ", - archive->freshen ? "-f " : "" , archive->update ? "-u " : "", -+ command = g_strconcat (rar," ",archive->full_path ? "-q ", - " -p",archive->passwd, +- " -p",archive->passwd, - archive->overwrite ? " -o+" : " -o-", - " -idp ", -+ archive->overwrite ? " -f", - archive->escaped_path,names->str," ",archive->extraction_path , NULL ); - else +- archive->escaped_path,names->str," ",archive->extraction_path , NULL ); +- else - command = g_strconcat (rar," ",archive->full_path ? "x " : "e ", - archive->freshen ? "-f " : "" , archive->update ? "-u " : "", - archive->overwrite ? "-o+" : "-o-", - " -idp ", -+ command = g_strconcat (rar," ",archive->full_path ? "-q ", -+ archive->overwrite ? " -f", - archive->escaped_path,names->str," ",archive->extraction_path , NULL ); +- archive->escaped_path,names->str," ",archive->extraction_path , NULL ); ++ command = g_strconcat (rar," -p",archive->passwd, ++ archive->overwrite ? " -f" : "" , ++ archive->escaped_path,names->str," ",archive->extraction_path , NULL ); ++ else ++ command = g_strconcat (rar," ", ++ archive->overwrite ? " -f" : "" , ++ archive->escaped_path,names->str," ",archive->extraction_path , NULL ); g_string_free(names,TRUE); list = g_slist_append(list,command); -@@ -329,24 +249,3 @@ + result = xa_run_command (archive,list); return result; } @@ -338,8 +364,8 @@ diff -Nur xarchiver-0.5.2.orig/src/window.c xarchiver-0.5.2/src/window.c gtk_widget_show(selected_frame); gtk_widget_set_sensitive(deselect_all,TRUE); } -- if ( (archive->type == XARCHIVETYPE_RAR && unrar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP) -+ if ( (archive->type == XARCHIVETYPE_RAR && unar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP) +- if ( (archive->type == XARCHIVETYPE_RAR && unrar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ || archive->type == XARCHIVETYPE_LZOP) ++ if ( (archive->type == XARCHIVETYPE_RAR && unar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ || archive->type == XARCHIVETYPE_LZOP) { gtk_widget_set_sensitive (delete_menu,FALSE); gtk_widget_set_sensitive (rename_menu,FALSE); -- cgit v1.2.3-54-g00ecf