xarchiver-libre-0.5.2-6: add some more important fixes for xarchiver

1 files changed, 78 insertions, 37 deletions

diff --git a/libre/xarchiver-libre/PKGBUILD b/libre/xarchiver-libre/PKGBUILD
index 9c0c0729c..df6bfbca6 100644
--- a/libre/xarchiver-libre/PKGBUILD
+++ b/libre/xarchiver-libre/PKGBUILD
@@ -1,64 +1,105 @@
-# $Id: PKGBUILD 154769 2012-03-30 16:45:24Z pierre $
-# Maintainer: Alexander Fehr <pizzapunk gmail com>
+# $Id: PKGBUILD 104651 2014-01-24 08:23:36Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=xarchiver
 pkgname=xarchiver-libre
 pkgver=0.5.2
-pkgrel=5.1
-pkgdesc="GTK+ frontend to various command line archivers"
-arch=('i686' 'x86_64')
-url="http://xarchiver.sourceforge.net"
+pkgrel=6
+pkgdesc="GTK+ frontend to various command line archivers, with unar support"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://xarchiver.sourceforge.net/"
 license=('GPL')
-groups=('xfce4-goodies')
-depends=('gtk2' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool')
 provides=("$_pkgname=$pkgver")
 conflicts=("$_pkgname")
-replacesk=("$_pkgname")
-optdepends=('tar: TAR support'
-            'gzip: GZIP support'
-            'bzip2: BZIP2 support'
-            'zip: ZIP support'
+replaces=("$_pkgname")
+depends=('gtk2' 'desktop-file-utils')
+makedepends=('intltool')
+optdepends=('zip: ZIP support'
             'unzip: ZIP support'
             'unar: RAR support'
             'p7zip: 7z support'
             'arj: ARJ support'
-            'lha: LHA support'
-            'xz: LZMA support'
-            'lzop: LZOP support')
-options=('!libtool')
+            'lzop: LZOP support'
+            'cpio: RPM support')
 install=xarchiver.install
 source=(http://downloads.sourceforge.net/xarchiver/xarchiver-$pkgver.tar.bz2
-        # rpm2cpio.patch by Daniel Hokka Zakrisson
-        # taken from https://bugzilla.redhat.com/show_bug.cgi?id=577480
-        # sent upstream through
-        # https://sourceforge.net/tracker/?func=detail&aid=3310768&group_id=140153&atid=745602
-        xarchiver-0.5.2-rpm2cpio.patch
-        # segfault-open-with.patch by Bastiaan Jacques
-        # taken from https://bugzilla.redhat.com/show_bug.cgi?id=690012
-        # sent upstream through
-        # https://sourceforge.net/tracker/?func=detail&aid=3310778&group_id=140153&atid=745600
+        xarchiver-0.5.2-no-donators-menu.patch
+        xarchiver-0.5.2-add_xz_support.patch
         xarchiver-0.5.2-segfault-open-with.patch
-        # fix-7z-support.patch by taken from
-        # https://sourceforge.net/tracker/?func=detail&aid=3137589&group_id=140153&atid=745602
-        xarchiver-0.5.2-fix_7z_support.patch)
+        xarchiver-0.5.2-fix_7z_support.patch
+        xarchiver-0.5.2-drag-n-drop_escaped_path.patch
+        xarchiver-0.5.2-fix-double-escaping.patch
+        xarchiver-0.5.2-fix-non-existent-archive.patch
+        xarchiver-0.5.2-segfault-delete-file.patch
+        xarchiver-0.5.2-segfault-password-protected.patch
+        xarchiver-0.5.2-add_unar_support.patch
+        xarchiver-0.5.2-add_mime_types.patch)
 md5sums=('2bc7f06403cc6582dd4a8029ec9d038d'
-         'd4a1accdbba2b50e5707097dd3548d7a'
+         '7ef9fe9aee9f0fbc141ed9683e91ea1c'
+         '5d5ef8dd1b8b7790af4ece5fcedcd370'
          'f9036a44157b318cbc59ed012b04974b'
-         '782f55c1f1021dc02c7739bf8a47336e')
+         '782f55c1f1021dc02c7739bf8a47336e'
+         'fcd9e04222c5e0ef459977bd7cd0ae4e'
+         '6178d7ab679b761469c880a8db991907'
+         '22ed2783e72684a102243c5834bf5ca3'
+         'e518b1e0bc4407383aae2783c0c19a04'
+         'c46daf2ee9fce7ece608eca33174db6b'
+         '13c133a6ba867425b9a8a13900664d18'
+         '36a4c3181230aab1e0ce1596acc5ef88')
 
-build() {
-  cd "$srcdir/xarchiver-$pkgver"
-  #patches taken from: http://pkgs.fedoraproject.org/gitweb/?p=xarchiver.git
-  patch -Np1 -i ../xarchiver-0.5.2-rpm2cpio.patch
+prepare() {
+  cd $_pkgname-$pkgver
+
+  # Fix donators menu item (upstream patch)
+  patch -Np2 -i ../xarchiver-0.5.2-no-donators-menu.patch
+
+  # Add XZ support
+  # http://sourceforge.net/p/xarchiver/bugs/28/
+  patch -Np1 -i ../xarchiver-0.5.2-add_xz_support.patch
+
+  # Fix segfault on open with dialog
+  # http://sourceforge.net/p/xarchiver/bugs/52/
   patch -Np1 -i ../xarchiver-0.5.2-segfault-open-with.patch
+
+  # Fix 7z support
+  # http://sourceforge.net/p/xarchiver/patches/5/
   patch -Np1 -i ../xarchiver-0.5.2-fix_7z_support.patch
+
+  # Fix extraction when the Drag'n'Drop target path contains spaces
+  patch -Np1 -i ../xarchiver-0.5.2-drag-n-drop_escaped_path.patch
+
+  # Fix error when trying to create archives with spaces
+  patch -Np1 -i ../xarchiver-0.5.2-fix-double-escaping.patch
+
+  # Fix segfault when non-existent archive specified
+  patch -Np1 -i ../xarchiver-0.5.2-fix-non-existent-archive.patch
+
+  # Fix segfault when deleting a file
+  patch -Np1 -i ../xarchiver-0.5.2-segfault-delete-file.patch
+
+  # Fix segfault when handling password protected files
+  patch -Np1 -i ../xarchiver-0.5.2-segfault-password-protected.patch
+
+  # Add unar support
+  patch -Np1 -i ../xarchiver-0.5.2-add_unar_support.patch
+
+  # Add more MIME types in the desktop file
+  patch -Np1 -i ../xarchiver-0.5.2-add_mime_types.patch
+
+  # Update upstream URL
+  find -type f | xargs sed -i 's|http://xarchiver.xfce.org|http://xarchiver.sf.net|'
+}
+
+build() {
+  cd $_pkgname-$pkgver
   ./configure --prefix=/usr --libexecdir=/usr/lib/xfce4
   make
 }
 
 package() {
-  cd "$srcdir/xarchiver-$pkgver"
+  cd $_pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }