Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre

3 files changed, 23 insertions, 64 deletions

diff --git a/libre/spacefm/PKGBUILD b/libre/spacefm/PKGBUILD
index 31015bd9c..f7bd4207c 100644
--- a/libre/spacefm/PKGBUILD
+++ b/libre/spacefm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 120827 2014-10-16 15:48:31Z bpiotrowski $
+# $Id: PKGBUILD 133107 2015-05-09 18:23:35Z arojas $
 # Maintainer (Arch):  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor (Arch): IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/
 # Contributor (Arch): ridikulus_rat <the.ridikulus.rat@gmail.com>
@@ -6,38 +6,31 @@
 # Contributor: Edison Ibañez <arkhan.xxx@gmail.com>
 
 pkgname=spacefm
-pkgver=0.9.4
-pkgrel=3.parabola1
+pkgver=1.0.1
+pkgrel=1.parabola1
 pkgdesc='Multi-panel tabbed file manager, with unar support'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://ignorantguru.github.com/spacefm/'
 license=('GPL3')
 install=$pkgname.install
-depends=('gtk2' 'shared-mime-info' 'desktop-file-utils' 'startup-notification'
-         'systemd' 'bash' 'unar')
+depends=('gtk3' 'desktop-file-utils' 'startup-notification' 'ffmpegthumbnailer' 'unar')
 makedepends=('intltool' 'gettext')
 optdepends=('lsof: device processes'
             'wget: plugin download'
             'gksu: perform as root functionality'
             'udevil: mount as non-root user and mount networks'
-            'udisks: mount as non-root user'
             'udisks2: mount as non-root user')
 replaces=(${pkgname}-libre)
 conflicts=(${pkgname}-libre)
-source=(https://github.com/IgnorantGuru/spacefm/archive/$pkgver.tar.gz
-        spacefm-0.9.4-glib-2.41.patch
+source=($pkgname-$pkgver.tar.gz::https://github.com/IgnorantGuru/spacefm/archive/$pkgver.tar.gz
         libre.patch)
-md5sums=('daeee7dcccea33d6258a0a9d783470c4'
-         '1ec85afcb4fc881a8e876b3cf60c7028'
-         '30ba2b4b8f5ae7bf1552689b192eab89')
+md5sums=('3665b0cf08dcbebefcc832afc19d613e'
+         '66cc35023050ff6664bf14b1073700e2')
 
 prepare() {
   cd $pkgname-$pkgver
   # replace nonfree unrar with unar support
-  patch -Np1 -i $srcdir/libre.patch src/ptk/ptk-file-archiver.c
-
-  # fix freezes with glib 2.41
-  patch -p1 -i ../spacefm-0.9.4-glib-2.41.patch
+  patch -Np1 -i $srcdir/libre.patch
 }
 
 build() {
diff --git a/libre/spacefm/libre.patch b/libre/spacefm/libre.patch
index 82d51f705..d27b1b850 100644
--- a/libre/spacefm/libre.patch
+++ b/libre/spacefm/libre.patch
@@ -1,24 +1,15 @@
-From 4605df33f85e5dbd4cc0238b9d289ff73601d898 Mon Sep 17 00:00:00 2001
-From: Edison Ibañez <arkhan.xxx@gmail.com>
-Date: mar, 20 may 2014 10:27:55 -0500
-Subject: [PATCH] replace nonfree unrar with unar support
-
-
-diff --git a/src/ptk/ptk-file-archiver.c b/src/ptk/ptk-file-archiver.c
-index ec9fbd7..55648d2 100644
---- a/src/ptk/ptk-file-archiver.c
-+++ b/src/ptk/ptk-file-archiver.c
-@@ -80,8 +80,8 @@ const ArchiveHandler handlers[]=
-         {
-             "application/x-rar",
-             "rar a -r %o",
--            "unrar -o- x",
--            "unrar lt",
-+            "unar -D ",
-+            "unar -D ",
-             ".rar", "arc_rar", TRUE
-         },
-         {
---
-Gitg
-
+diff -Nur spacefm-1.0.1.orig/src/ptk/ptk-handler.c spacefm-1.0.1/src/ptk/ptk-handler.c
+--- spacefm-1.0.1.orig/src/ptk/ptk-handler.c	2015-05-04 09:33:53.000000000 -0300
++++ spacefm-1.0.1/src/ptk/ptk-handler.c	2015-05-11 19:11:14.248923712 -0300
+@@ -173,9 +173,9 @@
+         "*.rar *.RAR",
+         "rar a -r %o %N",
+         TRUE,
+-        "unrar -o- x %x",
++        "unar -D %x",
+         TRUE,
+-        "unrar lt %x",
++        "unar -D %x",
+         TRUE
+     },
+     {
diff --git a/libre/spacefm/spacefm-0.9.4-glib-2.41.patch b/libre/spacefm/spacefm-0.9.4-glib-2.41.patch
deleted file mode 100644
index 5795c77a8..000000000
--- a/libre/spacefm/spacefm-0.9.4-glib-2.41.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/src/main.c b/src/main.c
-index a7307fb..af5dc5a 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -1349,7 +1349,9 @@ int main ( int argc, char *argv[] )
-                 vfs_file_monitor_clean();
-                 return ret == -1 ? 0 : ret;
-             }
-+            GDK_THREADS_ENTER();
-             gtk_main();
-+            GDK_THREADS_LEAVE();
-             vfs_file_monitor_clean();
-             return 0;
-         }
-@@ -1509,8 +1511,10 @@ int main ( int argc, char *argv[] )
-     run = handle_parsed_commandline_args();
-     app_settings.load_saved_tabs = TRUE;
- 
-+    GDK_THREADS_ENTER();
-     if( run )   /* run the main loop */
-         gtk_main();
-+    GDK_THREADS_LEAVE();
- 
-     main_window_event( NULL, NULL, "evt_exit", 0, 0, NULL, 0, 0, 0, FALSE );
-