[arch-commits] Commit in thunar/repos (10 files)
Evangelos Foutras
foutrelis at archlinux.org
Fri Oct 3 04:33:09 UTC 2014
Date: Friday, October 3, 2014 @ 06:33:09
Author: foutrelis
Revision: 223794
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
thunar/repos/extra-i686/0001-Fix-Open-With-default-app-with-glib-2.41.patch
(from rev 223793, thunar/trunk/0001-Fix-Open-With-default-app-with-glib-2.41.patch)
thunar/repos/extra-i686/PKGBUILD
(from rev 223793, thunar/trunk/PKGBUILD)
thunar/repos/extra-i686/thunar.install
(from rev 223793, thunar/trunk/thunar.install)
thunar/repos/extra-x86_64/0001-Fix-Open-With-default-app-with-glib-2.41.patch
(from rev 223793, thunar/trunk/0001-Fix-Open-With-default-app-with-glib-2.41.patch)
thunar/repos/extra-x86_64/PKGBUILD
(from rev 223793, thunar/trunk/PKGBUILD)
thunar/repos/extra-x86_64/thunar.install
(from rev 223793, thunar/trunk/thunar.install)
Deleted:
thunar/repos/extra-i686/PKGBUILD
thunar/repos/extra-i686/thunar.install
thunar/repos/extra-x86_64/PKGBUILD
thunar/repos/extra-x86_64/thunar.install
------------------------------------------------------------------+
/PKGBUILD | 128 ++++++++++
/thunar.install | 28 ++
extra-i686/0001-Fix-Open-With-default-app-with-glib-2.41.patch | 88 ++++++
extra-i686/PKGBUILD | 56 ----
extra-i686/thunar.install | 14 -
extra-x86_64/0001-Fix-Open-With-default-app-with-glib-2.41.patch | 88 ++++++
extra-x86_64/PKGBUILD | 56 ----
extra-x86_64/thunar.install | 14 -
8 files changed, 332 insertions(+), 140 deletions(-)
Copied: thunar/repos/extra-i686/0001-Fix-Open-With-default-app-with-glib-2.41.patch (from rev 223793, thunar/trunk/0001-Fix-Open-With-default-app-with-glib-2.41.patch)
===================================================================
--- extra-i686/0001-Fix-Open-With-default-app-with-glib-2.41.patch (rev 0)
+++ extra-i686/0001-Fix-Open-With-default-app-with-glib-2.41.patch 2014-10-03 04:33:09 UTC (rev 223794)
@@ -0,0 +1,88 @@
+From fa0505341809837dec0dff7fbd7e197bd36d7e4f Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos at foutrelis.com>
+Date: Fri, 3 Oct 2014 06:59:54 +0300
+Subject: [PATCH] Fix "Open With" default app with glib >= 2.41
+
+Beginning with glib >= 2.41, g_app_info_get_all_for_type() no longer
+puts the default application in front of the list.
+
+This commit adds thunar_g_app_info_get_all_for_type() which imitates the
+old behavior of g_app_info_get_all_for_type() and moves the default
+application to the frond of the list.
+
+https://bugzilla.xfce.org/show_bug.cgi?id=11212
+---
+ thunar/thunar-file.c | 2 +-
+ thunar/thunar-gio-extensions.c | 29 +++++++++++++++++++++++++++++
+ thunar/thunar-gio-extensions.h | 2 ++
+ 3 files changed, 32 insertions(+), 1 deletion(-)
+
+diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
+index c45cf81..ee2f467 100644
+--- a/thunar/thunar-file.c
++++ b/thunar/thunar-file.c
+@@ -4017,7 +4017,7 @@ thunar_file_list_get_applications (GList *file_list)
+
+ /* determine the list of applications that can open this file */
+ if (G_UNLIKELY (current_type != NULL))
+- list = g_app_info_get_all_for_type (current_type);
++ list = thunar_g_app_info_get_all_for_type (current_type);
+ else
+ list = NULL;
+
+diff --git a/thunar/thunar-gio-extensions.c b/thunar/thunar-gio-extensions.c
+index 369c1f4..1c45443 100644
+--- a/thunar/thunar-gio-extensions.c
++++ b/thunar/thunar-gio-extensions.c
+@@ -513,6 +513,35 @@ thunar_g_file_list_to_stringv (GList *list)
+
+
+
++GList *
++thunar_g_app_info_get_all_for_type (const char *content_type)
++{
++ GList *infos, *info;
++ GAppInfo *default_info;
++
++ infos = g_app_info_get_all_for_type (content_type);
++ default_info = g_app_info_get_default_for_type (content_type, FALSE);
++
++ if (default_info == NULL)
++ return infos;
++
++ for (info = infos; info; info = info->next)
++ {
++ if (g_app_info_equal (info->data, default_info))
++ {
++ g_object_unref (info->data);
++ infos = g_list_delete_link (infos, info);
++ break;
++ }
++ }
++
++ infos = g_list_prepend (infos, default_info);
++
++ return infos;
++}
++
++
++
+ gboolean
+ thunar_g_app_info_launch (GAppInfo *info,
+ GFile *working_directory,
+diff --git a/thunar/thunar-gio-extensions.h b/thunar/thunar-gio-extensions.h
+index c19101e..b05c6cd 100644
+--- a/thunar/thunar-gio-extensions.h
++++ b/thunar/thunar-gio-extensions.h
+@@ -76,6 +76,8 @@ gchar **thunar_g_file_list_to_stringv (GList *list);
+ #define thunar_g_file_list_copy thunarx_file_info_list_copy
+ #define thunar_g_file_list_free thunarx_file_info_list_free
+
++GList *thunar_g_app_info_get_all_for_type (const char *content_type);
++
+ gboolean thunar_g_app_info_launch (GAppInfo *info,
+ GFile *working_directory,
+ GList *path_list,
+--
+2.1.2
+
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-10-03 04:32:49 UTC (rev 223793)
+++ extra-i686/PKGBUILD 2014-10-03 04:33:09 UTC (rev 223794)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Andrew Simmons <andrew.simmons at gmail.com>
-
-pkgname=thunar
-pkgver=1.6.3
-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')
-install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/1.6/Thunar-$pkgver.tar.bz2)
-sha256sums=('9a2706f6881ac29cda9f0b0325d179153bc09e37bcbafcab9823c1c1ec89579d')
-
-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 223793, thunar/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-10-03 04:33:09 UTC (rev 223794)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Andrew Simmons <andrew.simmons at gmail.com>
+
+pkgname=thunar
+pkgver=1.6.3
+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'
+ 'udev' 'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng')
+makedepends=('intltool' 'gtk-doc' 'xfce4-panel')
+optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems'
+ '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')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/1.6/Thunar-$pkgver.tar.bz2
+ 0001-Fix-Open-With-default-app-with-glib-2.41.patch)
+sha256sums=('9a2706f6881ac29cda9f0b0325d179153bc09e37bcbafcab9823c1c1ec89579d'
+ '3af91403bb9ccb6844df5062bb3f6f8a54698a1ebf504234c44f5a3bc269941d')
+
+prepare() {
+ cd "$srcdir/Thunar-$pkgver"
+
+ # https://bugzilla.xfce.org/show_bug.cgi?id=11212
+ patch -Np1 -i ../0001-Fix-Open-With-default-app-with-glib-2.41.patch
+}
+
+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:
Deleted: extra-i686/thunar.install
===================================================================
--- extra-i686/thunar.install 2014-10-03 04:32:49 UTC (rev 223793)
+++ extra-i686/thunar.install 2014-10-03 04:33:09 UTC (rev 223794)
@@ -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 223793, thunar/trunk/thunar.install)
===================================================================
--- extra-i686/thunar.install (rev 0)
+++ extra-i686/thunar.install 2014-10-03 04:33:09 UTC (rev 223794)
@@ -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:
Copied: thunar/repos/extra-x86_64/0001-Fix-Open-With-default-app-with-glib-2.41.patch (from rev 223793, thunar/trunk/0001-Fix-Open-With-default-app-with-glib-2.41.patch)
===================================================================
--- extra-x86_64/0001-Fix-Open-With-default-app-with-glib-2.41.patch (rev 0)
+++ extra-x86_64/0001-Fix-Open-With-default-app-with-glib-2.41.patch 2014-10-03 04:33:09 UTC (rev 223794)
@@ -0,0 +1,88 @@
+From fa0505341809837dec0dff7fbd7e197bd36d7e4f Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos at foutrelis.com>
+Date: Fri, 3 Oct 2014 06:59:54 +0300
+Subject: [PATCH] Fix "Open With" default app with glib >= 2.41
+
+Beginning with glib >= 2.41, g_app_info_get_all_for_type() no longer
+puts the default application in front of the list.
+
+This commit adds thunar_g_app_info_get_all_for_type() which imitates the
+old behavior of g_app_info_get_all_for_type() and moves the default
+application to the frond of the list.
+
+https://bugzilla.xfce.org/show_bug.cgi?id=11212
+---
+ thunar/thunar-file.c | 2 +-
+ thunar/thunar-gio-extensions.c | 29 +++++++++++++++++++++++++++++
+ thunar/thunar-gio-extensions.h | 2 ++
+ 3 files changed, 32 insertions(+), 1 deletion(-)
+
+diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
+index c45cf81..ee2f467 100644
+--- a/thunar/thunar-file.c
++++ b/thunar/thunar-file.c
+@@ -4017,7 +4017,7 @@ thunar_file_list_get_applications (GList *file_list)
+
+ /* determine the list of applications that can open this file */
+ if (G_UNLIKELY (current_type != NULL))
+- list = g_app_info_get_all_for_type (current_type);
++ list = thunar_g_app_info_get_all_for_type (current_type);
+ else
+ list = NULL;
+
+diff --git a/thunar/thunar-gio-extensions.c b/thunar/thunar-gio-extensions.c
+index 369c1f4..1c45443 100644
+--- a/thunar/thunar-gio-extensions.c
++++ b/thunar/thunar-gio-extensions.c
+@@ -513,6 +513,35 @@ thunar_g_file_list_to_stringv (GList *list)
+
+
+
++GList *
++thunar_g_app_info_get_all_for_type (const char *content_type)
++{
++ GList *infos, *info;
++ GAppInfo *default_info;
++
++ infos = g_app_info_get_all_for_type (content_type);
++ default_info = g_app_info_get_default_for_type (content_type, FALSE);
++
++ if (default_info == NULL)
++ return infos;
++
++ for (info = infos; info; info = info->next)
++ {
++ if (g_app_info_equal (info->data, default_info))
++ {
++ g_object_unref (info->data);
++ infos = g_list_delete_link (infos, info);
++ break;
++ }
++ }
++
++ infos = g_list_prepend (infos, default_info);
++
++ return infos;
++}
++
++
++
+ gboolean
+ thunar_g_app_info_launch (GAppInfo *info,
+ GFile *working_directory,
+diff --git a/thunar/thunar-gio-extensions.h b/thunar/thunar-gio-extensions.h
+index c19101e..b05c6cd 100644
+--- a/thunar/thunar-gio-extensions.h
++++ b/thunar/thunar-gio-extensions.h
+@@ -76,6 +76,8 @@ gchar **thunar_g_file_list_to_stringv (GList *list);
+ #define thunar_g_file_list_copy thunarx_file_info_list_copy
+ #define thunar_g_file_list_free thunarx_file_info_list_free
+
++GList *thunar_g_app_info_get_all_for_type (const char *content_type);
++
+ gboolean thunar_g_app_info_launch (GAppInfo *info,
+ GFile *working_directory,
+ GList *path_list,
+--
+2.1.2
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-10-03 04:32:49 UTC (rev 223793)
+++ extra-x86_64/PKGBUILD 2014-10-03 04:33:09 UTC (rev 223794)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Andrew Simmons <andrew.simmons at gmail.com>
-
-pkgname=thunar
-pkgver=1.6.3
-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')
-install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/1.6/Thunar-$pkgver.tar.bz2)
-sha256sums=('9a2706f6881ac29cda9f0b0325d179153bc09e37bcbafcab9823c1c1ec89579d')
-
-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 223793, thunar/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-10-03 04:33:09 UTC (rev 223794)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Andrew Simmons <andrew.simmons at gmail.com>
+
+pkgname=thunar
+pkgver=1.6.3
+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'
+ 'udev' 'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng')
+makedepends=('intltool' 'gtk-doc' 'xfce4-panel')
+optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems'
+ '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')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/1.6/Thunar-$pkgver.tar.bz2
+ 0001-Fix-Open-With-default-app-with-glib-2.41.patch)
+sha256sums=('9a2706f6881ac29cda9f0b0325d179153bc09e37bcbafcab9823c1c1ec89579d'
+ '3af91403bb9ccb6844df5062bb3f6f8a54698a1ebf504234c44f5a3bc269941d')
+
+prepare() {
+ cd "$srcdir/Thunar-$pkgver"
+
+ # https://bugzilla.xfce.org/show_bug.cgi?id=11212
+ patch -Np1 -i ../0001-Fix-Open-With-default-app-with-glib-2.41.patch
+}
+
+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:
Deleted: extra-x86_64/thunar.install
===================================================================
--- extra-x86_64/thunar.install 2014-10-03 04:32:49 UTC (rev 223793)
+++ extra-x86_64/thunar.install 2014-10-03 04:33:09 UTC (rev 223794)
@@ -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 223793, thunar/trunk/thunar.install)
===================================================================
--- extra-x86_64/thunar.install (rev 0)
+++ extra-x86_64/thunar.install 2014-10-03 04:33:09 UTC (rev 223794)
@@ -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