xarchiver-0.5.4.11-1.parabola1: Adding unar as optional dependency

2 files changed, 46 insertions, 358 deletions

diff --git a/libre/xarchiver/PKGBUILD b/libre/xarchiver/PKGBUILD
index 7272a18d3..140ea8af4 100644
--- a/libre/xarchiver/PKGBUILD
+++ b/libre/xarchiver/PKGBUILD
@@ -1,12 +1,14 @@
 # $Id: PKGBUILD 212497 2017-02-15 05:21:07Z bgyorgy $
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 # Maintainer (Arch): Balló György <ballogyor+arch at gmail dot com>
 # Contributor (Arch): Alexander Fehr <pizzapunk gmail com>
 # Contributor (Arch): Andrew Simmons <andrew.simmons@gmail.com>
-# Maintainer: André Silva <emulatorman@parabola.nu>
+# Maintainer (Hyperbola): André Silva <emulatorman@parabola.nu>
 
 pkgbase=xarchiver
 pkgname=(xarchiver xarchiver-gtk2)
-pkgver=0.5.4.10
+pkgver=0.5.4.11
+_gitrev=79a73d46b782cf8bb93d058d00d2cb81a9b3df8a
 pkgrel=1.parabola1
 pkgdesc="GTK+ frontend to various command line archivers, without nonfree unrar support"
 arch=('i686' 'x86_64' 'armv7h')
@@ -18,32 +20,32 @@ optdepends=('zip: ZIP support'
             'unzip: ZIP support'
             'p7zip: 7z support'
             'lzop: LZOP support'
-            'cpio: RPM support')
-source=($pkgbase-$pkgver.tar.gz::https://github.com/ib/xarchiver/archive/$pkgver.tar.gz
+            'cpio: RPM support'
+            'unar: RAR support')
+source=($pkgbase-$pkgver.tar.gz::https://github.com/ib/xarchiver/archive/$_gitrev.tar.gz
         libre.patch)
