--- xarchiver-0.5.4.6.orig/doc/html/ch01s01.html 2016-03-09 10:25:48.000000000 -0500 +++ xarchiver-0.5.4.6/doc/html/ch01s01.html 2016-04-12 15:42:24.032705366 -0500 @@ -8,7 +8,7 @@ to work. The package xdg-utils is optional.

Xarchiver presents the following characteristic: -

+

Prev Up Next
Chapter 1.  Introduction  Home Where to get it
\ No newline at end of file --- xarchiver-0.5.4.6.orig/doc/html/ch03s03.html 2016-03-09 10:25:48.000000000 -0500 +++ xarchiver-0.5.4.6/doc/html/ch03s03.html 2016-04-12 15:41:13.299755226 -0500 @@ -1,6 +1,6 @@ General
General
Prev Chapter 3. Usage Next

General

Startup

- At startup, Xarchiver detects the available installed archivers (tar,rar,zip etc) and the script xdg-open for handling different file types. Since Xarchiver is a frontend (a graphic user interface to the command line executables) it can't create archives whose archiver is not available. For instance if you have the free edition of rar, unrar, Xarchiver can't create rar archives since unrar allows rar archives to be opened, tested and extracted but not to be created. + At startup, Xarchiver detects the available installed archivers (tar,zip etc) and the script xdg-open for handling different file types. Since Xarchiver is a frontend (a graphic user interface to the command line executables) it can't create archives whose archiver is not available.

How it works

