Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7bf4c730162b21ae4ece54060d02f3eda14c425b
commit 7bf4c730162b21ae4ece54060d02f3eda14c425b Author: Devil505 <[email protected]> Date: Mon Apr 16 11:24:28 2012 +0200 thunar-1.2.2-2-i686 * removed pkla file (gvfs can handle this) * added polkit-gnome as ropend for automount * added several patchs to fix some bugs diff --git a/source/xfce4/thunar/FrugalBuild b/source/xfce4/thunar/FrugalBuild index 24f151a..2416e49 100644 --- a/source/xfce4/thunar/FrugalBuild +++ b/source/xfce4/thunar/FrugalBuild @@ -6,7 +6,7 @@ pkgname=thunar _F_xfce_name=Thunar _F_archive_name=Thunar pkgver=1.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="Thunar is a modern file manager for Xfce4." makedepends=('intltool' 'gtk-doc' 'xfce4-panel>=4.8.0' \ 'xfce4-dev-tools>=4.8.0') @@ -14,7 +14,7 @@ depends=('libexo>=0.6.0' 'gtk+2>=2.20.1-1' 'gamin' 'libxfce4util>=4.8.1' \ 'hicolor-icon-theme' 'dbus-glib>=0.80' 'xfconf>=4.8.0' \ 'libexif>=0.6.17' 'xfce4-panel>=4.8.0' 'glib2>=2.18.4' 'libexif' \ 'libnotify>=0.7' 'udev' 'libpng' 'polkit' 'xcb-util>=0.3.8') -rodepends=('gvfs') +rodepends=('gvfs' 'polkit-gnome') groups=('xfce4' 'xfce4-core') conflicts=('xffm') replaces=('xffm') @@ -33,21 +33,22 @@ Fconfopts="$Fconfopts --disable-debug \ --enable-pcre \ --enable-gtk-doc" sha1sums=('314e3d53ec7be1ea578da4d842ecc8dc5958b1bd' \ - '5c20acecefd41e6a3a2ee2c2a42e06aeb29b09f8') + 'aca8b382a30a0349e8d5b183b7c7576c0b6ca7b7' \ + 'f0f7d7e9d3582f44a9be045a28d7dbb48ab67cf6' \ + '7b054189b357d170988fc0799b9b563c7e217c2d' \ + '35787da88d9c2cd68642ca7e858cf4760415a661') ## bug fix release source=(http://archive.xfce.org/src/xfce/$pkgname/1.2/$_F_archive_name-$pkgver.tar.bz2 \ - org.freedesktop.udisks.pkla) + fix-segfault-on-rename.patch \ + fix-sorting-of-large-numbers-5356.patch \ + fix-launching-multiple-files-7456.patch \ + fix-crash-8168.patch) build() { Fbuild sed -i 's:x-directory/gnome-default-handler;::' \ $Fdestdir/usr/share/applications/Thunar-folder-handler.desktop || Fdie - - # install udisks permission file - install -dm700 $Fdestdir/etc/polkit-1/localauthority || Fdie - install -dm755 $Fdestdir/etc/polkit-1/localauthority/50-local.d || Fdie - Finstall 644 org.freedesktop.udisks.pkla etc/polkit-1/localauthority/50-local.d/ Fbuild_gnome_scriptlet } diff --git a/source/xfce4/thunar/fix-crash-8168.patch b/source/xfce4/thunar/fix-crash-8168.patch new file mode 100644 index 0000000..4300c81 --- /dev/null +++ b/source/xfce4/thunar/fix-crash-8168.patch @@ -0,0 +1,32 @@ +From 71f6f207cfd0194a3f3db83cb5fab694a5036e22 Mon Sep 17 00:00:00 2001 +From: Jannis Pohlmann <[email protected]> +Date: Sun, 26 Feb 2012 17:38:50 +0000 +Subject: Fix crash when removing an ancestor of the current folder (bug #8168). + +Whenever we release the GFileMonitor of a ThunarFolder, we also need to +disconnect from its signals. Otherwise one of the signal handlers might +still be called, potentially with corrupted user data (which was the +case here). +--- +diff --git a/thunar/thunar-folder.c b/thunar/thunar-folder.c +index 62015fe..4076b8d 100644 +--- a/thunar/thunar-folder.c ++++ b/thunar/thunar-folder.c +@@ -236,6 +236,7 @@ thunar_folder_finalize (GObject *object) + /* disconnect from the file alteration monitor */ + if (G_LIKELY (folder->monitor != NULL)) + { ++ g_signal_handlers_disconnect_matched (folder->monitor, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, folder); + g_file_monitor_cancel (folder->monitor); + g_object_unref (folder->monitor); + } +@@ -705,6 +706,7 @@ thunar_folder_reload (ThunarFolder *folder) + /* disconnect from the file alteration monitor */ + if (G_UNLIKELY (folder->monitor != NULL)) + { ++ g_signal_handlers_disconnect_matched (folder->monitor, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, folder); + g_file_monitor_cancel (folder->monitor); + g_object_unref (folder->monitor); + folder->monitor = NULL; +-- +cgit v0.9.0.2 diff --git a/source/xfce4/thunar/fix-launching-multiple-files-7456.patch b/source/xfce4/thunar/fix-launching-multiple-files-7456.patch new file mode 100644 index 0000000..f086c52 --- /dev/null +++ b/source/xfce4/thunar/fix-launching-multiple-files-7456.patch @@ -0,0 +1,53 @@ +From 379b8b9f350cb362735eb0e2a0e9471a898f2664 Mon Sep 17 00:00:00 2001 +From: John Lindgren <[email protected]> +Date: Sun, 26 Feb 2012 18:52:24 +0000 +Subject: Fix handling %U when launching multiple files with an app (bug #7456). + +GIO returns a newly allocated GAppInfo every time +g_app_info_get_default_for_type() is called. This means that if we use a +GHashTable and g_direct_hash() to associate GAppInfos with files to be +launched with each of them, we will actually end up with multiple +GAppInfos that are the same, and each of them will only have a single +file associated. + +To fix this, we now use a fake hash function that causes GHashTable to +always search the GAppInfo in the collision list. +--- +diff --git a/thunar/thunar-launcher.c b/thunar/thunar-launcher.c +index f479cf9..9f96b87 100644 +--- a/thunar/thunar-launcher.c ++++ b/thunar/thunar-launcher.c +@@ -546,17 +546,28 @@ thunar_launcher_execute_files (ThunarLauncher *launcher, + + + ++static guint ++thunar_launcher_g_app_info_hash (gconstpointer app_info) ++{ ++ return 0; ++} ++ ++ ++ + static void + thunar_launcher_open_files (ThunarLauncher *launcher, + GList *files) + { +- GAppInfo *app_info; + GHashTable *applications; ++ GAppInfo *app_info; + GList *file_list; + GList *lp; + +- /* allocate a hash table to associate applications to URIs */ +- applications = g_hash_table_new_full (g_direct_hash, ++ /* allocate a hash table to associate applications to URIs. since GIO allocates ++ * new GAppInfo objects every time, g_direct_hash does not work. we therefor use ++ * a fake hash function to always hit the collision list of the hash table and ++ * avoid storing multiple equal GAppInfos by means of g_app_info_equal(). */ ++ applications = g_hash_table_new_full (thunar_launcher_g_app_info_hash, + (GEqualFunc) g_app_info_equal, + (GDestroyNotify) g_object_unref, + (GDestroyNotify) thunar_g_file_list_free); +-- +cgit v0.9.0.2 diff --git a/source/xfce4/thunar/fix-segfault-on-rename.patch b/source/xfce4/thunar/fix-segfault-on-rename.patch new file mode 100644 index 0000000..f899771 --- /dev/null +++ b/source/xfce4/thunar/fix-segfault-on-rename.patch @@ -0,0 +1,27 @@ +From fb7e7a602473fe2f11c78baacacaad1aea8c9dc6 Mon Sep 17 00:00:00 2001 +From: Nick Schermer <[email protected]> +Date: Wed, 30 Nov 2011 17:45:57 +0000 +Subject: Fix segfault when plugin returns a NULL suffix. + +(cherry picked from commit 6f813ba48553e5b95a83bfa8463b20b8ee4607c4) +--- +diff --git a/thunar/thunar-renamer-model.c b/thunar/thunar-renamer-model.c +index 1aa7b77..91a47e1 100644 +--- a/thunar/thunar-renamer-model.c ++++ b/thunar/thunar-renamer-model.c +@@ -823,10 +823,9 @@ thunar_renamer_model_process_item (ThunarRenamerModel *renamer_model, + /* determine the new suffix */ + suffix = thunarx_renamer_process (renamer_model->renamer, THUNARX_FILE_INFO (item->file), dot + 1, idx); + +- /* generate the new file name */ +- name = g_new (gchar, (dot - display_name) + 1 + strlen (suffix) + 1); +- memcpy (name, display_name, (dot - display_name) + 1); +- memcpy (name + (dot - display_name) + 1, suffix, strlen (suffix) + 1); ++ prefix = g_strndup (display_name, (dot - display_name) + 1); ++ name = g_strconcat (prefix, suffix, NULL); ++ g_free (prefix); + + /* release the suffix */ + g_free (suffix); +-- +cgit v0.9.0.2 diff --git a/source/xfce4/thunar/fix-sorting-of-large-numbers-5356.patch b/source/xfce4/thunar/fix-sorting-of-large-numbers-5356.patch new file mode 100644 index 0000000..0bc8d40 --- /dev/null +++ b/source/xfce4/thunar/fix-sorting-of-large-numbers-5356.patch @@ -0,0 +1,32 @@ +From 493db02bdbc6ec667cd04e75a77dff8366ec1bc0 Mon Sep 17 00:00:00 2001 +From: Eric Koegel <[email protected]> +Date: Sun, 06 Nov 2011 13:58:33 +0000 +Subject: Fix sorting of filenames with large numbers (bug #5356). + +Change compare_by_name_using_number() to use guint64. + +Signed-off-by: Jannis Pohlmann <[email protected]> +--- +diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c +index 909da25..44cdb31 100644 +--- a/thunar/thunar-file.c ++++ b/thunar/thunar-file.c +@@ -3168,12 +3168,12 @@ static gint + compare_by_name_using_number (const gchar *ap, + const gchar *bp) + { +- guint anum; +- guint bnum; ++ guint64 anum; ++ guint64 bnum; + + /* determine the numbers in ap and bp */ +- anum = strtoul (ap, NULL, 10); +- bnum = strtoul (bp, NULL, 10); ++ anum = strtouq (ap, NULL, 10); ++ bnum = strtouq (bp, NULL, 10); + + /* compare the numbers */ + if (anum < bnum) +-- +cgit v0.9.0.2 diff --git a/source/xfce4/thunar/org.freedesktop.udisks.pkla b/source/xfce4/thunar/org.freedesktop.udisks.pkla deleted file mode 100644 index 5cc443b..0000000 --- a/source/xfce4/thunar/org.freedesktop.udisks.pkla +++ /dev/null @@ -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 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