-sha256sums=('bb452d8ef4eabb52ab1313b3867156ea5030b75f9e59c59c7ef487c8db9dbea4'
-            '07a7cad5f896f37d5b1120e429a7b6fd4acd9fa006d35cd705228b98bc45ddb8')
+sha256sums=('2dabd6f5d96c5d886d9a5ed7d299cfc43d1fef88be37d1d298a78c4c01a63b45'
+            'a0ca78f2e7c6a95cc09e7a3483aed1923850e219316b123bb80f33a63d274386')
 
 prepare() {
-  cd $pkgbase-$pkgver
+  cd $pkgbase-$_gitrev
 
   # Remove nonfree unRAR support
   patch -p1 -i ../libre.patch
-  rm -v src/rar.{c,h}
 
   ./autogen.sh
 }
 
 build() {
   # GTK+ 3 version
-  [ -d gtk3 ] || cp -r $pkgbase-$pkgver gtk3
+  [ -d gtk3 ] || cp -r $pkgbase-$_gitrev gtk3
   cd gtk3
   ./configure --prefix=/usr --libexecdir=/usr/lib/xfce4
   make -j1
 
   cd "$srcdir"
   # GTK+ 2 version
-  [ -d gtk2 ] || cp -r $pkgbase-$pkgver gtk2
+  [ -d gtk2 ] || cp -r $pkgbase-$_gitrev gtk2
   cd gtk2
   ./configure --prefix=/usr --libexecdir=/usr/lib/xfce4 --enable-gtk2
   make -j1
diff --git a/libre/xarchiver/libre.patch b/libre/xarchiver/libre.patch
index bc1275f0d..c4be62bfc 100644
--- a/libre/xarchiver/libre.patch
+++ b/libre/xarchiver/libre.patch
@@ -1,367 +1,53 @@
---- xarchiver-0.5.4.10.orig/doc/html/ch01s01.html	2017-05-12 04:02:48.000000000 -0500
-+++ xarchiver-0.5.4.10/doc/html/ch01s01.html	2017-06-27 10:39:13.216633333 -0500
-@@ -29,19 +29,19 @@
- 						</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: 7z, arj, bzip2, gzip, lha, lzma, lzop, rar, tar, xz, zip, tar.bz2, tar.gz, tar.lzma, tar.lzop, tar.xz, deb and rpm packages (open and extract only)
-+							All common formats are supported: 7z, arj, bzip2, gzip, lha, lzma, lzop, tar, xz, zip, tar.bz2, tar.gz, tar.lzma, tar.lzop, tar.xz, 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
-+							Zip, arj and 7z password encrypted archives are fully 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
---- xarchiver-0.5.4.10.orig/doc/html/ch03s03.html	2017-05-12 04:02:48.000000000 -0500
-+++ xarchiver-0.5.4.10/doc/html/ch03s03.html	2017-06-27 10:44:30.281933024 -0500
+--- xarchiver-0.5.4.11.orig/doc/html/ch03s03.html	2017-06-29 04:31:35.000000000 -0500
++++ xarchiver-0.5.4.11/doc/html/ch03s03.html	2017-07-01 17:29:41.106032619 -0500
 @@ -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.
+ <!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.79.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 front end (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,rar,zip etc) and the script <span class="emphasis"><em>xdg-open</em></span> for handling different file types. Since Xarchiver is a front end (a graphic user interface to the command line executables) it can't create archives whose archiver is not available. For instance if you have unar, Xarchiver can't create rar archives since unar allows rar archives to be opened, tested and extracted but not to be created.
  				</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>
---- xarchiver-0.5.4.10.orig/doc/html/ch04s02.html	2017-05-12 04:02:48.000000000 -0500
-+++ xarchiver-0.5.4.10/doc/html/ch04s02.html	2017-06-27 10:49:37.077708847 -0500
-@@ -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 hay ningún carácter de nueva línea al final del fichero
---- xarchiver-0.5.4.10.orig/doc/html/ch04s06.html	2017-05-12 04:02:48.000000000 -0500
-+++ xarchiver-0.5.4.10/doc/html/ch04s06.html	2017-06-27 10:51:26.282645706 -0500
-@@ -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 hay ningún carácter de nueva línea al final del fichero
---- xarchiver-0.5.4.10.orig/doc/xarchiver.docbook	2017-05-12 04:02:48.000000000 -0500
-+++ xarchiver-0.5.4.10/doc/xarchiver.docbook	2017-06-27 10:58:13.189872100 -0500
-@@ -99,7 +99,7 @@
- 					</listitem>
- 					<listitem>
- 						<para>
--							ARJ, RAR and ZIP archive comment are supported
-+							ARJ and ZIP archive comment are supported
- 						</para>
- 					</listitem>
- 					<listitem>
-@@ -109,7 +109,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>
-@@ -119,7 +119,7 @@
- 					</listitem>
- 					<listitem>
- 						<para>
--							All common formats are supported: 7z, arj, bzip2, gzip, lha, lzma, lzop, rar, tar, xz, zip, tar.bz2, tar.gz, tar.lzma, tar.lzop, tar.xz, deb and rpm packages (open and extract only)
-+							All common formats are supported: 7z, arj, bzip2, gzip, lha, lzma, lzop, tar, xz, zip, tar.bz2, tar.gz, tar.lzma, tar.lzop, tar.xz, deb and rpm packages (open and extract only)
- 						</para>
- 					</listitem>
- 					<listitem>
-@@ -129,7 +129,7 @@
- 					</listitem>
- 					<listitem>
- 						<para>
--							Zip, rar, arj and 7z password encrypted archives are fully supported
-+							Zip, arj and 7z password encrypted archives are fully supported
- 						</para>
- 					</listitem>
- 				</itemizedlist>
-@@ -279,7 +279,7 @@
+--- xarchiver-0.5.4.11.orig/doc/xarchiver.docbook	2017-06-29 04:31:35.000000000 -0500
++++ xarchiver-0.5.4.11/doc/xarchiver.docbook	2017-07-01 17:30:53.425963956 -0500
+@@ -287,7 +287,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.
+-					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 front end (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,rar,zip etc) and the script <emphasis>xdg-open</emphasis> for handling different file types. Since &app; is a front end (a graphic user interface to the command line executables) it can't create archives whose archiver is not available. For instance if you have unar, &app; can't create rar archives since unar allows rar archives to be opened, tested and extracted but not to be created.
  				</para>
  			</section>
  			<section id="how_it_works">
-@@ -505,7 +505,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>
-@@ -526,7 +526,7 @@
- 		</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>
---- xarchiver-0.5.4.10.orig/po/POTFILES.in	2017-05-12 04:02:48.000000000 -0500
-+++ xarchiver-0.5.4.10/po/POTFILES.in	2017-06-27 10:59:22.449994281 -0500
-@@ -11,7 +11,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.10.orig/src/Makefile.am	2017-05-12 04:02:48.000000000 -0500
-+++ xarchiver-0.5.4.10/src/Makefile.am	2017-06-27 11:00:34.373326318 -0500
-@@ -31,8 +31,6 @@
- 	open-with-dlg.h \
- 	pref_dialog.c \
- 	pref_dialog.h \
--	rar.c \
--	rar.h \
- 	rpm.c \
- 	rpm.h \
- 	socket.c \
---- xarchiver-0.5.4.10.orig/src/Makefile.in	2017-05-12 04:02:48.000000000 -0500
-+++ xarchiver-0.5.4.10/src/Makefile.in	2017-06-27 11:03:35.961573888 -0500
-@@ -111,7 +111,7 @@
- 	extract_dialog.h gzip_et_al.c gzip_et_al.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 @@
- 	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) \
-@@ -405,7 +405,7 @@
- 	extract_dialog.h gzip_et_al.c gzip_et_al.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)
-@@ -523,7 +523,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@
-@@ -750,20 +749,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.10.orig/src/add_dialog.c	2017-05-12 04:02:48.000000000 -0500
-+++ xarchiver-0.5.4.10/src/add_dialog.c	2017-06-27 15:58:00.963517272 -0500
-@@ -282,12 +282,6 @@
- 			default_value = 6;
- 			max_value = 9;
- 		}
--		else if (archive->type == XARCHIVETYPE_RAR)
--		{
--			compression_msg = _("0 = no compression, 3 is default, 5 = best compression but slowest");
--			default_value = 3;
--			max_value = 5;
--		}
- 		else if (archive->type == XARCHIVETYPE_ARJ)
- 		{
- 			compression_msg = _("0 = no compression, 1 is default, 4 = fastest but least compression");
---- xarchiver-0.5.4.10.orig/src/main.c	2017-05-12 04:02:48.000000000 -0500
-+++ xarchiver-0.5.4.10/src/main.c	2017-06-27 11:38:50.760190740 -0500
-@@ -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"
-@@ -273,36 +272,6 @@
- 		add[type] = xa_gzip_et_al_add;
- 	}
+--- xarchiver-0.5.4.11.orig/src/main.c	2017-06-29 04:31:35.000000000 -0500
++++ xarchiver-0.5.4.11/src/main.c	2017-07-01 17:31:29.104285615 -0500
+@@ -544,8 +544,6 @@
  