Xarchiver will run in the background the command line executable of the archiver with the archiver's proper switches to perform the selected operation. If something goes wrong Xarchiver reports the full output of the archiver executable in the command line output window. Starting with release 0.5 the files in the archive can be opened within Xarchiver. The script xdg-open will detect the file type and run the proper application to handle it. If you don't have such script installed in your system (it's found in the xdg-utils package) Xarchiver will recognize HTML, txt and images files only. The Preferences dialog will notify this to you when you click the Advanced section inside it.

Drag and Drop

--- xarchiver-0.5.4.6.orig/doc/html/ch04s02.html 2016-03-09 10:25:48.000000000 -0500 +++ xarchiver-0.5.4.6/doc/html/ch04s02.html 2016-04-12 15:39:11.457081971 -0500 @@ -1,4 +1,4 @@ -How can I create an archive with some files password protected and others not?

How can I create an archive with some files password protected and others not?
Prev Chapter 4. FAQ Next

How can I create an archive with some files password protected and others not?

First of all choose 'New' and select one of arj, 7zip, rar or zip archive formats and choose 'Add' from the Action menu. Do NOT check "Password" in the Add dialog. Add your files and then reopen the Add dialog again but this time check "Password" and +How can I create an archive with some files password protected and others not?

How can I create an archive with some files password protected and others not?
Prev Chapter 4. FAQ Next

How can I create an archive with some files password protected and others not?

First of all choose 'New' and select one of arj, 7zip or zip archive formats and choose 'Add' from the Action menu. Do NOT check "Password" in the Add dialog. Add your files and then reopen the Add dialog again but this time check "Password" and enter your password. From now on all the files you add to the archive will be password protected.

Prev Up Next
Why are ace archives not supported? Home Why does Xarchiver emit this error message when handling tar archives?
\ No newline at end of file --- xarchiver-0.5.4.6.orig/doc/html/ch04s06.html 2016-03-09 10:25:48.000000000 -0500 +++ xarchiver-0.5.4.6/doc/html/ch04s06.html 2016-04-12 15:38:34.257283499 -0500 @@ -1,3 +1,3 @@ -Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?
Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?
Prev Chapter 4. FAQ 

Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?

Because rar and arj executable do not allow to do so. Zip and 7z convertion to self-extracting is made by appending an sfx module to the archive so it's possible to choose a different path. +Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?

Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?
Prev Chapter 4. FAQ 

Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?

Because arj executable do not allow to do so. Zip and 7z convertion to self-extracting is made by appending an sfx module to the archive so it's possible to choose a different path.

Prev Up 
Why does Xarchiver sometimes report errors but the Error messages window is empty? Home 
\ No newline at end of file --- xarchiver-0.5.4.6.orig/doc/xarchiver.docbook 2016-03-09 10:25:48.000000000 -0500 +++ xarchiver-0.5.4.6/doc/xarchiver.docbook 2016-04-12 15:37:03.884439758 -0500 @@ -56,13 +56,13 @@ Archives are detected by their magic header and not by the extension except for .tar.bz2 and .tar.gz Drag and drop from and to &app; window Progress window when using &app; from the command line or from a file-manager - ARJ, RAR and ZIP archive comment are supported + ARJ and ZIP archive comment are supported Ability to convert the archive to self-extracting for those archive types which support it - Smart detection of arj, zip and rar password encrypted archives + Smart detection of arj and zip password encrypted archives All the the output of the command line archiver is displayed in the &app; window - All common formats are supported: arj, bzip2, gzip, lha, lzma, 7z, rar, tar, tar.bz2, tar.gz, tar.lzma, tar.lzop, zip, deb and rpm packages (open and extract only) + All common formats are supported: arj, bzip2, gzip, lha, lzma, 7z, tar, tar.bz2, tar.gz, tar.lzma, tar.lzop, zip, deb and rpm packages (open and extract only) Deb and Rpm packages are handled internally, their package managers are NOT required. - Zip, rar, arj and 7z password encrypted archives are fully supported (7z automatic password detection is not supported) + Zip, arj and 7z password encrypted archives are fully supported (7z automatic password detection is not supported) @@ -209,7 +209,7 @@
Startup - At startup, &app; detects the available installed archivers (tar,rar,zip etc) and the script xdg-open for handling different file types. Since &app; is a frontend (a graphic user interface to the command line executables) it can't create archives whose archiver is not available. For instance if you have the free edition of rar, unrar, &app; can't create rar archives since unrar allows rar archives to be opened, tested and extracted but not to be created. + At startup, &app; detects the available installed archivers (tar,zip etc) and the script xdg-open for handling different file types. Since &app; is a frontend (a graphic user interface to the command line executables) it can't create archives whose archiver is not available.
@@ -435,7 +435,7 @@
How can I create an archive with some files password protected and others not? - First of all choose 'New' and select one of arj, 7zip, rar or zip archive formats and choose 'Add' from the Action menu. Do NOT check "Password" in the Add dialog. Add your files and then reopen the Add dialog again but this time check "Password" and + First of all choose 'New' and select one of arj, 7zip or zip archive formats and choose 'Add' from the Action menu. Do NOT check "Password" in the Add dialog. Add your files and then reopen the Add dialog again but this time check "Password" and enter your password. From now on all the files you add to the archive will be password protected.
@@ -456,7 +456,7 @@
Why &app; doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z? - Because rar and arj executable do not allow to do so. Zip and 7z convertion to self-extracting is made by appending an sfx module to the archive so it's possible to choose a different path. + Because arj executable do not allow to do so. Zip and 7z convertion to self-extracting is made by appending an sfx module to the archive so it's possible to choose a different path.
--- xarchiver-0.5.4.6.orig/po/POTFILES.in 2016-03-09 10:25:48.000000000 -0500 +++ xarchiver-0.5.4.6/po/POTFILES.in 2016-04-12 15:27:20.210935122 -0500 @@ -12,7 +12,6 @@ src/new_dialog.c src/open-with-dlg.c src/pref_dialog.c -src/rar.c src/rpm.c src/tar.c src/window.c --- xarchiver-0.5.4.6.orig/src/Makefile.am 2016-03-09 10:25:48.000000000 -0500 +++ xarchiver-0.5.4.6/src/Makefile.am 2016-04-12 15:26:39.234490444 -0500 @@ -33,8 +33,6 @@ open-with-dlg.h \ pref_dialog.c \ pref_dialog.h \ - rar.c \ - rar.h \ rpm.c \ rpm.h \ sexy-icon-entry.c \ --- xarchiver-0.5.4.6.orig/src/Makefile.in 2016-03-09 10:25:48.000000000 -0500 +++ xarchiver-0.5.4.6/src/Makefile.in 2016-04-12 15:25:55.908058496 -0500 @@ -112,7 +112,7 @@ xarchiver-lha.$(OBJEXT) xarchiver-main.$(OBJEXT) \ xarchiver-mime.$(OBJEXT) xarchiver-new_dialog.$(OBJEXT) \ xarchiver-open-with-dlg.$(OBJEXT) \ - xarchiver-pref_dialog.$(OBJEXT) xarchiver-rar.$(OBJEXT) \ + xarchiver-pref_dialog.$(OBJEXT) \ xarchiver-rpm.$(OBJEXT) xarchiver-sexy-icon-entry.$(OBJEXT) \ xarchiver-socket.$(OBJEXT) xarchiver-string_utils.$(OBJEXT) \ xarchiver-support.$(OBJEXT) xarchiver-tar.$(OBJEXT) \ @@ -420,8 +420,6 @@ open-with-dlg.h \ pref_dialog.c \ pref_dialog.h \ - rar.c \ - rar.h \ rpm.c \ rpm.h \ sexy-icon-entry.c \ @@ -564,7 +562,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarchiver-new_dialog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarchiver-open-with-dlg.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarchiver-pref_dialog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarchiver-rar.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarchiver-rpm.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarchiver-sexy-icon-entry.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarchiver-socket.Po@am__quote@ @@ -806,20 +803,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xarchiver_CFLAGS) $(CFLAGS) -c -o xarchiver-pref_dialog.obj `if test -f 'pref_dialog.c'; then $(CYGPATH_W) 'pref_dialog.c'; else $(CYGPATH_W) '$(srcdir)/pref_dialog.c'; fi` -xarchiver-rar.o: rar.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xarchiver_CFLAGS) $(CFLAGS) -MT xarchiver-rar.o -MD -MP -MF $(DEPDIR)/xarchiver-rar.Tpo -c -o xarchiver-rar.o `test -f 'rar.c' || echo '$(srcdir)/'`rar.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xarchiver-rar.Tpo $(DEPDIR)/xarchiver-rar.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='rar.c' object='xarchiver-rar.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xarchiver_CFLAGS) $(CFLAGS) -c -o xarchiver-rar.o `test -f 'rar.c' || echo '$(srcdir)/'`rar.c - -xarchiver-rar.obj: rar.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xarchiver_CFLAGS) $(CFLAGS) -MT xarchiver-rar.obj -MD -MP -MF $(DEPDIR)/xarchiver-rar.Tpo -c -o xarchiver-rar.obj `if test -f 'rar.c'; then $(CYGPATH_W) 'rar.c'; else $(CYGPATH_W) '$(srcdir)/rar.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xarchiver-rar.Tpo $(DEPDIR)/xarchiver-rar.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='rar.c' object='xarchiver-rar.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xarchiver_CFLAGS) $(CFLAGS) -c -o xarchiver-rar.obj `if test -f 'rar.c'; then $(CYGPATH_W) 'rar.c'; else $(CYGPATH_W) '$(srcdir)/rar.c'; fi` - xarchiver-rpm.o: rpm.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xarchiver_CFLAGS) $(CFLAGS) -MT xarchiver-rpm.o -MD -MP -MF $(DEPDIR)/xarchiver-rpm.Tpo -c -o xarchiver-rpm.o `test -f 'rpm.c' || echo '$(srcdir)/'`rpm.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xarchiver-rpm.Tpo $(DEPDIR)/xarchiver-rpm.Po --- xarchiver-0.5.4.6.orig/src/interface.c 2016-03-09 10:25:48.000000000 -0500 +++ xarchiver-0.5.4.6/src/interface.c 2016-04-12 15:22:08.385957756 -0500 @@ -47,7 +47,7 @@ static gulong selchghid; -extern gboolean unarj,unrar,batch_mode; +extern gboolean unarj,batch_mode; static gboolean xa_progress_dialog_delete_event (GtkWidget *caller,GdkEvent *event,GPid *pid); static void xa_progress_dialog_stop_action (GtkWidget *widget,GPid *pid); @@ -601,7 +601,7 @@ if (selection != NULL) xa_row_selected(selection,archive[id]); - if (archive[id]->type == XARCHIVETYPE_ZIP || archive[id]->type == XARCHIVETYPE_RAR || archive[id]->type == XARCHIVETYPE_ARJ) + if (archive[id]->type == XARCHIVETYPE_ZIP || archive[id]->type == XARCHIVETYPE_ARJ) gtk_widget_set_sensitive (comment_menu,TRUE); else gtk_widget_set_sensitive (comment_menu,FALSE); @@ -624,12 +624,7 @@ { gtk_widget_show(selected_frame); gtk_widget_set_sensitive(deselect_all,TRUE); - if (archive[id]->type == XARCHIVETYPE_RAR && unrar) - { - gtk_widget_set_sensitive (delete_menu,FALSE); - gtk_widget_set_sensitive (rename_menu,FALSE); - } - else if (archive[id]->type == XARCHIVETYPE_ARJ && unarj) + if (archive[id]->type == XARCHIVETYPE_ARJ && unarj) { gtk_widget_set_sensitive (delete_menu,FALSE); gtk_widget_set_sensitive (rename_menu,FALSE); --- xarchiver-0.5.4.6.orig/src/main.c 2016-03-09 10:25:48.000000000 -0500 +++ xarchiver-0.5.4.6/src/main.c 2016-04-12 15:18:19.947195315 -0500 @@ -34,7 +34,6 @@ gboolean error_output, file_to_open, ask_and_extract, ask_and_add, multi_extract; gboolean batch_mode = FALSE; gboolean unarj = FALSE; -gboolean unrar = FALSE; gboolean xdg_open = FALSE; const gchar *sevenz = NULL; static gboolean tbz2, tgz, tlz, txz, tzo, zip; @@ -325,7 +324,6 @@ open_archive[XARCHIVETYPE_GZIP] = &xa_open_gzip; open_archive[XARCHIVETYPE_LZMA] = &xa_open_bzip2_lzma; open_archive[XARCHIVETYPE_XZ] = &xa_open_bzip2_lzma; - open_archive[XARCHIVETYPE_RAR] = &xa_open_rar; open_archive[XARCHIVETYPE_RPM] = &xa_open_rpm; open_archive[XARCHIVETYPE_TAR] = open_archive[XARCHIVETYPE_TAR_BZ2] = open_archive[XARCHIVETYPE_TAR_GZ] = open_archive[XARCHIVETYPE_TAR_LZMA] = open_archive[XARCHIVETYPE_TAR_XZ] = open_archive[XARCHIVETYPE_TAR_LZOP] = &xa_open_tar; open_archive[XARCHIVETYPE_ZIP] = &xa_open_zip; @@ -337,7 +335,6 @@ delete[XARCHIVETYPE_ARJ] = &xa_arj_delete; delete[XARCHIVETYPE_DEB] = 0; delete[XARCHIVETYPE_BZIP2] = delete[XARCHIVETYPE_GZIP] = delete[XARCHIVETYPE_LZMA] = delete[XARCHIVETYPE_XZ] = delete[XARCHIVETYPE_LZOP] = &xa_tar_delete; - 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; @@ -349,7 +346,6 @@ add[XARCHIVETYPE_ARJ] = &xa_arj_add; add[XARCHIVETYPE_DEB] = 0; add[XARCHIVETYPE_BZIP2] = add[XARCHIVETYPE_GZIP] = add[XARCHIVETYPE_LZMA] = add[XARCHIVETYPE_XZ] = add[XARCHIVETYPE_LZOP] = &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; @@ -360,7 +356,6 @@ extract[XARCHIVETYPE_ARJ] = &xa_arj_extract; extract[XARCHIVETYPE_DEB] = &xa_deb_extract;; extract[XARCHIVETYPE_BZIP2] = extract[XARCHIVETYPE_GZIP] = extract[XARCHIVETYPE_LZMA] = extract[XARCHIVETYPE_XZ] = extract[XARCHIVETYPE_LZOP] = &xa_tar_extract; - extract[XARCHIVETYPE_RAR] = &xa_rar_extract; extract[XARCHIVETYPE_RPM] = &xa_rpm_extract; extract[XARCHIVETYPE_TAR] = extract[XARCHIVETYPE_TAR_BZ2] = extract[XARCHIVETYPE_TAR_GZ] = extract[XARCHIVETYPE_TAR_LZMA] = extract[XARCHIVETYPE_TAR_XZ] = extract[XARCHIVETYPE_TAR_LZOP] = &xa_tar_extract; extract[XARCHIVETYPE_ZIP] = &xa_zip_extract; @@ -370,7 +365,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] = test[XARCHIVETYPE_LZOP] = &xa_tar_test; - 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] = &xa_tar_test; test[XARCHIVETYPE_ZIP] = &xa_zip_test; @@ -479,31 +473,6 @@ g_free (absolute_path); } - absolute_path = g_find_program_in_path ("rar"); - if ( absolute_path ) - { - ArchiveType = g_list_append(ArchiveType, "rar"); - ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar"); - if (xa_rar_checkversion(absolute_path) == 5) - { - ArchiveType = g_list_append(ArchiveType, "rar5"); - ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar"); - } - g_free (absolute_path); - } - else - { - absolute_path = g_find_program_in_path("unrar"); - if ( absolute_path ) - { - unrar = TRUE; - xa_rar_checkversion(absolute_path); - ArchiveType = g_list_append(ArchiveType, "rar"); - ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar"); - g_free (absolute_path); - } - } - absolute_path = g_find_program_in_path("cpio"); if ( absolute_path ) { --- xarchiver-0.5.4.6.orig/src/mime.c 2016-03-09 10:25:48.000000000 -0500 +++ xarchiver-0.5.4.6/src/mime.c 2016-04-12 15:09:26.186753610 -0500 @@ -69,7 +69,6 @@ strcmp(mime,"application/x-lzma") == 0 || strcmp(mime,"application/x-lzma-compressed-tar") == 0 || strcmp(mime,"application/x-lzop") == 0 || - strcmp(mime,"application/x-rar") == 0 || strcmp(mime,"application/x-rpm") == 0 || strcmp(mime,"application/x-source-rpm") == 0 || strcmp(mime,"application/x-tar") == 0 || --- xarchiver-0.5.4.6.orig/src/new_dialog.c 2016-03-09 10:25:48.000000000 -0500 +++ xarchiver-0.5.4.6/src/new_dialog.c 2016-04-12 15:07:58.673894375 -0500 @@ -24,7 +24,7 @@ #include "string_utils.h" #include "main.h" -extern gboolean unarj, unrar; +extern gboolean unarj; extern Prefs_dialog_data *prefs_window; gchar *current_new_directory = NULL; gint new_combo_box = -1; @@ -159,8 +159,7 @@ while (Name) { if (!(*(char *) Name->data == 0 || - (strncmp(Name->data, "arj", 3) == 0 && unarj) || - (strncmp(Name->data, "rar", 3) == 0 && unrar))) + (strncmp(Name->data, "arj", 3) == 0 && unarj))) gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_box),Name->data); Name = g_list_next (Name); } @@ -284,16 +283,6 @@ type = XARCHIVETYPE_LZOP; format = "LZOP"; } - else if (strcmp (ComboArchiveType,"rar") == 0) - { - type = XARCHIVETYPE_RAR; - format = "RAR"; - } - else if (strcmp (ComboArchiveType,"rar5") == 0) - { - type = XARCHIVETYPE_RAR; - format = "RAR5"; - } else if (strcmp (ComboArchiveType,"tar") == 0) { type = XARCHIVETYPE_TAR; --- xarchiver-0.5.4.6.orig/src/pref_dialog.c 2016-03-09 10:25:48.000000000 -0500 +++ xarchiver-0.5.4.6/src/pref_dialog.c 2016-04-12 15:03:58.515195426 -0500 @@ -23,7 +23,7 @@ #include "main.h" #include "support.h" -extern gboolean unarj, unrar; +extern gboolean unarj; extern gboolean xdg_open; extern Extract_dialog_data *extract_window; extern Add_dialog_data *add_window; @@ -104,8 +102,7 @@ while ( archive_type != NULL ) { if (!(*(char *) archive_type->data == 0 || - (strncmp(archive_type->data, "arj", 3) == 0 && unarj) || - (strncmp(archive_type->data, "rar", 3) == 0 && unrar))) + (strncmp(archive_type->data, "arj", 3) == 0 && unarj))) gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (prefs_data->combo_prefered_format),archive_type->data ); archive_type = g_list_next (archive_type); } --- xarchiver-0.5.4.6.orig/src/window.c 2016-03-09 10:25:48.000000000 -0500 +++ xarchiver-0.5.4.6/src/window.c 2016-04-12 15:01:10.642771536 -0500 @@ -26,7 +26,7 @@ extern GList *ArchiveType; extern GList *ArchiveSuffix; -extern gboolean unarj, unrar; +extern gboolean unarj; extern gboolean xdg_open; extern Prefs_dialog_data *prefs_window; extern Extract_dialog_data *extract_window; @@ -323,9 +323,7 @@ /* Does the user open an archive from the command line whose archiver is not installed? */ gchar *ext = NULL; - if (type == XARCHIVETYPE_RAR) - ext = "rar"; - else if (type == XARCHIVETYPE_7ZIP) + if (type == XARCHIVETYPE_7ZIP) ext = "7z"; else if (type == XARCHIVETYPE_ARJ) ext = "arj"; @@ -353,7 +351,7 @@ g_free (path); return; } - /* Detect archive comment,rar one is detected in rar.c */ + /* Detect archive comment */ if (type == XARCHIVETYPE_ZIP) archive[current_page]->has_comment = xa_detect_archive_comment (XARCHIVETYPE_ZIP,path,archive[current_page]); else if (type == XARCHIVETYPE_ARJ) @@ -778,12 +776,6 @@ archive[idx]->status = XA_ARCHIVESTATUS_SFX; switch ( archive[idx]->type) { - case XARCHIVETYPE_RAR: - command = g_strconcat ("rar s -o+ ",archive[idx]->escaped_path,NULL); - list = g_slist_append(list,command); - xa_run_command (archive[idx],list); - break; - case XARCHIVETYPE_ZIP: { gchar *archive_name = NULL; @@ -968,7 +960,7 @@ "LHA and DEB support:\nŁukasz Zemczak \n", "LZMA support:\nThomas Dy \n", "LZOP support:\nKevin Day\n", - "RARv5, XZ, TAR.XZ support:\nFrederick GUERIN \n", + "XZ, TAR.XZ support:\nFrederick GUERIN \n", "GTK+ 3 port:\nBalló György \n", NULL }; @@ -1134,8 +1126,6 @@ xx = XARCHIVETYPE_ZIP; else if (memcmp (magic,"\x60\xea",2) == 0) xx = XARCHIVETYPE_ARJ; - else if (memcmp ( magic,"\x52\x61\x72\x21\x1a\x07\x00",7) == 0 || memcmp ( magic,"\x52\x61\x72\x21\x1a\x07\x01",7) == 0) - xx = XARCHIVETYPE_RAR; else if (memcmp ( magic,"\x42\x5a\x68",3) == 0) xx = XARCHIVETYPE_BZIP2; else if (memcmp ( magic,"\x1f\x8b",2) == 0 || memcmp ( magic,"\x1f\x9d",2) == 0) @@ -1496,7 +1486,6 @@ pos = 3; break; - case XARCHIVETYPE_RAR: case XARCHIVETYPE_ARJ: case XARCHIVETYPE_7ZIP: pos = 2; @@ -1561,7 +1550,6 @@ pos = 3; break; - case XARCHIVETYPE_RAR: case XARCHIVETYPE_ARJ: case XARCHIVETYPE_7ZIP: pos = 2; @@ -1599,7 +1587,7 @@ gtk_widget_show(selected_frame); gtk_widget_set_sensitive(deselect_all,TRUE); } - if ((archive->type == XARCHIVETYPE_ARJ && unarj) || (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_ARJ && unarj) || 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); @@ -1823,11 +1811,6 @@ xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't perform this action:"),_("You have to install arj package!")); return; } - if (archive[idx]->type == XARCHIVETYPE_RAR && unrar) - { - xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't perform this action:"),_("You have to install rar package!")); - return; - } if (archive[idx]->type == XARCHIVETYPE_DEB || archive[idx]->type == XARCHIVETYPE_RPM) { gchar *msg; @@ -2139,10 +2122,6 @@ command = g_strconcat ("arj c ",archive[idx]->escaped_path," -z",tmp,NULL); break; - case XARCHIVETYPE_RAR: - command = g_strconcat ("rar c ",archive[idx]->escaped_path," -z",tmp,NULL); - break; - case XARCHIVETYPE_ZIP: command = g_strconcat ("sh -c \"zip ",archive[idx]->escaped_path," -z <",tmp,"\"",NULL); break; --- xarchiver-0.5.4.6.orig/src/window.h 2016-03-09 10:25:48.000000000 -0500 +++ xarchiver-0.5.4.6/src/window.h 2016-04-12 14:36:54.387327416 -0500 @@ -40,7 +40,6 @@ #include "deb.h" #include "lha.h" #include "zip.h" -#include "rar.h" #include "tar.h" #include "7zip.h" #include "bzip2.h" --- xarchiver-0.5.4.6.orig/xarchiver.desktop.in 2016-03-09 10:25:48.000000000 -0500 +++ xarchiver-0.5.4.6/xarchiver.desktop.in 2016-04-12 14:35:46.771027058 -0500 @@ -9,4 +9,4 @@ Terminal=false Categories=GTK;Archiving;Utility; StartupNotify=true -MimeType=application/gzip;application/vnd.debian.binary-package;application/x-7z-compressed;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-compressed-tar;application/x-java-archive;application/x-lha;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-rar;application/x-rpm;application/x-source-rpm;application/x-tar;application/x-tzo;application/x-xz;application/x-xz-compressed-tar;application/zip; +MimeType=application/gzip;application/vnd.debian.binary-package;application/x-7z-compressed;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-compressed-tar;application/x-java-archive;application/x-lha;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-rpm;application/x-source-rpm;application/x-tar;application/x-tzo;application/x-xz;application/x-xz-compressed-tar;application/zip;