upgpkg: xarchiver 0.5.4.6-1

Update to new version; use new, actively maintained fork as upstream source

1 files changed, 23 insertions, 41 deletions

diff --git a/libre/xarchiver/PKGBUILD b/libre/xarchiver/PKGBUILD
index 85ccab447..df78babe2 100644
--- a/libre/xarchiver/PKGBUILD
+++ b/libre/xarchiver/PKGBUILD
@@ -6,75 +6,57 @@
 
 pkgbase=xarchiver
 pkgname=(xarchiver xarchiver-gtk2)
-pkgver=0.5.4
-pkgrel=3.parabola1
+pkgver=0.5.4.6
+pkgrel=1.parabola1
 pkgdesc="GTK+ frontend to various command line archivers, without nonfree unrar support"
-arch=('i686' 'x86_64')
-url="http://xarchiver.sourceforge.net/"
+arch=('i686' 'x86_64' 'armv7h')
+url="https://github.com/ib/xarchiver"
 license=('GPL')
 depends=('gtk2' 'gtk3' 'desktop-file-utils')
-makedepends=('intltool')
+makedepends=('docbook-xsl' 'intltool' 'xmlto')
 optdepends=('zip: ZIP support'
             'unzip: ZIP support'
             'p7zip: 7z support'
             'lzop: LZOP support'
             'cpio: RPM support')
 install=xarchiver.install
-source=(http://downloads.sourceforge.net/xarchiver/xarchiver-$pkgver.tar.bz2
-        fix-rpm-support.patch
-        fix-password-protected.patch
-        add-mime-types.patch
-        gtk3-port.patch
-        fix-icon-names.patch
-        no-xfce.patch
+source=(https://github.com/ib/xarchiver/archive/$pkgbase-$pkgver.tar.gz
+        0001-Add-support-for-GTK-3.patch
+        0001-Fix-docbook-file.patch
         remove-nonfree-unrar-support.patch)
-md5sums=('1b4cd37a6af03afc957a8e307417e8d0'
-         '812b93339f5e3332621f3c5abebfe277'
-         '35ab96d98521a0a36f3e9e9ec0969107'
-         '0cee887b3c989ba2cdce9154813843fb'
-         '62641fc15b2536a5379a1587bc025c46'
-         'c99ff044585b98d7769063c2f8774a98'
-         'f6e7d38a998a11980b81289f54955170'
-         'fe46d0ac1e411b6b8659985769dbf13a')
+sha256sums=('5199670b435e9a25d33c6101b99f7bd64375377920d389a9a566d9ba72cc9f8b'
+            '4ac66b7e23e714ed03fe377b2f8e494c6048a7a507bbc439fe2f081ba110021a'
+            '12e4848f81d2532e93ee5bb0774334d176ad09462f07f16a0928558564fdf3a3'
+            'b210b98fe60ffc50f6feac48b565dd1faa7e0f7adf14d7d7534089c3b32c9131')
 
 prepare() {
-  cd $pkgbase-$pkgver
+  cd $pkgbase-$pkgbase-$pkgver
 
-  # Fix RPM support
-  patch -Np1 -i ../fix-rpm-support.patch
+  # Add support for GTK+ 3
+  patch -Np1 -i ../0001-Add-support-for-GTK-3.patch
 
-  # Fix segfault when handling password protected files
-  patch -Np1 -i ../fix-password-protected.patch
-
-  # Add more MIME types to the desktop file, fix exec line
-  patch -Np1 -i ../add-mime-types.patch
-
-  # Port to GTK+ 3
-  patch -Np1 -i ../gtk3-port.patch
-
-  # Use standard icon names
-  patch -Np1 -i ../fix-icon-names.patch
-
-  # Don't use xfce4-dev-tools
-  patch -Np1 -i ../no-xfce.patch
+  # Fix docbook file
+  patch -Np1 -i ../0001-Fix-docbook-file.patch
 
   # Remove nonfree unRAR support
   patch -Np1 -i ../remove-nonfree-unrar-support.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-$pkgbase-$pkgver gtk3
   cd gtk3
-  ./autogen.sh --prefix=/usr --libexecdir=/usr/lib/xfce4
+  ./configure --prefix=/usr --libexecdir=/usr/lib/xfce4
   make
 
   cd "$srcdir"
   # GTK+ 2 version
-  [ -d gtk2 ] || cp -r $pkgbase-$pkgver gtk2
+  [ -d gtk2 ] || cp -r $pkgbase-$pkgbase-$pkgver gtk2
   cd gtk2
-  ./autogen.sh --prefix=/usr --libexecdir=/usr/lib/xfce4 --disable-gtk3
+  ./configure --prefix=/usr --libexecdir=/usr/lib/xfce4 --disable-gtk3
   make
 }