--	/* RAR */
--
--	type = XARCHIVETYPE_RAR;
--	path = g_find_program_in_path("rar");
--
--	if (path)
--		archiver[type].is_compressor = TRUE;
+ 	if (path)
+ 		archiver[type].is_compressor = TRUE;
 -	else
 -		path = g_find_program_in_path("unrar");
--
--	if (path)
--	{
--		archiver[type].program[0] = path;
--		archiver[type].type = g_slist_append(archiver[type].type, "rar");
--		archiver[type].glob = g_slist_append(archiver[type].glob, "*.rar");
--
--		if (xa_rar_check_version(path) == 5)
--		{
--			archiver[type].type = g_slist_append(archiver[type].type, "rar5");
--			archiver[type].glob = g_slist_append(archiver[type].glob, " .rar");
--		}
--
--		ask[type] = xa_rar_ask;
--		list[type] = xa_rar_list;
--		test[type] = xa_rar_test;
--		extract[type] = xa_rar_extract;
--		add[type] = xa_rar_add;
--		delete[type] = xa_rar_delete;
--	}
--
- 	/* RPM package */
  
- 	type = XARCHIVETYPE_RPM;
---- xarchiver-0.5.4.10.orig/src/mime.c	2017-05-12 04:02:48.000000000 -0500
-+++ xarchiver-0.5.4.10/src/mime.c	2017-06-27 15:55:18.151272132 -0500
-@@ -83,7 +83,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.10.orig/src/window.c	2017-05-12 04:02:48.000000000 -0500
-+++ xarchiver-0.5.4.10/src/window.c	2017-06-27 16:03:03.542438561 -0500
-@@ -435,9 +435,6 @@
- {
- 	GSList *list = archiver[archive->type].type;
+ 	standard = (path != NULL);
  
--	if (archive->type == XARCHIVETYPE_RAR && archive->version == 5)
--		list = list->next;
--
- 	return list->data;
- }
+--- xarchiver-0.5.4.11.orig/src/rar.c	2017-06-29 04:31:35.000000000 -0500
++++ xarchiver-0.5.4.11/src/rar.c	2017-07-01 17:32:00.799461311 -0500
+@@ -35,8 +35,7 @@
  
