[arch-commits] Commit in thunar-archive-plugin/repos (10 files)
Evangelos Foutras
foutrelis at nymeria.archlinux.org
Wed Apr 23 17:41:09 UTC 2014
Date: Wednesday, April 23, 2014 @ 19:41:09
Author: foutrelis
Revision: 211709
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
thunar-archive-plugin/repos/extra-i686/0001-Fix-file-roller-3.12.1-detection-bug-10826.patch
(from rev 211708, thunar-archive-plugin/trunk/0001-Fix-file-roller-3.12.1-detection-bug-10826.patch)
thunar-archive-plugin/repos/extra-i686/PKGBUILD
(from rev 211708, thunar-archive-plugin/trunk/PKGBUILD)
thunar-archive-plugin/repos/extra-i686/thunar-archive-plugin.install
(from rev 211708, thunar-archive-plugin/trunk/thunar-archive-plugin.install)
thunar-archive-plugin/repos/extra-x86_64/0001-Fix-file-roller-3.12.1-detection-bug-10826.patch
(from rev 211708, thunar-archive-plugin/trunk/0001-Fix-file-roller-3.12.1-detection-bug-10826.patch)
thunar-archive-plugin/repos/extra-x86_64/PKGBUILD
(from rev 211708, thunar-archive-plugin/trunk/PKGBUILD)
thunar-archive-plugin/repos/extra-x86_64/thunar-archive-plugin.install
(from rev 211708, thunar-archive-plugin/trunk/thunar-archive-plugin.install)
Deleted:
thunar-archive-plugin/repos/extra-i686/PKGBUILD
thunar-archive-plugin/repos/extra-i686/thunar-archive-plugin.install
thunar-archive-plugin/repos/extra-x86_64/PKGBUILD
thunar-archive-plugin/repos/extra-x86_64/thunar-archive-plugin.install
--------------------------------------------------------------------+
/PKGBUILD | 98 ++++++++++
/thunar-archive-plugin.install | 26 ++
extra-i686/0001-Fix-file-roller-3.12.1-detection-bug-10826.patch | 37 +++
extra-i686/PKGBUILD | 39 ---
extra-i686/thunar-archive-plugin.install | 13 -
extra-x86_64/0001-Fix-file-roller-3.12.1-detection-bug-10826.patch | 37 +++
extra-x86_64/PKGBUILD | 39 ---
extra-x86_64/thunar-archive-plugin.install | 13 -
8 files changed, 198 insertions(+), 104 deletions(-)
Copied: thunar-archive-plugin/repos/extra-i686/0001-Fix-file-roller-3.12.1-detection-bug-10826.patch (from rev 211708, thunar-archive-plugin/trunk/0001-Fix-file-roller-3.12.1-detection-bug-10826.patch)
===================================================================
--- extra-i686/0001-Fix-file-roller-3.12.1-detection-bug-10826.patch (rev 0)
+++ extra-i686/0001-Fix-file-roller-3.12.1-detection-bug-10826.patch 2014-04-23 17:41:09 UTC (rev 211709)
@@ -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
+
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-04-23 17:40:58 UTC (rev 211708)
+++ extra-i686/PKGBUILD 2014-04-23 17:41:09 UTC (rev 211709)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
-
-pkgname=thunar-archive-plugin
-pkgver=0.3.1
-pkgrel=3
-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')
-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')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/xfce4 \
- --localstatedir=/var \
- --disable-static
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: thunar-archive-plugin/repos/extra-i686/PKGBUILD (from rev 211708, thunar-archive-plugin/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-04-23 17:41:09 UTC (rev 211709)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
+
+pkgname=thunar-archive-plugin
+pkgver=0.3.1
+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' '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
+ 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"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/xfce4 \
+ --localstatedir=/var \
+ --disable-static
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-i686/thunar-archive-plugin.install
===================================================================
--- extra-i686/thunar-archive-plugin.install 2014-04-23 17:40:58 UTC (rev 211708)
+++ extra-i686/thunar-archive-plugin.install 2014-04-23 17:41:09 UTC (rev 211709)
@@ -1,13 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: thunar-archive-plugin/repos/extra-i686/thunar-archive-plugin.install (from rev 211708, thunar-archive-plugin/trunk/thunar-archive-plugin.install)
===================================================================
--- extra-i686/thunar-archive-plugin.install (rev 0)
+++ extra-i686/thunar-archive-plugin.install 2014-04-23 17:41:09 UTC (rev 211709)
@@ -0,0 +1,13 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim:set ts=2 sw=2 et:
Copied: thunar-archive-plugin/repos/extra-x86_64/0001-Fix-file-roller-3.12.1-detection-bug-10826.patch (from rev 211708, thunar-archive-plugin/trunk/0001-Fix-file-roller-3.12.1-detection-bug-10826.patch)
===================================================================
--- extra-x86_64/0001-Fix-file-roller-3.12.1-detection-bug-10826.patch (rev 0)
+++ extra-x86_64/0001-Fix-file-roller-3.12.1-detection-bug-10826.patch 2014-04-23 17:41:09 UTC (rev 211709)
@@ -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
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-04-23 17:40:58 UTC (rev 211708)
+++ extra-x86_64/PKGBUILD 2014-04-23 17:41:09 UTC (rev 211709)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
-
-pkgname=thunar-archive-plugin
-pkgver=0.3.1
-pkgrel=3
-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')
-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')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/xfce4 \
- --localstatedir=/var \
- --disable-static
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: thunar-archive-plugin/repos/extra-x86_64/PKGBUILD (from rev 211708, thunar-archive-plugin/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-04-23 17:41:09 UTC (rev 211709)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
+
+pkgname=thunar-archive-plugin
+pkgver=0.3.1
+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' '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
+ 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"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/xfce4 \
+ --localstatedir=/var \
+ --disable-static
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-x86_64/thunar-archive-plugin.install
===================================================================
--- extra-x86_64/thunar-archive-plugin.install 2014-04-23 17:40:58 UTC (rev 211708)
+++ extra-x86_64/thunar-archive-plugin.install 2014-04-23 17:41:09 UTC (rev 211709)
@@ -1,13 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: thunar-archive-plugin/repos/extra-x86_64/thunar-archive-plugin.install (from rev 211708, thunar-archive-plugin/trunk/thunar-archive-plugin.install)
===================================================================
--- extra-x86_64/thunar-archive-plugin.install (rev 0)
+++ extra-x86_64/thunar-archive-plugin.install 2014-04-23 17:41:09 UTC (rev 211709)
@@ -0,0 +1,13 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list