Date: Monday, October 6, 2014 @ 14:09:17 Author: bpiotrowski Revision: 120233
archrelease: copy trunk to community-i686, community-x86_64 Added: pcmanfm/repos/community-i686/0001-Fix-Open-With-default-application-with-glib-2.41.patch (from rev 120232, pcmanfm/trunk/0001-Fix-Open-With-default-application-with-glib-2.41.patch) pcmanfm/repos/community-i686/PKGBUILD (from rev 120232, pcmanfm/trunk/PKGBUILD) pcmanfm/repos/community-i686/pcmanfm.install (from rev 120232, pcmanfm/trunk/pcmanfm.install) pcmanfm/repos/community-x86_64/0001-Fix-Open-With-default-application-with-glib-2.41.patch (from rev 120232, pcmanfm/trunk/0001-Fix-Open-With-default-application-with-glib-2.41.patch) pcmanfm/repos/community-x86_64/PKGBUILD (from rev 120232, pcmanfm/trunk/PKGBUILD) pcmanfm/repos/community-x86_64/pcmanfm.install (from rev 120232, pcmanfm/trunk/pcmanfm.install) Deleted: pcmanfm/repos/community-i686/PKGBUILD pcmanfm/repos/community-i686/pcmanfm.install pcmanfm/repos/community-x86_64/PKGBUILD pcmanfm/repos/community-x86_64/pcmanfm.install ------------------------------------------------------------------------------+ /PKGBUILD | 80 ++++++++++ /pcmanfm.install | 22 ++ community-i686/0001-Fix-Open-With-default-application-with-glib-2.41.patch | 56 +++++++ community-i686/PKGBUILD | 32 ---- community-i686/pcmanfm.install | 11 - community-x86_64/0001-Fix-Open-With-default-application-with-glib-2.41.patch | 56 +++++++ community-x86_64/PKGBUILD | 32 ---- community-x86_64/pcmanfm.install | 11 - 8 files changed, 214 insertions(+), 86 deletions(-) Copied: pcmanfm/repos/community-i686/0001-Fix-Open-With-default-application-with-glib-2.41.patch (from rev 120232, pcmanfm/trunk/0001-Fix-Open-With-default-application-with-glib-2.41.patch) =================================================================== --- community-i686/0001-Fix-Open-With-default-application-with-glib-2.41.patch (rev 0) +++ community-i686/0001-Fix-Open-With-default-application-with-glib-2.41.patch 2014-10-06 12:09:17 UTC (rev 120233) @@ -0,0 +1,56 @@ +From dffe9a095a788c879f5c8b4561516a5478361166 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b...@bpiotrowski.pl> +Date: Mon, 6 Oct 2014 14:02:01 +0200 +Subject: [PATCH] Fix "Open With" default application with glib >= 2.41 + +--- + src/volume-manager.c | 26 +++++++++++++++++++++++++- + 1 file changed, 25 insertions(+), 1 deletion(-) + +diff --git a/src/volume-manager.c b/src/volume-manager.c +index 8df1b36..6dd4263 100644 +--- a/src/volume-manager.c ++++ b/src/volume-manager.c +@@ -138,6 +138,30 @@ static void on_dlg_response(GtkDialog* dlg, int res, gpointer user_data) + pcmanfm_unref(); + } + ++static GList * pcmanfm_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; ++} ++ + static void on_content_type_finished(GObject* src_obj, GAsyncResult* res, gpointer user_data) + { + AutoRun* data = (AutoRun*)user_data; +@@ -185,7 +209,7 @@ static void on_content_type_finished(GObject* src_obj, GAsyncResult* res, gpoint + _do_types: + for(type=types;*type;++type) + { +- l = g_app_info_get_all_for_type(*type); ++ l = pcmanfm_g_app_info_get_all_for_type(*type); + if(l) + apps = g_list_concat(apps, l); + } +-- +2.1.2 + Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2014-10-06 12:09:03 UTC (rev 120232) +++ community-i686/PKGBUILD 2014-10-06 12:09:17 UTC (rev 120233) @@ -1,32 +0,0 @@ -# $Id$ -# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> -# Contributor: Unknown47 <unknown...@gmail.com> -# Contributor: Angel Velasquez <an...@archlinux.org> -# Contributor: Juergen Hoetzel <juer...@archlinux.org> - -pkgname=pcmanfm -pkgver=1.2.2 -pkgrel=1 -pkgdesc='Extremely fast and lightweight file manager' -arch=('i686' 'x86_64') -url='http://pcmanfm.sourceforge.net/' -license=('GPL') -groups=('lxde') -depends=('gtk2' 'desktop-file-utils' 'libfm' 'lxmenu-data') -makedepends=('intltool') -optdepends=('gvfs: for trash support, mounting with udisks and remote filesystems' - 'udisks: alternative for mounting volumes') -install=$pkgname.install -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('ac0ba2f8e2b4d47014a62ccf43388e0f') - -build() { - cd $pkgname-$pkgver - ./configure --sysconfdir=/etc --prefix=/usr - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} Copied: pcmanfm/repos/community-i686/PKGBUILD (from rev 120232, pcmanfm/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2014-10-06 12:09:17 UTC (rev 120233) @@ -0,0 +1,40 @@ +# $Id$ +# Maintainer: +# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: Unknown47 <unknown...@gmail.com> +# Contributor: Angel Velasquez <an...@archlinux.org> +# Contributor: Juergen Hoetzel <juer...@archlinux.org> + +pkgname=pcmanfm +pkgver=1.2.2 +pkgrel=2 +pkgdesc='Extremely fast and lightweight file manager' +arch=('i686' 'x86_64') +url='http://pcmanfm.sourceforge.net/' +license=('GPL') +groups=('lxde') +depends=('gtk2' 'desktop-file-utils' 'libfm' 'lxmenu-data') +makedepends=('intltool') +optdepends=('gvfs: for trash support, mounting with udisks and remote filesystems' + 'udisks: alternative for mounting volumes') +install=$pkgname.install +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.xz + 0001-Fix-Open-With-default-application-with-glib-2.41.patch) +md5sums=('ac0ba2f8e2b4d47014a62ccf43388e0f' + 'a63df1e714980eb4300f0028aa99f654') + +prepare() { + cd $pkgname-$pkgver + patch -p1 -i ../0001-Fix-Open-With-default-application-with-glib-2.41.patch +} + +build() { + cd $pkgname-$pkgver + ./configure --sysconfdir=/etc --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} Deleted: community-i686/pcmanfm.install =================================================================== --- community-i686/pcmanfm.install 2014-10-06 12:09:03 UTC (rev 120232) +++ community-i686/pcmanfm.install 2014-10-06 12:09:17 UTC (rev 120233) @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} Copied: pcmanfm/repos/community-i686/pcmanfm.install (from rev 120232, pcmanfm/trunk/pcmanfm.install) =================================================================== --- community-i686/pcmanfm.install (rev 0) +++ community-i686/pcmanfm.install 2014-10-06 12:09:17 UTC (rev 120233) @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + update-desktop-database -q +} + +post_remove() { + update-desktop-database -q +} Copied: pcmanfm/repos/community-x86_64/0001-Fix-Open-With-default-application-with-glib-2.41.patch (from rev 120232, pcmanfm/trunk/0001-Fix-Open-With-default-application-with-glib-2.41.patch) =================================================================== --- community-x86_64/0001-Fix-Open-With-default-application-with-glib-2.41.patch (rev 0) +++ community-x86_64/0001-Fix-Open-With-default-application-with-glib-2.41.patch 2014-10-06 12:09:17 UTC (rev 120233) @@ -0,0 +1,56 @@ +From dffe9a095a788c879f5c8b4561516a5478361166 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b...@bpiotrowski.pl> +Date: Mon, 6 Oct 2014 14:02:01 +0200 +Subject: [PATCH] Fix "Open With" default application with glib >= 2.41 + +--- + src/volume-manager.c | 26 +++++++++++++++++++++++++- + 1 file changed, 25 insertions(+), 1 deletion(-) + +diff --git a/src/volume-manager.c b/src/volume-manager.c +index 8df1b36..6dd4263 100644 +--- a/src/volume-manager.c ++++ b/src/volume-manager.c +@@ -138,6 +138,30 @@ static void on_dlg_response(GtkDialog* dlg, int res, gpointer user_data) + pcmanfm_unref(); + } + ++static GList * pcmanfm_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; ++} ++ + static void on_content_type_finished(GObject* src_obj, GAsyncResult* res, gpointer user_data) + { + AutoRun* data = (AutoRun*)user_data; +@@ -185,7 +209,7 @@ static void on_content_type_finished(GObject* src_obj, GAsyncResult* res, gpoint + _do_types: + for(type=types;*type;++type) + { +- l = g_app_info_get_all_for_type(*type); ++ l = pcmanfm_g_app_info_get_all_for_type(*type); + if(l) + apps = g_list_concat(apps, l); + } +-- +2.1.2 + Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2014-10-06 12:09:03 UTC (rev 120232) +++ community-x86_64/PKGBUILD 2014-10-06 12:09:17 UTC (rev 120233) @@ -1,32 +0,0 @@ -# $Id$ -# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> -# Contributor: Unknown47 <unknown...@gmail.com> -# Contributor: Angel Velasquez <an...@archlinux.org> -# Contributor: Juergen Hoetzel <juer...@archlinux.org> - -pkgname=pcmanfm -pkgver=1.2.2 -pkgrel=1 -pkgdesc='Extremely fast and lightweight file manager' -arch=('i686' 'x86_64') -url='http://pcmanfm.sourceforge.net/' -license=('GPL') -groups=('lxde') -depends=('gtk2' 'desktop-file-utils' 'libfm' 'lxmenu-data') -makedepends=('intltool') -optdepends=('gvfs: for trash support, mounting with udisks and remote filesystems' - 'udisks: alternative for mounting volumes') -install=$pkgname.install -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('ac0ba2f8e2b4d47014a62ccf43388e0f') - -build() { - cd $pkgname-$pkgver - ./configure --sysconfdir=/etc --prefix=/usr - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} Copied: pcmanfm/repos/community-x86_64/PKGBUILD (from rev 120232, pcmanfm/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2014-10-06 12:09:17 UTC (rev 120233) @@ -0,0 +1,40 @@ +# $Id$ +# Maintainer: +# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: Unknown47 <unknown...@gmail.com> +# Contributor: Angel Velasquez <an...@archlinux.org> +# Contributor: Juergen Hoetzel <juer...@archlinux.org> + +pkgname=pcmanfm +pkgver=1.2.2 +pkgrel=2 +pkgdesc='Extremely fast and lightweight file manager' +arch=('i686' 'x86_64') +url='http://pcmanfm.sourceforge.net/' +license=('GPL') +groups=('lxde') +depends=('gtk2' 'desktop-file-utils' 'libfm' 'lxmenu-data') +makedepends=('intltool') +optdepends=('gvfs: for trash support, mounting with udisks and remote filesystems' + 'udisks: alternative for mounting volumes') +install=$pkgname.install +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.xz + 0001-Fix-Open-With-default-application-with-glib-2.41.patch) +md5sums=('ac0ba2f8e2b4d47014a62ccf43388e0f' + 'a63df1e714980eb4300f0028aa99f654') + +prepare() { + cd $pkgname-$pkgver + patch -p1 -i ../0001-Fix-Open-With-default-application-with-glib-2.41.patch +} + +build() { + cd $pkgname-$pkgver + ./configure --sysconfdir=/etc --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} Deleted: community-x86_64/pcmanfm.install =================================================================== --- community-x86_64/pcmanfm.install 2014-10-06 12:09:03 UTC (rev 120232) +++ community-x86_64/pcmanfm.install 2014-10-06 12:09:17 UTC (rev 120233) @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} Copied: pcmanfm/repos/community-x86_64/pcmanfm.install (from rev 120232, pcmanfm/trunk/pcmanfm.install) =================================================================== --- community-x86_64/pcmanfm.install (rev 0) +++ community-x86_64/pcmanfm.install 2014-10-06 12:09:17 UTC (rev 120233) @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + update-desktop-database -q +} + +post_remove() { + update-desktop-database -q +}