diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-04-24 03:30:57 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-04-24 03:30:57 +0000 |
| commit | 431023a318e680258f02c1fb5fdca176c68e5cb7 (patch) | |
| tree | cedbdd37d2a93310636cf71c781041a2b5ee68a3 /extra/thunar-archive-plugin | |
| parent | 0459e6459ee534bf22ab8a5381cd485e6035e9e2 (diff) | |
Thu Apr 24 03:25:33 UTC 2014
Diffstat (limited to 'extra/thunar-archive-plugin')
| -rw-r--r-- | extra/thunar-archive-plugin/0001-Fix-file-roller-3.12.1-detection-bug-10826.patch | 37 | ||||
| -rw-r--r-- | extra/thunar-archive-plugin/PKGBUILD | 20 |
2 files changed, 52 insertions, 5 deletions
diff --git a/extra/thunar-archive-plugin/0001-Fix-file-roller-3.12.1-detection-bug-10826.patch b/extra/thunar-archive-plugin/0001-Fix-file-roller-3.12.1-detection-bug-10826.patch new file mode 100644 index 000000000..f1435cd55 --- /dev/null +++ b/extra/thunar-archive-plugin/0001-Fix-file-roller-3.12.1-detection-bug-10826.patch @@ -0,0 +1,37 @@ +From cc1b9c86d1b563318a2b9489b062f9519ae08b20 Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras <evangelos@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 + diff --git a/extra/thunar-archive-plugin/PKGBUILD b/extra/thunar-archive-plugin/PKGBUILD index 72994f9e7..c9a75c450 100644 --- a/extra/thunar-archive-plugin/PKGBUILD +++ b/extra/thunar-archive-plugin/PKGBUILD @@ -1,23 +1,33 @@ -# $Id: PKGBUILD 207512 2014-03-11 16:41:15Z foutrelis $ +# $Id: PKGBUILD 211709 2014-04-23 17:41:09Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> 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" 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" |