-@@ -617,10 +614,6 @@
- 		command = g_strconcat ("arj c ",archive[idx]->path[1]," -z",tmp,NULL);
- 		break;
+ 	g_spawn_command_line_sync(path, &output, NULL, NULL, NULL);
  
--		case XARCHIVETYPE_RAR:
--		command = g_strconcat ("rar c ",archive[idx]->path[1]," -z",tmp,NULL);
--		break;
--
- 		case XARCHIVETYPE_ZIP:
- 		command = g_strconcat ("sh -c \"zip ",archive[idx]->path[1]," -z <",tmp,"\"",NULL);
- 		break;
-@@ -1054,7 +1047,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)
-@@ -1422,12 +1415,6 @@
-     archive[idx]->status = XARCHIVESTATUS_SFX;
-     switch ( archive[idx]->type)
- 	{
--		case XARCHIVETYPE_RAR:
--			command = g_strconcat ("rar s -o+ ",archive[idx]->path[1],NULL);
--			xa_run_command(archive[idx], command);
--			g_free(command);
--		break;
--
- 	    case XARCHIVETYPE_ZIP:
- 		{
- 			gchar *archive_name = NULL;
-@@ -1640,7 +1627,7 @@
-         "LZOP support:",
-         "Kevin Day",
-         "",
--        "RARv5, XZ, TAR.XZ support:",
-+        "XZ, TAR.XZ support:",
-         "Frederick GUERIN <fguerin01@gmail.com>",
-         "",
-         "GTK+ 3 port:",
-@@ -1733,9 +1720,6 @@
- 		type = XARCHIVETYPE_LZMA;
- 	else if (memcmp(magic, "\211LZO", 4) == 0)
- 		type = XARCHIVETYPE_LZOP;
--	else if (memcmp(magic, "\x52\x61\x72\x21\x1a\x07\x00", 7) == 0 ||
--	         memcmp(magic, "\x52\x61\x72\x21\x1a\x07\x01", 7) == 0)
--		type = XARCHIVETYPE_RAR;
- 	else if (memcmp(magic, "\xed\xab\xee\xdb", 4) == 0)
- 		type = XARCHIVETYPE_RPM;
- 	else if (isTar(file))
-@@ -1945,7 +1929,6 @@
- 		case XARCHIVETYPE_LZMA:
- 		case XARCHIVETYPE_LZOP:
- 		case XARCHIVETYPE_XZ:
--		case XARCHIVETYPE_RAR:
- 		case XARCHIVETYPE_ARJ:
- 		case XARCHIVETYPE_7ZIP:
- 		pos = 2;
-@@ -2010,7 +1993,6 @@
- 		case XARCHIVETYPE_LZMA:
- 		case XARCHIVETYPE_LZOP:
- 		case XARCHIVETYPE_XZ:
--		case XARCHIVETYPE_RAR:
- 		case XARCHIVETYPE_ARJ:
- 		case XARCHIVETYPE_7ZIP:
- 		pos = 2;
---- xarchiver-0.5.4.10.orig/src/archive.h	2017-05-12 04:02:48.000000000 -0500
-+++ xarchiver-0.5.4.10/src/archive.h	2017-06-27 16:16:00.555428893 -0500
-@@ -31,7 +31,6 @@
- 	XARCHIVETYPE_LHA,
- 	XARCHIVETYPE_LZMA,
- 	XARCHIVETYPE_LZOP,
--	XARCHIVETYPE_RAR,
- 	XARCHIVETYPE_RPM,
- 	XARCHIVETYPE_TAR,
- 	XARCHIVETYPE_TAR_BZ2,
---- xarchiver-0.5.4.10.orig/xarchiver.desktop.in	2017-05-12 04:02:48.000000000 -0500
-+++ xarchiver-0.5.4.10/xarchiver.desktop.in	2017-06-27 11:27:06.046197197 -0500
-@@ -9,4 +9,4 @@
- Terminal=false
- Categories=GTK;Archiving;Utility;
+-	if (g_ascii_strncasecmp("\nRAR 5", output, 6) == 0 ||
+-	    g_ascii_strncasecmp("\nUNRAR 5", output, 8) == 0)
++	if (g_ascii_strncasecmp("\nRAR 5", output, 6) == 0)
+ 		rar_version = 5;
+ 
+ 	g_free(output);
+--- xarchiver-0.5.4.11.orig/xarchiver.desktop.in	2017-06-29 04:31:35.000000000 -0500
++++ xarchiver-0.5.4.11/xarchiver.desktop.in	2017-07-01 17:32:41.894194844 -0500
+@@ -9,5 +9,5 @@
  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;
+ Terminal=false
+ Categories=GTK;Archiving;Compression;Utility;
+-_Keywords=GTK;archiver;archiving;compression;front end;frontend;7-zip;7z;7za;7zip;7zr;ar;arj;bunzip2;bz2;bzip2;compress;cpio;deb;gtar;gunzip;gz;gzip;jar;lha;lsar;lz;lz4;lzh;lzip;lzma;lzo;lzop;rar;rar4;rar5;rpm;tar;unar;unarchiver;unarj;unrar;unzip;xz;zip;
++_Keywords=GTK;archiver;archiving;compression;front end;frontend;7-zip;7z;7za;7zip;7zr;ar;arj;bunzip2;bz2;bzip2;compress;cpio;deb;gtar;gunzip;gz;gzip;jar;lha;lsar;lz;lz4;lzh;lzip;lzma;lzo;lzop;rar;rar4;rar5;rpm;tar;unar;unarchiver;unarj;unzip;xz;zip;
+ MimeType=application/gzip;application/vnd.debian.binary-package;application/vnd.rar;application/x-7z-compressed;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-cpio-compressed;application/x-java-archive;application/x-lha;application/x-lz4;application/x-lz4-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;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-tarz;application/x-tzo;application/x-xz;application/x-xz-compressed-tar;application/zip;