[arch-commits] Commit in thunar/repos (12 files)
Evangelos Foutras
foutrelis at archlinux.org
Wed Dec 5 19:01:30 UTC 2012
Date: Wednesday, December 5, 2012 @ 14:01:30
Author: foutrelis
Revision: 172779
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
thunar/repos/extra-i686/PKGBUILD
(from rev 172778, thunar/trunk/PKGBUILD)
thunar/repos/extra-i686/thunar-1.6.0-show-nodisplay-true-applications.patch
(from rev 172778, thunar/trunk/thunar-1.6.0-show-nodisplay-true-applications.patch)
thunar/repos/extra-i686/thunar.install
(from rev 172778, thunar/trunk/thunar.install)
thunar/repos/extra-x86_64/PKGBUILD
(from rev 172778, thunar/trunk/PKGBUILD)
thunar/repos/extra-x86_64/thunar-1.6.0-show-nodisplay-true-applications.patch
(from rev 172778, thunar/trunk/thunar-1.6.0-show-nodisplay-true-applications.patch)
thunar/repos/extra-x86_64/thunar.install
(from rev 172778, thunar/trunk/thunar.install)
Deleted:
thunar/repos/extra-i686/PKGBUILD
thunar/repos/extra-i686/thunar-1.4.0-show-loop-devices-hack.patch
thunar/repos/extra-i686/thunar.install
thunar/repos/extra-x86_64/PKGBUILD
thunar/repos/extra-x86_64/thunar-1.4.0-show-loop-devices-hack.patch
thunar/repos/extra-x86_64/thunar.install
------------------------------------------------------------------+
extra-i686/PKGBUILD | 119 +++++-----
extra-i686/thunar-1.4.0-show-loop-devices-hack.patch | 15 -
extra-i686/thunar-1.6.0-show-nodisplay-true-applications.patch | 57 ++++
extra-i686/thunar.install | 28 +-
extra-x86_64/PKGBUILD | 119 +++++-----
extra-x86_64/thunar-1.4.0-show-loop-devices-hack.patch | 15 -
extra-x86_64/thunar-1.6.0-show-nodisplay-true-applications.patch | 57 ++++
extra-x86_64/thunar.install | 28 +-
8 files changed, 266 insertions(+), 172 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-12-05 19:01:04 UTC (rev 172778)
+++ extra-i686/PKGBUILD 2012-12-05 19:01:30 UTC (rev 172779)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Andrew Simmons <andrew.simmons at gmail.com>
-
-pkgname=thunar
-pkgver=1.6.0
-pkgrel=1
-pkgdesc="Modern file manager for Xfce"
-arch=('i686' 'x86_64')
-url="http://thunar.xfce.org"
-license=('GPL2' 'LGPL2.1')
-groups=('xfce4')
-depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 'libnotify' 'udev'
- 'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng')
-makedepends=('intltool' 'gtk-doc' 'xfce4-panel')
-optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems'
- 'polkit-gnome: for mounting internal partitions (needs root password)'
- 'xfce4-panel: for trash applet'
- 'tumbler: for thumbnail previews'
- 'thunar-volman: manages removable devices'
- 'thunar-archive-plugin: create and deflate archives'
- 'thunar-media-tags-plugin: view/edit id3/ogg tags')
-options=('!libtool')
-install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/1.6/Thunar-$pkgver.tar.bz2)
-sha256sums=('354897fbde4d3f089c06c38b57816f455c2907806725906426440e1084c1d63a')
-
-build() {
- cd "$srcdir/Thunar-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --disable-static \
- --enable-gio-unix \
- --enable-dbus \
- --enable-startup-notification \
- --enable-gudev \
- --enable-notifications \
- --enable-exif \
- --enable-pcre \
- --enable-gtk-doc \
- --disable-debug
- make
-}
-
-package() {
- cd "$srcdir/Thunar-$pkgver"
-
- make DESTDIR=${pkgdir} install
- sed -i 's:x-directory/gnome-default-handler;::' \
- "$pkgdir/usr/share/applications/Thunar-folder-handler.desktop"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: thunar/repos/extra-i686/PKGBUILD (from rev 172778, thunar/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-12-05 19:01:30 UTC (rev 172779)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Andrew Simmons <andrew.simmons at gmail.com>
+
+pkgname=thunar
+pkgver=1.6.0
+pkgrel=2
+pkgdesc="Modern file manager for Xfce"
+arch=('i686' 'x86_64')
+url="http://thunar.xfce.org"
+license=('GPL2' 'LGPL2.1')
+groups=('xfce4')
+depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 'libnotify'
+ 'systemd' 'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng')
+makedepends=('intltool' 'gtk-doc' 'xfce4-panel')
+optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems'
+ 'polkit-gnome: for mounting internal partitions (needs root password)'
+ 'xfce4-panel: for trash applet'
+ 'tumbler: for thumbnail previews'
+ 'thunar-volman: manages removable devices'
+ 'thunar-archive-plugin: create and deflate archives'
+ 'thunar-media-tags-plugin: view/edit id3/ogg tags')
+options=('!libtool')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/1.6/Thunar-$pkgver.tar.bz2
+ thunar-1.6.0-show-nodisplay-true-applications.patch)
+sha256sums=('354897fbde4d3f089c06c38b57816f455c2907806725906426440e1084c1d63a'
+ 'f7377aad1eb60420d0c1c878c3916913934f994df810f3a60d580fc2be3b80c0')
+
+build() {
+ cd "$srcdir/Thunar-$pkgver"
+
+ # https://bugzilla.xfce.org/show_bug.cgi?id=9595
+ patch -Np1 -i "$srcdir/thunar-1.6.0-show-nodisplay-true-applications.patch"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var \
+ --disable-static \
+ --enable-gio-unix \
+ --enable-dbus \
+ --enable-startup-notification \
+ --enable-gudev \
+ --enable-notifications \
+ --enable-exif \
+ --enable-pcre \
+ --enable-gtk-doc \
+ --disable-debug
+ make
+}
+
+package() {
+ cd "$srcdir/Thunar-$pkgver"
+
+ make DESTDIR=${pkgdir} install
+ sed -i 's:x-directory/gnome-default-handler;::' \
+ "$pkgdir/usr/share/applications/Thunar-folder-handler.desktop"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-i686/thunar-1.4.0-show-loop-devices-hack.patch
===================================================================
--- extra-i686/thunar-1.4.0-show-loop-devices-hack.patch 2012-12-05 19:01:04 UTC (rev 172778)
+++ extra-i686/thunar-1.4.0-show-loop-devices-hack.patch 2012-12-05 19:01:30 UTC (rev 172779)
@@ -1,15 +0,0 @@
-diff -upr Thunar-1.4.0.orig/thunar/thunar-gio-extensions.c Thunar-1.4.0/thunar/thunar-gio-extensions.c
---- Thunar-1.4.0.orig/thunar/thunar-gio-extensions.c 2012-05-26 07:03:39.000000000 +0300
-+++ Thunar-1.4.0/thunar/thunar-gio-extensions.c 2012-05-26 07:05:06.000000000 +0300
-@@ -550,6 +550,11 @@ thunar_g_volume_is_present (GVolume *vol
- has_media = g_drive_has_media (drive);
- g_object_unref (drive);
- }
-+ else
-+ {
-+ /* XXX: hack to show loop devices with gvfs 1.12 / udisks2 */
-+ has_media = g_volume_can_mount (volume);
-+ }
-
- mount = g_volume_get_mount (volume);
- if (mount != NULL)
Copied: thunar/repos/extra-i686/thunar-1.6.0-show-nodisplay-true-applications.patch (from rev 172778, thunar/trunk/thunar-1.6.0-show-nodisplay-true-applications.patch)
===================================================================
--- extra-i686/thunar-1.6.0-show-nodisplay-true-applications.patch (rev 0)
+++ extra-i686/thunar-1.6.0-show-nodisplay-true-applications.patch 2012-12-05 19:01:30 UTC (rev 172779)
@@ -0,0 +1,57 @@
+From 6b5c1c908b60965825407fb4557d024514a4f89a Mon Sep 17 00:00:00 2001
+From: Nick Schermer <nick at xfce.org>
+Date: Wed, 05 Dec 2012 17:34:38 +0000
+Subject: Show NoDisplay=true applications (bug #9595).
+
+See http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s05.html
+---
+diff --git a/thunar/thunar-chooser-button.c b/thunar/thunar-chooser-button.c
+index f7ae355..f2993b8 100644
+--- a/thunar/thunar-chooser-button.c
++++ b/thunar/thunar-chooser-button.c
+@@ -453,7 +453,6 @@ thunar_chooser_button_file_changed (ThunarChooserButton *chooser_button,
+ /* add all possible applications */
+ for (lp = app_infos, i = 0; lp != NULL; lp = lp->next, ++i)
+ {
+- /* skip infos that have NoDisplay or OnlyShowIn set */
+ if (thunar_g_app_info_should_show (lp->data))
+ {
+ /* insert the item into the store */
+diff --git a/thunar/thunar-gio-extensions.c b/thunar/thunar-gio-extensions.c
+index d77f72a..1b9026a 100644
+--- a/thunar/thunar-gio-extensions.c
++++ b/thunar/thunar-gio-extensions.c
+@@ -569,26 +569,17 @@ gboolean
+ thunar_g_app_info_should_show (GAppInfo *info)
+ {
+ #ifdef HAVE_GIO_UNIX
+- const gchar *filename;
+-
+ _thunar_return_val_if_fail (G_IS_APP_INFO (info), FALSE);
+
+- /* check if NoDesktop is set or OnlyShowIn is set but
+- * does not contain XFCE */
+- if (g_app_info_should_show (info))
+- return TRUE;
+-
+ if (G_IS_DESKTOP_APP_INFO (info))
+ {
+- /* show custom command from the user directory, this to not
+- * exclude custom commands */
+- filename = g_desktop_app_info_get_filename (G_DESKTOP_APP_INFO (info));
+- if (filename != NULL
+- && g_str_has_prefix (filename, g_get_user_data_dir ()))
+- return TRUE;
++ /* NoDisplay=true files should be visible in the interface,
++ * because this key is intent to hide mime-helpers from the
++ * application menu. Hidden=true is never returned by GIO. */
++ return g_desktop_app_info_get_show_in (G_DESKTOP_APP_INFO (info), NULL);
+ }
+
+- return FALSE;
++ return TRUE;
+ #else
+ /* we cannot exclude custom actions, so show everything */
+ return TRUE;
+--
+cgit v0.9.0.3
Deleted: extra-i686/thunar.install
===================================================================
--- extra-i686/thunar.install 2012-12-05 19:01:04 UTC (rev 172778)
+++ extra-i686/thunar.install 2012-12-05 19:01:30 UTC (rev 172779)
@@ -1,14 +0,0 @@
-post_install() {
- update-desktop-database -q
- 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/repos/extra-i686/thunar.install (from rev 172778, thunar/trunk/thunar.install)
===================================================================
--- extra-i686/thunar.install (rev 0)
+++ extra-i686/thunar.install 2012-12-05 19:01:30 UTC (rev 172779)
@@ -0,0 +1,14 @@
+post_install() {
+ update-desktop-database -q
+ 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:
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-12-05 19:01:04 UTC (rev 172778)
+++ extra-x86_64/PKGBUILD 2012-12-05 19:01:30 UTC (rev 172779)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Andrew Simmons <andrew.simmons at gmail.com>
-
-pkgname=thunar
-pkgver=1.6.0
-pkgrel=1
-pkgdesc="Modern file manager for Xfce"
-arch=('i686' 'x86_64')
-url="http://thunar.xfce.org"
-license=('GPL2' 'LGPL2.1')
-groups=('xfce4')
-depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 'libnotify' 'udev'
- 'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng')
-makedepends=('intltool' 'gtk-doc' 'xfce4-panel')
-optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems'
- 'polkit-gnome: for mounting internal partitions (needs root password)'
- 'xfce4-panel: for trash applet'
- 'tumbler: for thumbnail previews'
- 'thunar-volman: manages removable devices'
- 'thunar-archive-plugin: create and deflate archives'
- 'thunar-media-tags-plugin: view/edit id3/ogg tags')
-options=('!libtool')
-install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/1.6/Thunar-$pkgver.tar.bz2)
-sha256sums=('354897fbde4d3f089c06c38b57816f455c2907806725906426440e1084c1d63a')
-
-build() {
- cd "$srcdir/Thunar-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --disable-static \
- --enable-gio-unix \
- --enable-dbus \
- --enable-startup-notification \
- --enable-gudev \
- --enable-notifications \
- --enable-exif \
- --enable-pcre \
- --enable-gtk-doc \
- --disable-debug
- make
-}
-
-package() {
- cd "$srcdir/Thunar-$pkgver"
-
- make DESTDIR=${pkgdir} install
- sed -i 's:x-directory/gnome-default-handler;::' \
- "$pkgdir/usr/share/applications/Thunar-folder-handler.desktop"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: thunar/repos/extra-x86_64/PKGBUILD (from rev 172778, thunar/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-12-05 19:01:30 UTC (rev 172779)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Andrew Simmons <andrew.simmons at gmail.com>
+
+pkgname=thunar
+pkgver=1.6.0
+pkgrel=2
+pkgdesc="Modern file manager for Xfce"
+arch=('i686' 'x86_64')
+url="http://thunar.xfce.org"
+license=('GPL2' 'LGPL2.1')
+groups=('xfce4')
+depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 'libnotify'
+ 'systemd' 'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng')
+makedepends=('intltool' 'gtk-doc' 'xfce4-panel')
+optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems'
+ 'polkit-gnome: for mounting internal partitions (needs root password)'
+ 'xfce4-panel: for trash applet'
+ 'tumbler: for thumbnail previews'
+ 'thunar-volman: manages removable devices'
+ 'thunar-archive-plugin: create and deflate archives'
+ 'thunar-media-tags-plugin: view/edit id3/ogg tags')
+options=('!libtool')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/1.6/Thunar-$pkgver.tar.bz2
+ thunar-1.6.0-show-nodisplay-true-applications.patch)
+sha256sums=('354897fbde4d3f089c06c38b57816f455c2907806725906426440e1084c1d63a'
+ 'f7377aad1eb60420d0c1c878c3916913934f994df810f3a60d580fc2be3b80c0')
+
+build() {
+ cd "$srcdir/Thunar-$pkgver"
+
+ # https://bugzilla.xfce.org/show_bug.cgi?id=9595
+ patch -Np1 -i "$srcdir/thunar-1.6.0-show-nodisplay-true-applications.patch"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var \
+ --disable-static \
+ --enable-gio-unix \
+ --enable-dbus \
+ --enable-startup-notification \
+ --enable-gudev \
+ --enable-notifications \
+ --enable-exif \
+ --enable-pcre \
+ --enable-gtk-doc \
+ --disable-debug
+ make
+}
+
+package() {
+ cd "$srcdir/Thunar-$pkgver"
+
+ make DESTDIR=${pkgdir} install
+ sed -i 's:x-directory/gnome-default-handler;::' \
+ "$pkgdir/usr/share/applications/Thunar-folder-handler.desktop"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-x86_64/thunar-1.4.0-show-loop-devices-hack.patch
===================================================================
--- extra-x86_64/thunar-1.4.0-show-loop-devices-hack.patch 2012-12-05 19:01:04 UTC (rev 172778)
+++ extra-x86_64/thunar-1.4.0-show-loop-devices-hack.patch 2012-12-05 19:01:30 UTC (rev 172779)
@@ -1,15 +0,0 @@
-diff -upr Thunar-1.4.0.orig/thunar/thunar-gio-extensions.c Thunar-1.4.0/thunar/thunar-gio-extensions.c
---- Thunar-1.4.0.orig/thunar/thunar-gio-extensions.c 2012-05-26 07:03:39.000000000 +0300
-+++ Thunar-1.4.0/thunar/thunar-gio-extensions.c 2012-05-26 07:05:06.000000000 +0300
-@@ -550,6 +550,11 @@ thunar_g_volume_is_present (GVolume *vol
- has_media = g_drive_has_media (drive);
- g_object_unref (drive);
- }
-+ else
-+ {
-+ /* XXX: hack to show loop devices with gvfs 1.12 / udisks2 */
-+ has_media = g_volume_can_mount (volume);
-+ }
-
- mount = g_volume_get_mount (volume);
- if (mount != NULL)
Copied: thunar/repos/extra-x86_64/thunar-1.6.0-show-nodisplay-true-applications.patch (from rev 172778, thunar/trunk/thunar-1.6.0-show-nodisplay-true-applications.patch)
===================================================================
--- extra-x86_64/thunar-1.6.0-show-nodisplay-true-applications.patch (rev 0)
+++ extra-x86_64/thunar-1.6.0-show-nodisplay-true-applications.patch 2012-12-05 19:01:30 UTC (rev 172779)
@@ -0,0 +1,57 @@
+From 6b5c1c908b60965825407fb4557d024514a4f89a Mon Sep 17 00:00:00 2001
+From: Nick Schermer <nick at xfce.org>
+Date: Wed, 05 Dec 2012 17:34:38 +0000
+Subject: Show NoDisplay=true applications (bug #9595).
+
+See http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s05.html
+---
+diff --git a/thunar/thunar-chooser-button.c b/thunar/thunar-chooser-button.c
+index f7ae355..f2993b8 100644
+--- a/thunar/thunar-chooser-button.c
++++ b/thunar/thunar-chooser-button.c
+@@ -453,7 +453,6 @@ thunar_chooser_button_file_changed (ThunarChooserButton *chooser_button,
+ /* add all possible applications */
+ for (lp = app_infos, i = 0; lp != NULL; lp = lp->next, ++i)
+ {
+- /* skip infos that have NoDisplay or OnlyShowIn set */
+ if (thunar_g_app_info_should_show (lp->data))
+ {
+ /* insert the item into the store */
+diff --git a/thunar/thunar-gio-extensions.c b/thunar/thunar-gio-extensions.c
+index d77f72a..1b9026a 100644
+--- a/thunar/thunar-gio-extensions.c
++++ b/thunar/thunar-gio-extensions.c
+@@ -569,26 +569,17 @@ gboolean
+ thunar_g_app_info_should_show (GAppInfo *info)
+ {
+ #ifdef HAVE_GIO_UNIX
+- const gchar *filename;
+-
+ _thunar_return_val_if_fail (G_IS_APP_INFO (info), FALSE);
+
+- /* check if NoDesktop is set or OnlyShowIn is set but
+- * does not contain XFCE */
+- if (g_app_info_should_show (info))
+- return TRUE;
+-
+ if (G_IS_DESKTOP_APP_INFO (info))
+ {
+- /* show custom command from the user directory, this to not
+- * exclude custom commands */
+- filename = g_desktop_app_info_get_filename (G_DESKTOP_APP_INFO (info));
+- if (filename != NULL
+- && g_str_has_prefix (filename, g_get_user_data_dir ()))
+- return TRUE;
++ /* NoDisplay=true files should be visible in the interface,
++ * because this key is intent to hide mime-helpers from the
++ * application menu. Hidden=true is never returned by GIO. */
++ return g_desktop_app_info_get_show_in (G_DESKTOP_APP_INFO (info), NULL);
+ }
+
+- return FALSE;
++ return TRUE;
+ #else
+ /* we cannot exclude custom actions, so show everything */
+ return TRUE;
+--
+cgit v0.9.0.3
Deleted: extra-x86_64/thunar.install
===================================================================
--- extra-x86_64/thunar.install 2012-12-05 19:01:04 UTC (rev 172778)
+++ extra-x86_64/thunar.install 2012-12-05 19:01:30 UTC (rev 172779)
@@ -1,14 +0,0 @@
-post_install() {
- update-desktop-database -q
- 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/repos/extra-x86_64/thunar.install (from rev 172778, thunar/trunk/thunar.install)
===================================================================
--- extra-x86_64/thunar.install (rev 0)
+++ extra-x86_64/thunar.install 2012-12-05 19:01:30 UTC (rev 172779)
@@ -0,0 +1,14 @@
+post_install() {
+ update-desktop-database -q
+ 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