Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/znc/PKGBUILD
	extra/hugin/PKGBUILD
	extra/kdeplasma-addons/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/talloc/PKGBUILD

2 files changed, 68 insertions, 6 deletions

diff --git a/extra/thunar/PKGBUILD b/extra/thunar/PKGBUILD
index f7ac04f41..f39013e11 100644
--- a/extra/thunar/PKGBUILD
+++ b/extra/thunar/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 172467 2012-12-03 11:50:24Z foutrelis $
+# $Id: PKGBUILD 172898 2012-12-06 12:48:55Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 
 pkgname=thunar
 pkgver=1.6.0
-pkgrel=1
+pkgrel=3
 pkgdesc="Modern file manager for Xfce"
 arch=('i686' 'x86_64' 'mips64el')
 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')
+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)'
@@ -22,12 +22,17 @@ optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems
             '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')
+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 \
diff --git a/extra/thunar/thunar-1.6.0-show-nodisplay-true-applications.patch b/extra/thunar/thunar-1.6.0-show-nodisplay-true-applications.patch
new file mode 100644
index 000000000..d054180b5
--- /dev/null
+++ b/extra/thunar/thunar-1.6.0-show-nodisplay-true-applications.patch
@@ -0,0 +1,57 @@
+From 6b5c1c908b60965825407fb4557d024514a4f89a Mon Sep 17 00:00:00 2001
+From: Nick Schermer <nick@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