Date: Thursday, August 25, 2011 @ 02:47:12 Author: tpowa Revision: 136235
archrelease: copy trunk to extra-i686 Added: thunar/repos/extra-i686/PKGBUILD (from rev 136234, thunar/trunk/PKGBUILD) thunar/repos/extra-i686/fix-gvfs.patch (from rev 136234, thunar/trunk/fix-gvfs.patch) thunar/repos/extra-i686/fix-samba.patch (from rev 136234, thunar/trunk/fix-samba.patch) thunar/repos/extra-i686/org.freedesktop.udisks.pkla (from rev 136234, thunar/trunk/org.freedesktop.udisks.pkla) thunar/repos/extra-i686/thunar.install (from rev 136234, thunar/trunk/thunar.install) Deleted: thunar/repos/extra-i686/PKGBUILD thunar/repos/extra-i686/fix-gvfs.patch thunar/repos/extra-i686/org.freedesktop.udisks.pkla thunar/repos/extra-i686/thunar.install -----------------------------+ PKGBUILD | 131 +++++++++--------- fix-gvfs.patch | 296 +++++++++++++++++++++--------------------- fix-samba.patch | 14 + org.freedesktop.udisks.pkla | 14 - thunar.install | 28 +-- 5 files changed, 249 insertions(+), 234 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2011-08-25 06:44:39 UTC (rev 136234) +++ PKGBUILD 2011-08-25 06:47:12 UTC (rev 136235) @@ -1,65 +0,0 @@ -# $Id$ -# Maintainer: andyrtr <andyrtr funnychar archlinux.org> -# Contributor: Andrew Simmons <andrew.simm...@gmail.com> - -pkgname=thunar -pkgver=1.2.2 -pkgrel=2 -pkgdesc="modern file manager for Xfce" -arch=('i686' 'x86_64') -license=('GPL2' 'LGPL2.1') -url="http://thunar.xfce.org" -groups=('xfce4') -depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 'libnotify>=0.7.1' 'udev' - 'gtk2' 'exo>=0.6.0' 'libxfce4util>=4.8.1' 'libxfce4ui' 'libpng') -makedepends=('intltool' 'gtk-doc' 'xfce4-panel>=4.8.0') -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') -options=('!libtool') -install=${pkgname}.install -backup=('etc/polkit-1/localauthority/50-local.d/org.freedesktop.udisks.pkla') -source=(http://archive.xfce.org/src/xfce/${pkgname}/1.2/Thunar-${pkgver}.tar.bz2 - org.freedesktop.udisks.pkla - fix-gvfs.patch) - -build() { - cd ${srcdir}/Thunar-${pkgver} - patch -Np1 -i ../fix-gvfs.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 - - # install udisks permission file - install -dm700 ${pkgdir}/etc/polkit-1/localauthority - install -dm755 ${pkgdir}/etc/polkit-1/localauthority/50-local.d - install -m644 ${srcdir}/org.freedesktop.udisks.pkla ${pkgdir}/etc/polkit-1/localauthority/50-local.d/ -} -md5sums=('a86df0212db71e61f459bda6bc7b7fb6' - 'a7ddb5eec02d9a8e91a2997862e73cd8' - '376c81af1ce5cf8b872d62a878163091') -md5sums=('a86df0212db71e61f459bda6bc7b7fb6' - 'a7ddb5eec02d9a8e91a2997862e73cd8' - '167c79462cddc5aaa1fcdc814041350b') Copied: thunar/repos/extra-i686/PKGBUILD (from rev 136234, thunar/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2011-08-25 06:47:12 UTC (rev 136235) @@ -0,0 +1,66 @@ +# $Id$ +# Maintainer: andyrtr <andyrtr funnychar archlinux.org> +# Contributor: Andrew Simmons <andrew.simm...@gmail.com> + +pkgname=thunar +pkgver=1.2.2 +pkgrel=3 +pkgdesc="modern file manager for Xfce" +arch=('i686' 'x86_64') +license=('GPL2' 'LGPL2.1') +url="http://thunar.xfce.org" +groups=('xfce4') +depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 'libnotify>=0.7.1' 'udev' + 'gtk2' 'exo>=0.6.0' 'libxfce4util>=4.8.1' 'libxfce4ui' 'libpng') +makedepends=('intltool' 'gtk-doc' 'xfce4-panel>=4.8.0') +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') +options=('!libtool') +install=${pkgname}.install +backup=('etc/polkit-1/localauthority/50-local.d/org.freedesktop.udisks.pkla') +source=(http://archive.xfce.org/src/xfce/${pkgname}/1.2/Thunar-${pkgver}.tar.bz2 + org.freedesktop.udisks.pkla + fix-gvfs.patch + fix-samba.patch) + +build() { + cd ${srcdir}/Thunar-${pkgver} + patch -Np1 -i ../fix-gvfs.patch + patch -Np1 -i ../fix-samba.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 + + # install udisks permission file + install -dm700 ${pkgdir}/etc/polkit-1/localauthority + install -dm755 ${pkgdir}/etc/polkit-1/localauthority/50-local.d + install -m644 ${srcdir}/org.freedesktop.udisks.pkla ${pkgdir}/etc/polkit-1/localauthority/50-local.d/ +} + +md5sums=('a86df0212db71e61f459bda6bc7b7fb6' + 'a7ddb5eec02d9a8e91a2997862e73cd8' + '167c79462cddc5aaa1fcdc814041350b' + 'c8063873958d89402046f29b78c1d8d4') Deleted: fix-gvfs.patch =================================================================== --- fix-gvfs.patch 2011-08-25 06:44:39 UTC (rev 136234) +++ fix-gvfs.patch 2011-08-25 06:47:12 UTC (rev 136235) @@ -1,148 +0,0 @@ ---- a/thunar/thunar-shortcuts-model.c -+++ b/thunar/thunar-shortcuts-model.c -@@ -1,25 +1,23 @@ --/* vi:set et ai sw=2 sts=2 ts=2: */ -+/* $Id$ */ - /*- - * Copyright (c) 2005-2006 Benedikt Meurer <be...@xfce.org> -- * Copyright (c) 2009-2011 Jannis Pohlmann <jan...@xfce.org> -+ * Copyright (c) 2009 Jannis Pohlmann <jan...@xfce.org> - * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU General Public License as -- * published by the Free Software Foundation; either version 2 of -- * the License, or (at your option) any later version. -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License as published by the Free -+ * Software Foundation; either version 2 of the License, or (at your option) -+ * any later version. - * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. - * -- * You should have received a copy of the GNU General Public -- * License along with this program; if not, write to the Free -- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02110-1301, USA. -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple -+ * Place, Suite 330, Boston, MA 02111-1307 USA - */ - -- - #ifdef HAVE_CONFIG_H - #include <config.h> - #endif -@@ -219,84 +217,6 @@ thunar_shortcuts_model_drag_source_init (GtkTreeDragSourceIface *iface) - - - --static gboolean --thunar_shortcuts_model_add_network_idle (gpointer user_data) --{ -- ThunarShortcutsModel *model = THUNAR_SHORTCUTS_MODEL (user_data); -- ThunarShortcut *shortcut = NULL; -- GtkTreePath *path; -- GtkTreeIter iter; -- ThunarFile *file = NULL; -- GVolume *volume = NULL; -- gboolean have_iter = FALSE; -- gboolean is_separator = FALSE; -- gboolean position_found = FALSE; -- GFile *location = NULL; -- -- /* append the network icon if browsing the network is supported */ -- if (thunar_g_vfs_is_uri_scheme_supported ("network")) -- { -- /* load the network root file */ -- location = g_file_new_for_uri ("network://"); -- file = thunar_file_get (location, NULL); -- g_object_unref (location); -- -- /* create the shortcut */ -- shortcut = g_slice_new0 (ThunarShortcut); -- shortcut->type = THUNAR_SHORTCUT_SYSTEM_DEFINED; -- shortcut->file = file; -- -- /* iterate over all rows in the model in order to find the -- * first one with a volume or a separator */ -- have_iter = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter); -- while (have_iter && !position_found) -- { -- /* read volume and separator flag from the current row */ -- gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, -- THUNAR_SHORTCUTS_MODEL_COLUMN_VOLUME, &volume, -- THUNAR_SHORTCUTS_MODEL_COLUMN_SEPARATOR, &is_separator, -- -1); -- -- /* check if a volume row was found */ -- if (volume != NULL) -- { -- /* stop searching */ -- position_found = TRUE; -- -- /* release the volume */ -- g_object_unref (volume); -- } -- else if (is_separator) -- { -- /* stop searching */ -- position_found = TRUE; -- } -- else -- { -- /* advance to the next row */ -- have_iter = gtk_tree_model_iter_next (GTK_TREE_MODEL (model), &iter); -- } -- } -- -- /* we always have a volume or separator row */ -- g_assert (position_found); -- -- /* get the path of the iter */ -- path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter); -- -- /* append the shortcut to the list */ -- thunar_shortcuts_model_add_shortcut (model, shortcut, path); -- -- /* release the path */ -- gtk_tree_path_free (path); -- } -- -- /* remove this idle handler */ -- return FALSE; --} -- -- -- - static void - thunar_shortcuts_model_init (ThunarShortcutsModel *model) - { -@@ -339,6 +259,10 @@ thunar_shortcuts_model_init (ThunarShortcutsModel *model) - /* append the root file system */ - system_paths = g_list_append (system_paths, thunar_g_file_new_for_root ()); - -+ /* append the network icon if browsing the network is supported */ -+ if (thunar_g_vfs_is_uri_scheme_supported ("network")) -+ system_paths = g_list_append (system_paths, g_file_new_for_uri ("network://")); -+ - /* will be used to append the shortcuts to the list */ - path = gtk_tree_path_new_from_indices (0, -1); - -@@ -416,9 +340,6 @@ thunar_shortcuts_model_init (ThunarShortcutsModel *model) - g_object_unref (bookmarks); - g_object_unref (home); - gtk_tree_path_free (path); -- -- /* add the network item (and other slow items) in an idle handler */ -- g_idle_add_full (G_PRIORITY_LOW, thunar_shortcuts_model_add_network_idle, model, NULL); - } - - - Copied: thunar/repos/extra-i686/fix-gvfs.patch (from rev 136234, thunar/trunk/fix-gvfs.patch) =================================================================== --- fix-gvfs.patch (rev 0) +++ fix-gvfs.patch 2011-08-25 06:47:12 UTC (rev 136235) @@ -0,0 +1,148 @@ +--- a/thunar/thunar-shortcuts-model.c ++++ b/thunar/thunar-shortcuts-model.c +@@ -1,25 +1,23 @@ +-/* vi:set et ai sw=2 sts=2 ts=2: */ ++/* $Id$ */ + /*- + * Copyright (c) 2005-2006 Benedikt Meurer <be...@xfce.org> +- * Copyright (c) 2009-2011 Jannis Pohlmann <jan...@xfce.org> ++ * Copyright (c) 2009 Jannis Pohlmann <jan...@xfce.org> + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public License as +- * published by the Free Software Foundation; either version 2 of +- * the License, or (at your option) any later version. ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the Free ++ * Software Foundation; either version 2 of the License, or (at your option) ++ * any later version. + * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. ++ * This program is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for ++ * more details. + * +- * You should have received a copy of the GNU General Public +- * License along with this program; if not, write to the Free +- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- * Boston, MA 02110-1301, USA. ++ * You should have received a copy of the GNU General Public License along with ++ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple ++ * Place, Suite 330, Boston, MA 02111-1307 USA + */ + +- + #ifdef HAVE_CONFIG_H + #include <config.h> + #endif +@@ -219,84 +217,6 @@ thunar_shortcuts_model_drag_source_init (GtkTreeDragSourceIface *iface) + + + +-static gboolean +-thunar_shortcuts_model_add_network_idle (gpointer user_data) +-{ +- ThunarShortcutsModel *model = THUNAR_SHORTCUTS_MODEL (user_data); +- ThunarShortcut *shortcut = NULL; +- GtkTreePath *path; +- GtkTreeIter iter; +- ThunarFile *file = NULL; +- GVolume *volume = NULL; +- gboolean have_iter = FALSE; +- gboolean is_separator = FALSE; +- gboolean position_found = FALSE; +- GFile *location = NULL; +- +- /* append the network icon if browsing the network is supported */ +- if (thunar_g_vfs_is_uri_scheme_supported ("network")) +- { +- /* load the network root file */ +- location = g_file_new_for_uri ("network://"); +- file = thunar_file_get (location, NULL); +- g_object_unref (location); +- +- /* create the shortcut */ +- shortcut = g_slice_new0 (ThunarShortcut); +- shortcut->type = THUNAR_SHORTCUT_SYSTEM_DEFINED; +- shortcut->file = file; +- +- /* iterate over all rows in the model in order to find the +- * first one with a volume or a separator */ +- have_iter = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter); +- while (have_iter && !position_found) +- { +- /* read volume and separator flag from the current row */ +- gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, +- THUNAR_SHORTCUTS_MODEL_COLUMN_VOLUME, &volume, +- THUNAR_SHORTCUTS_MODEL_COLUMN_SEPARATOR, &is_separator, +- -1); +- +- /* check if a volume row was found */ +- if (volume != NULL) +- { +- /* stop searching */ +- position_found = TRUE; +- +- /* release the volume */ +- g_object_unref (volume); +- } +- else if (is_separator) +- { +- /* stop searching */ +- position_found = TRUE; +- } +- else +- { +- /* advance to the next row */ +- have_iter = gtk_tree_model_iter_next (GTK_TREE_MODEL (model), &iter); +- } +- } +- +- /* we always have a volume or separator row */ +- g_assert (position_found); +- +- /* get the path of the iter */ +- path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter); +- +- /* append the shortcut to the list */ +- thunar_shortcuts_model_add_shortcut (model, shortcut, path); +- +- /* release the path */ +- gtk_tree_path_free (path); +- } +- +- /* remove this idle handler */ +- return FALSE; +-} +- +- +- + static void + thunar_shortcuts_model_init (ThunarShortcutsModel *model) + { +@@ -339,6 +259,10 @@ thunar_shortcuts_model_init (ThunarShortcutsModel *model) + /* append the root file system */ + system_paths = g_list_append (system_paths, thunar_g_file_new_for_root ()); + ++ /* append the network icon if browsing the network is supported */ ++ if (thunar_g_vfs_is_uri_scheme_supported ("network")) ++ system_paths = g_list_append (system_paths, g_file_new_for_uri ("network://")); ++ + /* will be used to append the shortcuts to the list */ + path = gtk_tree_path_new_from_indices (0, -1); + +@@ -416,9 +340,6 @@ thunar_shortcuts_model_init (ThunarShortcutsModel *model) + g_object_unref (bookmarks); + g_object_unref (home); + gtk_tree_path_free (path); +- +- /* add the network item (and other slow items) in an idle handler */ +- g_idle_add_full (G_PRIORITY_LOW, thunar_shortcuts_model_add_network_idle, model, NULL); + } + + + Copied: thunar/repos/extra-i686/fix-samba.patch (from rev 136234, thunar/trunk/fix-samba.patch) =================================================================== --- fix-samba.patch (rev 0) +++ fix-samba.patch 2011-08-25 06:47:12 UTC (rev 136235) @@ -0,0 +1,14 @@ +--- thunar-file-ORIGINAL.c 2011-05-27 00:11:27.000000000 +0200 ++++ thunar-1.2.2/thunar/thunar-file.c 2011-08-22 08:00:24.095066077 +0200 +@@ -754,7 +754,10 @@ thunar_file_load (ThunarFile *file, + target_uri = + g_file_info_get_attribute_string (file->info, + G_FILE_ATTRIBUTE_STANDARD_TARGET_URI); +- file->is_mounted = (target_uri != NULL); ++ file->is_mounted = (target_uri != NULL) ++ ? !g_file_info_get_attribute_boolean (file->info, ++ G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT) ++ : FALSE; + } + } + else Deleted: org.freedesktop.udisks.pkla =================================================================== --- org.freedesktop.udisks.pkla 2011-08-25 06:44:39 UTC (rev 136234) +++ org.freedesktop.udisks.pkla 2011-08-25 06:47:12 UTC (rev 136235) @@ -1,7 +0,0 @@ -[Local Users] -#Identity=unix-user: your_username -Identity=unix-group:storage -Action=org.freedesktop.udisks.* -ResultAny=yes -ResultInactive=no -ResultActive=yes Copied: thunar/repos/extra-i686/org.freedesktop.udisks.pkla (from rev 136234, thunar/trunk/org.freedesktop.udisks.pkla) =================================================================== --- org.freedesktop.udisks.pkla (rev 0) +++ org.freedesktop.udisks.pkla 2011-08-25 06:47:12 UTC (rev 136235) @@ -0,0 +1,7 @@ +[Local Users] +#Identity=unix-user: your_username +Identity=unix-group:storage +Action=org.freedesktop.udisks.* +ResultAny=yes +ResultInactive=no +ResultActive=yes Deleted: thunar.install =================================================================== --- thunar.install 2011-08-25 06:44:39 UTC (rev 136234) +++ thunar.install 2011-08-25 06:47:12 UTC (rev 136235) @@ -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 $1 -} - -post_remove() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - Copied: thunar/repos/extra-i686/thunar.install (from rev 136234, thunar/trunk/thunar.install) =================================================================== --- thunar.install (rev 0) +++ thunar.install 2011-08-25 06:47:12 UTC (rev 136235) @@ -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 $1 +} + +post_remove() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} +