diff options
Diffstat (limited to 'libre/xarchiver/libre.patch')
| -rw-r--r-- | libre/xarchiver/libre.patch | 541 |
1 files changed, 541 insertions, 0 deletions
diff --git a/libre/xarchiver/libre.patch b/libre/xarchiver/libre.patch new file mode 100644 index 000000000..3016db902 --- /dev/null +++ b/libre/xarchiver/libre.patch @@ -0,0 +1,541 @@ +diff --git a/doc/html/ch01s01.html b/doc/html/ch01s01.html +index 7dfaca1..6046f83 100644 +--- a/doc/html/ch01s01.html ++++ b/doc/html/ch01s01.html +@@ -29,20 +29,20 @@ + </p></li><li class="listitem"><p> + Progress window when using Xarchiver from the command line or from a file-manager + </p></li><li class="listitem"><p> +- ARJ, RAR and ZIP archive comment are supported ++ ARJ and ZIP archive comment are supported + </p></li><li class="listitem"><p> + Ability to convert the archive to self-extracting for those archive types which support it + </p></li><li class="listitem"><p> +- Smart detection of arj, zip and rar password encrypted archives ++ Smart detection of arj and zip password encrypted archives + </p></li><li class="listitem"><p> + All the the output of the command line archiver is displayed in the Xarchiver window + </p></li><li class="listitem"><p> +- 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) + </p></li><li class="listitem"><p> + Deb and Rpm packages are handled internally, their package managers are NOT required. + </p></li><li class="listitem"><p> +- 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) + </p></li></ul></div><p> + </p></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch01.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch01.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch01s02.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Chapter 1. + Introduction +- </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Where to get it</td></tr></table></div></body></html> +\ No newline at end of file ++ </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Where to get it</td></tr></table></div></body></html> +diff --git a/doc/html/ch03s03.html b/doc/html/ch03s03.html +index 776b967..200dfe1 100644 +--- a/doc/html/ch03s03.html ++++ b/doc/html/ch03s03.html +@@ -1,6 +1,6 @@ + <?xml version="1.0" encoding="UTF-8" standalone="no"?> + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>General</title><link rel="stylesheet" type="text/css" href="xarchiver.css" /><meta name="generator" content="DocBook XSL Stylesheets V1.78.1" /><link rel="home" href="index.html" title="Xarchiver 0.5.4" /><link rel="up" href="ch03.html" title="Chapter 3. Usage" /><link rel="prev" href="ch03s02.html" title="Command line options" /><link rel="next" href="ch03s04.html" title="Xarchiver menu" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">General</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s02.html">Prev</a> </td><th width="60%" align="center">Chapter 3. Usage</th><td width="20%" align="right"> <a accesskey="n" href="ch03s04.html">Next</a></td></tr></table><hr /></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="usage_general"></a>General</h2></div></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="general_startup"></a>Startup</h3></div></div></div><p> +- At startup, Xarchiver detects the available installed archivers (tar,rar,zip etc) and the script <span class="emphasis"><em>xdg-open</em></span> 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 <span class="emphasis"><em>xdg-open</em></span> 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. + </p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="how_it_works"></a>How it works</h3></div></div></div><p> + 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 <span class="emphasis"><em>xdg-open</em></span> 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. + </p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="dnd"></a>Drag and Drop</h3></div></div></div><p> +diff --git a/doc/html/ch04s02.html b/doc/html/ch04s02.html +index d92be40..02748bc 100644 +--- a/doc/html/ch04s02.html ++++ b/doc/html/ch04s02.html +@@ -1,4 +1,4 @@ + <?xml version="1.0" encoding="UTF-8" standalone="no"?> +-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>How can I create an archive with some files password protected and others not?</title><link rel="stylesheet" type="text/css" href="xarchiver.css" /><meta name="generator" content="DocBook XSL Stylesheets V1.78.1" /><link rel="home" href="index.html" title="Xarchiver 0.5.4" /><link rel="up" href="ch04.html" title="Chapter 4. FAQ" /><link rel="prev" href="ch04s01.html" title="Why are ace archives not supported?" /><link rel="next" href="ch04s03.html" title="Why does Xarchiver emit this error message when handling tar archives?" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">How can I create an archive with some files password protected and others not?</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch04s01.html">Prev</a> </td><th width="60%" align="center">Chapter 4. FAQ</th><td width="20%" align="right"> <a accesskey="n" href="ch04s03.html">Next</a></td></tr></table><hr /></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="faq_2"></a>How can I create an archive with some files password protected and others not?</h2></div></div></div><p>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 ++<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>How can I create an archive with some files password protected and others not?</title><link rel="stylesheet" type="text/css" href="xarchiver.css" /><meta name="generator" content="DocBook XSL Stylesheets V1.78.1" /><link rel="home" href="index.html" title="Xarchiver 0.5.4" /><link rel="up" href="ch04.html" title="Chapter 4. FAQ" /><link rel="prev" href="ch04s01.html" title="Why are ace archives not supported?" /><link rel="next" href="ch04s03.html" title="Why does Xarchiver emit this error message when handling tar archives?" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">How can I create an archive with some files password protected and others not?</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch04s01.html">Prev</a> </td><th width="60%" align="center">Chapter 4. FAQ</th><td width="20%" align="right"> <a accesskey="n" href="ch04s03.html">Next</a></td></tr></table><hr /></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="faq_2"></a>How can I create an archive with some files password protected and others not?</h2></div></div></div><p>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. + </p></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch04s01.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch04.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch04s03.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Why are ace archives not supported? </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Why does Xarchiver emit this error message when handling tar archives?</td></tr></table></div></body></html> +\ No newline at end of file +diff --git a/doc/html/ch04s06.html b/doc/html/ch04s06.html +index 4396f65..b3887fa 100644 +--- a/doc/html/ch04s06.html ++++ b/doc/html/ch04s06.html +@@ -1,3 +1,3 @@ + <?xml version="1.0" encoding="UTF-8" standalone="no"?> +-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?</title><link rel="stylesheet" type="text/css" href="xarchiver.css" /><meta name="generator" content="DocBook XSL Stylesheets V1.78.1" /><link rel="home" href="index.html" title="Xarchiver 0.5.4" /><link rel="up" href="ch04.html" title="Chapter 4. FAQ" /><link rel="prev" href="ch04s05.html" title="Why does Xarchiver sometimes report errors but the Error messages window is empty?" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch04s05.html">Prev</a> </td><th width="60%" align="center">Chapter 4. FAQ</th><td width="20%" align="right"> </td></tr></table><hr /></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="faq_6"></a>Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?</h2></div></div></div><p>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. ++<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?</title><link rel="stylesheet" type="text/css" href="xarchiver.css" /><meta name="generator" content="DocBook XSL Stylesheets V1.78.1" /><link rel="home" href="index.html" title="Xarchiver 0.5.4" /><link rel="up" href="ch04.html" title="Chapter 4. FAQ" /><link rel="prev" href="ch04s05.html" title="Why does Xarchiver sometimes report errors but the Error messages window is empty?" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch04s05.html">Prev</a> </td><th width="60%" align="center">Chapter 4. FAQ</th><td width="20%" align="right"> </td></tr></table><hr /></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="faq_6"></a>Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?</h2></div></div></div><p>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. + </p></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch04s05.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch04.html">Up</a></td><td width="40%" align="right"> </td></tr><tr><td width="40%" align="left" valign="top">Why does Xarchiver sometimes report errors but the Error messages window is empty? </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></body></html> +\ No newline at end of file +diff --git a/doc/xarchiver.docbook b/doc/xarchiver.docbook +index 63dcfe4..d88f3fb 100644 +--- a/doc/xarchiver.docbook ++++ b/doc/xarchiver.docbook +@@ -98,7 +98,7 @@ + </listitem> + <listitem> + <para> +- ARJ, RAR and ZIP archive comment are supported ++ ARJ and ZIP archive comment are supported + </para> + </listitem> + <listitem> +@@ -108,7 +108,7 @@ + </listitem> + <listitem> + <para> +- Smart detection of arj, zip and rar password encrypted archives ++ Smart detection of arj and zip password encrypted archives + </para> + </listitem> + <listitem> +@@ -118,7 +118,7 @@ + </listitem> + <listitem> + <para> +- 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) + </para> + </listitem> + <listitem> +@@ -128,7 +128,7 @@ + </listitem> + <listitem> + <para> +- 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) + </para> + </listitem> + </itemizedlist> +@@ -278,7 +278,7 @@ + <section id="general_startup"> + <title>Startup</title> + <para> +- At startup, &app; detects the available installed archivers (tar,rar,zip etc) and the script <emphasis>xdg-open</emphasis> 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 <emphasis>xdg-open</emphasis> 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. + </para> + </section> + <section id="how_it_works"> +@@ -504,7 +504,7 @@ + </section> + <section id="faq_2"> + <title>How can I create an archive with some files password protected and others not?</title> +- <para>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 ++ <para>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. + </para> + </section> +@@ -525,7 +525,7 @@ enter your password. From now on all the files you add to the archive will be pa + </section> + <section id="faq_6"> + <title>Why &app; doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?</title> +- <para>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. ++ <para>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. + </para> + </section> + </chapter> +diff --git a/po/POTFILES.in b/po/POTFILES.in +index d581e18..f420a18 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -12,7 +12,6 @@ src/main.c + 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 +diff --git a/src/Makefile.am b/src/Makefile.am +index 4efe75a..5040ad5 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -33,8 +33,6 @@ xarchiver_SOURCES = \ + open-with-dlg.h \ + pref_dialog.c \ + pref_dialog.h \ +- rar.c \ +- rar.h \ + rpm.c \ + rpm.h \ + socket.c \ +diff --git a/src/Makefile.in b/src/Makefile.in +index f4d5f8a..58f8677 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -111,7 +111,7 @@ am__xarchiver_SOURCES_DIST = 7zip.c 7zip.h add_dialog.c add_dialog.h \ + extract_dialog.c extract_dialog.h gzip.c gzip.h interface.c \ + interface.h lha.c lha.h main.c main.h mime.c mime.h \ + new_dialog.c new_dialog.h open-with-dlg.c open-with-dlg.h \ +- pref_dialog.c pref_dialog.h rar.c rar.h rpm.c rpm.h socket.c \ ++ pref_dialog.c pref_dialog.h rpm.c rpm.h socket.c \ + socket.h string_utils.c string_utils.h support.h tar.c tar.h \ + utf8-fnmatch.c utf8-fnmatch.h window.c window.h zip.c zip.h \ + sexy-icon-entry.c sexy-icon-entry.h +@@ -124,7 +124,7 @@ am_xarchiver_OBJECTS = xarchiver-7zip.$(OBJEXT) \ + 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-socket.$(OBJEXT) \ + xarchiver-string_utils.$(OBJEXT) xarchiver-tar.$(OBJEXT) \ + xarchiver-utf8-fnmatch.$(OBJEXT) xarchiver-window.$(OBJEXT) \ +@@ -403,7 +403,7 @@ xarchiver_SOURCES = 7zip.c 7zip.h add_dialog.c add_dialog.h archive.c \ + extract_dialog.c extract_dialog.h gzip.c gzip.h interface.c \ + interface.h lha.c lha.h main.c main.h mime.c mime.h \ + new_dialog.c new_dialog.h open-with-dlg.c open-with-dlg.h \ +- pref_dialog.c pref_dialog.h rar.c rar.h rpm.c rpm.h socket.c \ ++ pref_dialog.c pref_dialog.h rpm.c rpm.h socket.c \ + socket.h string_utils.c string_utils.h support.h tar.c tar.h \ + utf8-fnmatch.c utf8-fnmatch.h window.c window.h zip.c zip.h \ + $(am__append_1) +@@ -522,7 +522,6 @@ distclean-compile: + @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@ +@@ -763,20 +762,6 @@ xarchiver-pref_dialog.obj: pref_dialog.c + @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 +diff --git a/src/interface.c b/src/interface.c +index e2ec358..50278c1 100644 +--- a/src/interface.c ++++ b/src/interface.c +@@ -38,7 +38,7 @@ static const GtkTargetEntry drop_targets[] = + + static gulong selchghid; + +-extern gboolean unarj,unrar,batch_mode; ++extern gboolean unarj,batch_mode; + + void xa_page_has_changed(GtkNotebook *, GTK_COMPAT_SWITCH_PAGE_TYPE, guint, gpointer); + static gboolean xa_progress_dialog_delete_event (GtkWidget *caller,GdkEvent *event,GPid *pid); +@@ -593,7 +593,7 @@ void xa_page_has_changed (GtkNotebook *notebook, GTK_COMPAT_SWITCH_PAGE_TYPE pag + 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); +@@ -616,12 +616,7 @@ void xa_page_has_changed (GtkNotebook *notebook, GTK_COMPAT_SWITCH_PAGE_TYPE pag + { + 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); +diff --git a/src/main.c b/src/main.c +index 2f234cd..35ece25 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -29,7 +29,6 @@ + #include "lha.h" + #include "new_dialog.h" + #include "pref_dialog.h" +-#include "rar.h" + #include "rpm.h" + #include "string_utils.h" + #include "support.h" +@@ -49,7 +48,6 @@ gchar *add_files; + 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; +@@ -344,7 +342,6 @@ void xa_set_available_archivers() + 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; +@@ -356,7 +353,6 @@ void xa_set_available_archivers() + 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; +@@ -368,7 +364,6 @@ void xa_set_available_archivers() + 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; +@@ -379,7 +374,6 @@ void xa_set_available_archivers() + 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; +@@ -389,7 +383,6 @@ void xa_set_available_archivers() + 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; +@@ -498,31 +491,6 @@ void xa_set_available_archivers() + 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 ) + { +diff --git a/src/mime.c b/src/mime.c +index 9251cc2..fde96ac 100644 +--- a/src/mime.c ++++ b/src/mime.c +@@ -70,7 +70,6 @@ const char *xa_get_stock_mime_icon(char *filename) + 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 || +diff --git a/src/new_dialog.c b/src/new_dialog.c +index 13ea3a7..da2d2e0 100644 +--- a/src/new_dialog.c ++++ b/src/new_dialog.c +@@ -25,7 +25,7 @@ + #include "support.h" + #include "window.h" + +-extern gboolean unarj, unrar; ++extern gboolean unarj; + extern Prefs_dialog_data *prefs_window; + gchar *current_new_directory = NULL; + gint new_combo_box = -1; +@@ -167,8 +167,7 @@ XArchive *xa_new_archive_dialog (gchar *path, XArchive *archive_open[], gboolean + 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); + } +@@ -294,16 +293,6 @@ XArchive *xa_new_archive_dialog (gchar *path, XArchive *archive_open[], gboolean + 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; +diff --git a/src/pref_dialog.c b/src/pref_dialog.c +index 06b31cc..3416aef 100644 +--- a/src/pref_dialog.c ++++ b/src/pref_dialog.c +@@ -24,7 +24,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; +@@ -103,8 +103,7 @@ Prefs_dialog_data *xa_create_prefs_dialog() + 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); + } +diff --git a/src/window.c b/src/window.c +index 031b673..d64c271 100644 +--- a/src/window.c ++++ b/src/window.c +@@ -42,7 +42,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; +@@ -339,9 +339,7 @@ void xa_open_archive (GtkMenuItem *menuitem,gpointer data) + + /* 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"; +@@ -369,7 +367,7 @@ void xa_open_archive (GtkMenuItem *menuitem,gpointer data) + 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) +@@ -794,12 +792,6 @@ void xa_convert_sfx (GtkMenuItem *menuitem ,gpointer user_data) + 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; +@@ -1000,7 +992,7 @@ void xa_about (GtkMenuItem *menuitem,gpointer user_data) + "LZOP support:", + "Kevin Day", + "", +- "RARv5, XZ, TAR.XZ support:", ++ "XZ, TAR.XZ support:", + "Frederick GUERIN <fguerin01@gmail.com>", + "", + "GTK+ 3 port:", +@@ -1175,8 +1167,6 @@ XArchiveType xa_detect_archive_type (gchar *filename) + 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) +@@ -1537,7 +1527,6 @@ void xa_set_statusbar_message_for_displayed_rows(XArchive *archive) + pos = 3; + break; + +- case XARCHIVETYPE_RAR: + case XARCHIVETYPE_ARJ: + case XARCHIVETYPE_7ZIP: + pos = 2; +@@ -1602,7 +1591,6 @@ void xa_row_selected (GtkTreeSelection *selection,XArchive *archive) + pos = 3; + break; + +- case XARCHIVETYPE_RAR: + case XARCHIVETYPE_ARJ: + case XARCHIVETYPE_7ZIP: + pos = 2; +@@ -1640,7 +1628,7 @@ void xa_row_selected (GtkTreeSelection *selection,XArchive *archive) + 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); +@@ -1864,11 +1852,6 @@ void on_drag_data_received (GtkWidget *widget,GdkDragContext *context,int x,int + 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; +@@ -2174,10 +2157,6 @@ void xa_comment_window_insert_in_archive(GtkButton *button,gpointer data) + 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; +diff --git a/xarchiver.desktop.in b/xarchiver.desktop.in +index 2ac0c17..85ee98e 100644 +--- a/xarchiver.desktop.in ++++ b/xarchiver.desktop.in +@@ -9,4 +9,4 @@ Exec=xarchiver %f + 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; |