xarchiver-0.5.4-2.parabola2: port to GTK+ 3, keep GTK+ 2 supported

1 files changed, 50 insertions, 21 deletions

diff --git a/libre/xarchiver/PKGBUILD b/libre/xarchiver/PKGBUILD
index f5bac7d3f..2f9500912 100644
--- a/libre/xarchiver/PKGBUILD
+++ b/libre/xarchiver/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 119883 2014-09-30 14:21:21Z bgyorgy $
+# $Id: PKGBUILD 136593 2015-07-09 16:19:22Z bgyorgy $
 # 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>
 
-pkgname=xarchiver
+pkgbase=xarchiver
+pkgname=(xarchiver xarchiver-gtk2)
 pkgver=0.5.4
-pkgrel=1.parabola2
+pkgrel=2.parabola2
 pkgdesc="GTK+ frontend to various command line archivers, without nonfree unrar support"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://xarchiver.sourceforge.net/"
 license=('GPL')
-conflicts=("${pkgname}-libre")
-replaces=("${pkgname}-libre")
-depends=('gtk2' 'desktop-file-utils')
+depends=('gtk2' 'gtk3' 'desktop-file-utils')
 makedepends=('intltool')
 optdepends=('zip: ZIP support'
             'unzip: ZIP support'
@@ -26,15 +25,21 @@ 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
         remove-nonfree-unrar-support.patch)
 md5sums=('1b4cd37a6af03afc957a8e307417e8d0'
          '812b93339f5e3332621f3c5abebfe277'
          '35ab96d98521a0a36f3e9e9ec0969107'
          '0cee887b3c989ba2cdce9154813843fb'
-         'd2cf9b38b439a548553cf0f33d627bcc')
+         '62641fc15b2536a5379a1587bc025c46'
+         'c99ff044585b98d7769063c2f8774a98'
+         'f6e7d38a998a11980b81289f54955170'
+         'fe46d0ac1e411b6b8659985769dbf13a')
 
 prepare() {
-  cd $pkgname-$pkgver
+  cd $pkgbase-$pkgver
 
   # Fix RPM support
   patch -Np1 -i ../fix-rpm-support.patch
@@ -42,28 +47,52 @@ prepare() {
   # Fix segfault when handling password protected files
   patch -Np1 -i ../fix-password-protected.patch
 
-  # Add more MIME types in the desktop file
+  # 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
+
   # Remove nonfree unRAR support
   patch -Np1 -i ../remove-nonfree-unrar-support.patch
   rm -v src/rar.{c,h}
-
-  # Fix po files
-  cd po
-  for file in *.po; do
-    intltool-update ${file%.*}
-    msgattrib --no-obsolete -o $file $file
-  done
 }
 
 build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --libexecdir=/usr/lib/xfce4
+  # GTK+ 3 version
+  [ -d gtk3 ] || cp -r $pkgbase-$pkgver gtk3
+  cd gtk3
+  ./autogen.sh --prefix=/usr --libexecdir=/usr/lib/xfce4
+  make
+
+  cd "$srcdir"
+  # GTK+ 2 version
+  [ -d gtk2 ] || cp -r $pkgbase-$pkgver gtk2
+  cd gtk2
+  ./autogen.sh --prefix=/usr --libexecdir=/usr/lib/xfce4 --disable-gtk3
   make
 }
 
-package() {
-  cd $pkgname-$pkgver
+package_xarchiver() {
+  depends=('gtk3' 'desktop-file-utils')
+  conflicts=('xarchiver-libre')
+  replaces=('xarchiver-libre')
+
+  cd gtk3
+  make DESTDIR="$pkgdir" install
+}
+
+package_xarchiver-gtk2() {
+  pkgdesc+=' (GTK+ 2 version)'
+  depends=('gtk2' 'desktop-file-utils')
+  conflicts=('xarchiver')
+
+  cd gtk2
   make DESTDIR="$pkgdir" install
 }