From 4ee59c4277f72e00b09b893d50effdb0dfed7630 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 11 Jul 2015 07:34:15 -0300 Subject: xarchiver-0.5.4-2.parabola2: port to GTK+ 3, keep GTK+ 2 supported --- libre/xarchiver/remove-nonfree-unrar-support.patch | 108 ++++++++++----------- 1 file changed, 54 insertions(+), 54 deletions(-) (limited to 'libre/xarchiver/remove-nonfree-unrar-support.patch') diff --git a/libre/xarchiver/remove-nonfree-unrar-support.patch b/libre/xarchiver/remove-nonfree-unrar-support.patch index 10c68052b..11795daaf 100644 --- a/libre/xarchiver/remove-nonfree-unrar-support.patch +++ b/libre/xarchiver/remove-nonfree-unrar-support.patch @@ -1,6 +1,6 @@ -diff -Nur xarchiver-0.5.3.orig/doc/html/ch01.html xarchiver-0.5.3/doc/html/ch01.html ---- xarchiver-0.5.3.orig/doc/html/ch01.html 2008-11-10 06:05:07.000000000 -0200 -+++ xarchiver-0.5.3/doc/html/ch01.html 2014-05-05 16:32:35.166604039 -0300 +diff -Nur xarchiver-0.5.4.orig/doc/html/ch01.html xarchiver-0.5.4/doc/html/ch01.html +--- xarchiver-0.5.4.orig/doc/html/ch01.html 2014-09-28 17:46:31.000000000 -0300 ++++ xarchiver-0.5.4/doc/html/ch01.html 2015-07-11 07:08:07.905619485 -0300 @@ -23,13 +23,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 Xarchiver window
    • @@ -17,7 +17,7 @@ diff -Nur xarchiver-0.5.3.orig/doc/html/ch01.html xarchiver-0.5.3/doc/html/ch01. -
  • 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)

    • Prev   Next
    - Xarchiver 0.5.2 + Xarchiver 0.5.4  Home Where to get it
    diff -Nur xarchiver-0.5.3.orig/doc/html/ch03s03.html xarchiver-0.5.3/doc/html/ch03s03.html --- xarchiver-0.5.3.orig/doc/html/ch03s03.html 2008-11-03 04:49:49.000000000 -0200 @@ -50,9 +50,9 @@ diff -Nur xarchiver-0.5.3.orig/doc/html/ch04s06.html xarchiver-0.5.3/doc/html/ch -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 
    -diff -Nur xarchiver-0.5.3.orig/doc/xarchiver.docbook xarchiver-0.5.3/doc/xarchiver.docbook ---- xarchiver-0.5.3.orig/doc/xarchiver.docbook 2007-08-22 07:49:19.000000000 -0300 -+++ xarchiver-0.5.3/doc/xarchiver.docbook 2014-05-05 16:25:17.863287969 -0300 +diff -Nur xarchiver-0.5.4.orig/doc/xarchiver.docbook xarchiver-0.5.4/doc/xarchiver.docbook +--- xarchiver-0.5.4.orig/doc/xarchiver.docbook 2007-08-22 07:49:19.000000000 -0300 ++++ xarchiver-0.5.4/doc/xarchiver.docbook 2015-07-11 07:08:07.905619485 -0300 @@ -50,14 +50,14 @@ The most used archiver cmd-line options are supported in the Add and Extract dialog Archives are detected by their magic header and not by the extension except for .tar.bz2 and .tar.gz @@ -65,10 +65,10 @@ diff -Nur xarchiver-0.5.3.orig/doc/xarchiver.docbook xarchiver-0.5.3/doc/xarchiv + Smart detection of arj and zip password encrypted archives All the the output of the cmd-line archiver is displayed in the Xarchiver window - All common formats are supported: arj, bzip2, lha, gzip, 7z, rar, tar, tar.bz2, tar.gz, zip, DEB and RPM (only open,view and extract) -+ All common formats are supported: arj, bzip2, lha, gzip, 7z, tar, tar.bz2, tar.gz, zip, DEB and RPM (only open,view and extract) - Support of RPM files without RPM executable. This is useful on not RPM-based distributions like Slackware and Arch Linux -+ Support of RPM files without RPM executable. This is useful on not RPM-based distributions - Zip, rar, arj and 7z password encrypted archives are fully supported (7z automatic password detection is not supported) ++ All common formats are supported: arj, bzip2, lha, gzip, 7z, tar, tar.bz2, tar.gz, zip, DEB and RPM (only open,view and extract) ++ Support of RPM files without RPM executable. This is useful on not RPM-based distributions + Zip, arj and 7z password encrypted archives are fully supported (7z automatic password detection is not supported) @@ -120,10 +120,10 @@ diff -Nur xarchiver-0.5.3.orig/po/POTFILES.in xarchiver-0.5.3/po/POTFILES.in src/rpm.c src/tar.c src/zip.c -diff -Nur xarchiver-0.5.3.orig/src/Makefile.am xarchiver-0.5.3/src/Makefile.am ---- xarchiver-0.5.3.orig/src/Makefile.am 2008-09-23 03:39:50.000000000 -0300 -+++ xarchiver-0.5.3/src/Makefile.am 2014-05-05 16:30:14.628892353 -0300 -@@ -16,7 +16,6 @@ +diff -Nur xarchiver-0.5.4.orig/src/Makefile.am xarchiver-0.5.4/src/Makefile.am +--- xarchiver-0.5.4.orig/src/Makefile.am 2015-07-11 07:05:10.401331645 -0300 ++++ xarchiver-0.5.4/src/Makefile.am 2015-07-11 07:08:07.905619485 -0300 +@@ -15,7 +15,6 @@ arj.c arj.h \ deb.c deb.h \ zip.c zip.h \ @@ -180,9 +180,9 @@ diff -Nur xarchiver-0.5.3.orig/src/Makefile.in xarchiver-0.5.3/src/Makefile.in xarchiver-7zip.o: 7zip.c @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xarchiver_CFLAGS) $(CFLAGS) -MT xarchiver-7zip.o -MD -MP -MF "$(DEPDIR)/xarchiver-7zip.Tpo" -c -o xarchiver-7zip.o `test -f '7zip.c' || echo '$(srcdir)/'`7zip.c; \ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xarchiver-7zip.Tpo" "$(DEPDIR)/xarchiver-7zip.Po"; else rm -f "$(DEPDIR)/xarchiver-7zip.Tpo"; exit 1; fi -diff -Nur xarchiver-0.5.3.orig/src/interface.c xarchiver-0.5.3/src/interface.c ---- xarchiver-0.5.3.orig/src/interface.c 2014-02-09 13:26:24.000000000 -0200 -+++ xarchiver-0.5.3/src/interface.c 2014-05-05 17:04:24.879755668 -0300 +diff -Nur xarchiver-0.5.4.orig/src/interface.c xarchiver-0.5.4/src/interface.c +--- xarchiver-0.5.4.orig/src/interface.c 2015-07-11 07:05:21.077451685 -0300 ++++ xarchiver-0.5.4/src/interface.c 2015-07-11 07:08:07.908952647 -0300 @@ -45,7 +45,7 @@ { "text/uri-list",0,0 }, }; @@ -192,7 +192,7 @@ diff -Nur xarchiver-0.5.3.orig/src/interface.c xarchiver-0.5.3/src/interface.c static gboolean xa_progress_dialog_delete_event (GtkWidget *caller,GdkEvent *event,GPid pid); static void xa_progress_dialog_stop_action (GtkWidget *widget,GPid pid); -@@ -600,7 +600,7 @@ +@@ -592,7 +592,7 @@ if (selection != NULL) xa_row_selected(selection,archive[id]); @@ -201,7 +201,7 @@ diff -Nur xarchiver-0.5.3.orig/src/interface.c xarchiver-0.5.3/src/interface.c gtk_widget_set_sensitive (comment_menu,TRUE); else gtk_widget_set_sensitive (comment_menu,FALSE); -@@ -623,12 +623,7 @@ +@@ -615,12 +615,7 @@ { gtk_widget_show(selected_frame); gtk_widget_set_sensitive(deselect_all,TRUE); @@ -312,21 +312,21 @@ diff -Nur xarchiver-0.5.4.orig/src/main.c xarchiver-0.5.4/src/main.c absolute_path = g_find_program_in_path("cpio"); if ( absolute_path ) { -diff -Nur xarchiver-0.5.3.orig/src/mime.c xarchiver-0.5.3/src/mime.c ---- xarchiver-0.5.3.orig/src/mime.c 2008-11-05 07:53:22.000000000 -0200 -+++ xarchiver-0.5.3/src/mime.c 2014-05-05 16:31:28.126107426 -0300 +diff -Nur xarchiver-0.5.4.orig/src/mime.c xarchiver-0.5.4/src/mime.c +--- xarchiver-0.5.4.orig/src/mime.c 2015-07-11 07:05:21.077451685 -0300 ++++ xarchiver-0.5.4/src/mime.c 2015-07-11 07:10:24.465369710 -0300 @@ -44,7 +44,7 @@ - icon_name = "gnome-mime-application-vnd.ms-excel"; + icon_name = "x-office-spreadsheet"; else if (strcmp(mime,"application/vnd.ms-powerpoint") == 0 || strcmp (mime,"application/vnd.oasis.opendocument.presentation") == 0) - icon_name = "gnome-mime-application-vnd.ms-powerpoint"; + icon_name = "x-office-presentation"; - else if (strcmp(mime,"application/zip") == 0 || strcmp(mime,"application/x-rar") == 0 || strcmp(mime,"application/x-tar") == 0 + else if (strcmp(mime,"application/zip") == 0 || strcmp(mime,"application/x-tar") == 0 || strcmp(mime,"application/x-7z-compressed") == 0 || strcmp(mime,"application/x-bzip-compressed-tar") == 0 || strcmp (mime,"application/x-compressed-tar") == 0 || strcmp (mime,"application/x-lha") == 0 || strcmp (mime,"application/x-rpm") == 0 || strcmp (mime,"application/x-deb") == 0 -diff -Nur xarchiver-0.5.3.orig/src/new_dialog.c xarchiver-0.5.3/src/new_dialog.c ---- xarchiver-0.5.3.orig/src/new_dialog.c 2014-02-09 13:26:24.000000000 -0200 -+++ xarchiver-0.5.3/src/new_dialog.c 2014-05-05 16:21:07.714600036 -0300 +diff -Nur xarchiver-0.5.4.orig/src/new_dialog.c xarchiver-0.5.4/src/new_dialog.c +--- xarchiver-0.5.4.orig/src/new_dialog.c 2015-07-11 07:05:10.401331645 -0300 ++++ xarchiver-0.5.4/src/new_dialog.c 2015-07-11 07:13:52.991250444 -0300 @@ -24,7 +24,6 @@ #include "string_utils.h" #include "main.h" @@ -335,19 +335,19 @@ diff -Nur xarchiver-0.5.3.orig/src/new_dialog.c xarchiver-0.5.3/src/new_dialog.c extern Prefs_dialog_data *prefs_window; gchar *current_new_directory = NULL; gint new_combo_box = -1; -@@ -100,11 +99,6 @@ +@@ -98,11 +97,6 @@ Name = g_list_first (ArchiveType); while (Name) - { - if (!(strncmp(Name->data, "rar", 3) == 0 && unrar)) -- gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box),Name->data); +- gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_box),Name->data); - Name = g_list_next (Name); - } if (new_combo_box == -1) gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box),gtk_combo_box_get_active(GTK_COMBO_BOX(prefs_window->combo_prefered_format))); else -@@ -227,16 +221,6 @@ +@@ -225,16 +219,6 @@ type = XARCHIVETYPE_LZOP; format = "LZOP"; } @@ -364,9 +364,9 @@ diff -Nur xarchiver-0.5.3.orig/src/new_dialog.c xarchiver-0.5.3/src/new_dialog.c else if (strcmp (ComboArchiveType,"tar") == 0) { type = XARCHIVETYPE_TAR; -diff -Nur xarchiver-0.5.3.orig/src/pref_dialog.c xarchiver-0.5.3/src/pref_dialog.c ---- xarchiver-0.5.3.orig/src/pref_dialog.c 2014-02-09 13:26:24.000000000 -0200 -+++ xarchiver-0.5.3/src/pref_dialog.c 2014-05-05 17:29:05.494321392 -0300 +diff -Nur xarchiver-0.5.4.orig/src/pref_dialog.c xarchiver-0.5.4/src/pref_dialog.c +--- xarchiver-0.5.4.orig/src/pref_dialog.c 2015-07-11 07:05:21.077451685 -0300 ++++ xarchiver-0.5.4/src/pref_dialog.c 2015-07-11 07:08:07.908952647 -0300 @@ -23,7 +23,6 @@ #include "main.h" #include "support.h" @@ -375,7 +375,7 @@ diff -Nur xarchiver-0.5.3.orig/src/pref_dialog.c xarchiver-0.5.3/src/pref_dialog extern gboolean xdg_open; extern Extract_dialog_data *extract_window; extern Add_dialog_data *add_window; -@@ -103,9 +102,7 @@ +@@ -101,9 +100,7 @@ while ( archive_type != NULL ) { if (strcmp(archive_type->data, "tgz") == 0 || @@ -384,11 +384,11 @@ diff -Nur xarchiver-0.5.3.orig/src/pref_dialog.c xarchiver-0.5.3/src/pref_dialog - goto next; + strcmp(archive_type->data, "rpm") == 0); else - gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_prefered_format),archive_type->data ); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (prefs_data->combo_prefered_format),archive_type->data ); next: diff -Nur xarchiver-0.5.4.orig/src/window.c xarchiver-0.5.4/src/window.c ---- xarchiver-0.5.4.orig/src/window.c 2014-09-30 16:21:18.428751931 -0300 -+++ xarchiver-0.5.4/src/window.c 2014-09-30 16:36:11.114336732 -0300 +--- xarchiver-0.5.4.orig/src/window.c 2015-07-11 07:05:10.404664805 -0300 ++++ xarchiver-0.5.4/src/window.c 2015-07-11 07:13:00.640641666 -0300 @@ -26,7 +26,6 @@ extern GList *ArchiveType; @@ -397,7 +397,7 @@ diff -Nur xarchiver-0.5.4.orig/src/window.c xarchiver-0.5.4/src/window.c extern gboolean xdg_open; extern Prefs_dialog_data *prefs_window; extern Extract_dialog_data *extract_window; -@@ -326,11 +325,7 @@ +@@ -325,11 +324,7 @@ /* Does the user open an archive from the command line whose archiver is not installed? */ gchar *ext = NULL; @@ -410,7 +410,7 @@ diff -Nur xarchiver-0.5.4.orig/src/window.c xarchiver-0.5.4/src/window.c ext = "7z"; else if (type == XARCHIVETYPE_ARJ) ext = "arj"; -@@ -358,7 +353,7 @@ +@@ -357,7 +352,7 @@ g_free (path); return; } @@ -419,7 +419,7 @@ diff -Nur xarchiver-0.5.4.orig/src/window.c xarchiver-0.5.4/src/window.c if (type == XARCHIVETYPE_ZIP) archive[current_page]->has_comment = xa_detect_archive_comment (XARCHIVETYPE_ZIP,path,archive[current_page]); else if (type == XARCHIVETYPE_ARJ) -@@ -780,13 +775,6 @@ +@@ -779,13 +774,6 @@ archive[idx]->status = XA_ARCHIVESTATUS_SFX; switch ( archive[idx]->type) { @@ -433,16 +433,16 @@ diff -Nur xarchiver-0.5.4.orig/src/window.c xarchiver-0.5.4/src/window.c case XARCHIVETYPE_ZIP: { gchar *archive_name = NULL; -@@ -964,7 +952,7 @@ - void xa_about (GtkMenuItem *menuitem,gpointer user_data) - { - static GtkWidget *about = NULL; -- const char *authors[] = {"Main developer:\nGiuseppe Torelli \n\nArchive navigation code:\nJohn Berthels\n\nLHA and DEB support:\nŁukasz Zemczak \n\nLZMA support:\nThomas Dy \n\nLZOP support:\nKevin Day\n\nRAR5, XZ, TAR.XZ support:\nFrederick GUERIN \n",NULL}; -+ const char *authors[] = {"Main developer:\nGiuseppe Torelli \n\nArchive navigation code:\nJohn Berthels\n\nLHA and DEB support:\nŁukasz Zemczak \n\nLZMA support:\nThomas Dy \n\nLZOP support:\nKevin Day\n\nXZ, TAR.XZ support:\nFrederick GUERIN \n",NULL}; - const char *documenters[] = {"Special thanks to Bjoern Martensen for\nbugs hunting and Xarchiver Tango logo.\n\nThanks to:\nBenedikt Meurer\nStephan Arts\nBruno Jesus <00cpxxx@gmail.com>\nUracile for the stunning logo\n",NULL}; - - if (about == NULL) -@@ -1122,10 +1110,6 @@ +@@ -970,7 +958,7 @@ + "LHA and DEB support:\nŁukasz Zemczak \n", + "LZMA support:\nThomas Dy \n", + "LZOP support:\nKevin Day\n", +- "RAR5, XZ, TAR.XZ support:\nFrederick GUERIN \n", ++ "XZ, TAR.XZ support:\nFrederick GUERIN \n", + "GTK+ 3 port:\nBalló György \n", + NULL + }; +@@ -1138,10 +1126,6 @@ xx = XARCHIVETYPE_ZIP; else if (memcmp (magic,"\x60\xea",2) == 0) xx = XARCHIVETYPE_ARJ; @@ -453,7 +453,7 @@ diff -Nur xarchiver-0.5.4.orig/src/window.c xarchiver-0.5.4/src/window.c 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) -@@ -1479,8 +1463,6 @@ +@@ -1495,8 +1479,6 @@ pos = 3; break; @@ -462,7 +462,7 @@ diff -Nur xarchiver-0.5.4.orig/src/window.c xarchiver-0.5.4/src/window.c case XARCHIVETYPE_ARJ: case XARCHIVETYPE_7ZIP: pos = 2; -@@ -1545,8 +1527,6 @@ +@@ -1561,8 +1543,6 @@ pos = 3; break; @@ -471,7 +471,7 @@ diff -Nur xarchiver-0.5.4.orig/src/window.c xarchiver-0.5.4/src/window.c case XARCHIVETYPE_ARJ: case XARCHIVETYPE_7ZIP: pos = 2; -@@ -1584,7 +1564,7 @@ +@@ -1600,7 +1580,7 @@ gtk_widget_show(selected_frame); gtk_widget_set_sensitive(deselect_all,TRUE); } @@ -480,7 +480,7 @@ diff -Nur xarchiver-0.5.4.orig/src/window.c xarchiver-0.5.4/src/window.c { gtk_widget_set_sensitive (delete_menu,FALSE); gtk_widget_set_sensitive (rename_menu,FALSE); -@@ -1801,11 +1781,6 @@ +@@ -1817,11 +1797,6 @@ else idx = xa_find_archive_index (current_page); @@ -492,7 +492,7 @@ diff -Nur xarchiver-0.5.4.orig/src/window.c xarchiver-0.5.4/src/window.c if (archive[idx]->type == XARCHIVETYPE_DEB || archive[idx]->type == XARCHIVETYPE_RPM) { gchar *msg; -@@ -2111,11 +2086,6 @@ +@@ -2139,11 +2114,6 @@ command = g_strconcat ("arj c ",archive[idx]->escaped_path," -z",tmp,NULL); break; -- cgit v1.2.3-54-g00ecf