[arch-commits] Commit in thunar-archive-plugin/trunk (2 files)

[Evangelos Foutras]

    Date: Wednesday, April 23, 2014 @ 19:40:58
  Author: foutrelis
Revision: 211708

upgpkg: thunar-archive-plugin 0.3.1-4

Fix file-roller>=3.12.1 detection (FS#39964).

Added:
  thunar-archive-plugin/trunk/0001-Fix-file-roller-3.12.1-detection-bug-10826.patch
Modified:
  thunar-archive-plugin/trunk/PKGBUILD

-------------------------------------------------------+
 0001-Fix-file-roller-3.12.1-detection-bug-10826.patch |   37 ++++++++++++++++
 PKGBUILD                                              |   18 ++++++-
 2 files changed, 51 insertions(+), 4 deletions(-)

Added: 0001-Fix-file-roller-3.12.1-detection-bug-10826.patch
===================================================================
--- 0001-Fix-file-roller-3.12.1-detection-bug-10826.patch	                        (rev 0)
+++ 0001-Fix-file-roller-3.12.1-detection-bug-10826.patch	2014-04-23 17:40:58 UTC (rev 211708)
@@ -0,0 +1,37 @@
+From cc1b9c86d1b563318a2b9489b062f9519ae08b20 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos at foutrelis.com>
+Date: Wed, 23 Apr 2014 20:13:19 +0300
+Subject: [PATCH] Fix file-roller>=3.12.1 detection (bug #10826)
+
+File Roller 3.12.1 changed the name of its .desktop file from
+file-roller.desktop to org.gnome.FileRoller.desktop.
+
+We install a new symlink to support the new .desktop file name.
+---
+ scripts/Makefile.am | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/scripts/Makefile.am b/scripts/Makefile.am
+index 4da529c..3804605 100644
+--- a/scripts/Makefile.am
++++ b/scripts/Makefile.am
+@@ -5,12 +5,15 @@ wrapper_SCRIPTS =							\
+ 	ark.tap								\
+ 	file-roller.tap
+ 
+-# Install symlink to 'gnome-file-roller.tap'
++# Install symlink to 'gnome-file-roller.tap' and 'org.gnome.FileRoller.tap'
+ install-exec-hook:
+ 	$(mkinstalldirs) $(DESTDIR)$(wrapperdir)
+ 	-( cd $(DESTDIR)$(wrapperdir) ; \
+ 		test -f gnome-file-roller.tap \
+ 		|| ln -sf file-roller.tap gnome-file-roller.tap )
++	-( cd $(DESTDIR)$(wrapperdir) ; \
++		test -f org.gnome.FileRoller.tap \
++		|| ln -sf file-roller.tap org.gnome.FileRoller.tap )
+ 
+ EXTRA_DIST =								\
+ 	$(wrapper_SCRIPTS)						\
+-- 
+1.9.2
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-23 17:16:21 UTC (rev 211707)
+++ PKGBUILD	2014-04-23 17:40:58 UTC (rev 211708)
@@ -4,7 +4,7 @@
 
 pkgname=thunar-archive-plugin
 pkgver=0.3.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Create and extract archives in Thunar"
 arch=('i686' 'x86_64')
 url="http://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin"
@@ -11,14 +11,24 @@
 license=('GPL2')
 groups=('xfce4-goodies')
 depends=('thunar' 'hicolor-icon-theme')
-makedepends=('intltool')
+makedepends=('intltool' 'xfce4-dev-tools')
 optdepends=('file-roller'
             'kdeutils-ark'
             'xarchiver')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/thunar-plugins/$pkgname/0.3/$pkgname-$pkgver.tar.bz2)
-sha256sums=('9ad559b0c11308f6897ad56604e5a06dc8f369f649eb20120b2d3018ef5da54c')
+source=(http://archive.xfce.org/src/thunar-plugins/$pkgname/0.3/$pkgname-$pkgver.tar.bz2
+        0001-Fix-file-roller-3.12.1-detection-bug-10826.patch)
+sha256sums=('9ad559b0c11308f6897ad56604e5a06dc8f369f649eb20120b2d3018ef5da54c'
+            '4373c3011f5abd1d4119d283e832aeb858c810f14b3a59b6250cf10893aa0757')
 
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # https://bugzilla.xfce.org/show_bug.cgi?id=10826
+  patch -Np1 -i ../0001-Fix-file-roller-3.12.1-detection-bug-10826.patch
+  NOCONFIGURE=1 xdt-autogen
+}
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"