summaryrefslogtreecommitdiff
path: root/source/xap/xfce/patches
diff options
context:
space:
mode:
Diffstat (limited to 'source/xap/xfce/patches')
-rw-r--r--source/xap/xfce/patches/Thunar.thunar-vfs-io-local.diff20
-rw-r--r--source/xap/xfce/patches/fixup_comments_in_xfce-utils-Xft.xrdb.diff24
-rw-r--r--source/xap/xfce/patches/mousepad-fix_find.diff43
-rw-r--r--source/xap/xfce/patches/mousepad-fix_find_and_replace.diff36
-rw-r--r--source/xap/xfce/patches/no_sensitive_panel_during_plugin_moves.patch26
-rw-r--r--source/xap/xfce/patches/terminal.gtk.2.18.fix.diff101
-rw-r--r--source/xap/xfce/patches/thunar-1.0.1-fixup_docdir.diff360
-rw-r--r--source/xap/xfce/patches/thunar-1.0.1-png14.diff11
-rw-r--r--source/xap/xfce/patches/thunar-1.0.2-fixup_docdir.diff384
-rw-r--r--source/xap/xfce/patches/thunar-fix_umask_properly.diff52
-rw-r--r--source/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff11
-rw-r--r--source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff10
-rw-r--r--source/xap/xfce/patches/xfce4-settings.libxklavier5.diff11
-rw-r--r--source/xap/xfce/patches/xfsm-compat-kde.c-start-kde4-services.diff49
14 files changed, 600 insertions, 538 deletions
diff --git a/source/xap/xfce/patches/Thunar.thunar-vfs-io-local.diff b/source/xap/xfce/patches/Thunar.thunar-vfs-io-local.diff
new file mode 100644
index 00000000..7d92c3e4
--- /dev/null
+++ b/source/xap/xfce/patches/Thunar.thunar-vfs-io-local.diff
@@ -0,0 +1,20 @@
+--- thunar-vfs/thunar-vfs-io-local.c.old 2008-06-13 12:43:52.000000000 +0200
++++ thunar-vfs/thunar-vfs-io-local.c 2008-06-13 14:41:46.000000000 +0200
+@@ -301,7 +301,7 @@
+ }
+
+ /* check whether we have a hidden file here */
+- if ((s - (const guchar *) name) > 1 && (*name == '.' || *(s - 1) == '~'))
++ if ((s - (const guchar *) name) > 1 && (*name == '.' ))
+ info->flags = THUNAR_VFS_FILE_FLAGS_HIDDEN;
+ else
+ info->flags = THUNAR_VFS_FILE_FLAGS_NONE;
+@@ -1029,7 +1029,7 @@
+ info->display_name = g_strdup (name);
+
+ /* check if this is a hidden file now */
+- if (strlen (name) > 1 && (name[0] == '.' || name[strlen (name) - 1] == '~'))
++ if (strlen (name) > 1 && (name[0] == '.'))
+ info->flags |= THUNAR_VFS_FILE_FLAGS_HIDDEN;
+ else
+ info->flags &= ~THUNAR_VFS_FILE_FLAGS_HIDDEN;
diff --git a/source/xap/xfce/patches/fixup_comments_in_xfce-utils-Xft.xrdb.diff b/source/xap/xfce/patches/fixup_comments_in_xfce-utils-Xft.xrdb.diff
new file mode 100644
index 00000000..be64a2da
--- /dev/null
+++ b/source/xap/xfce/patches/fixup_comments_in_xfce-utils-Xft.xrdb.diff
@@ -0,0 +1,24 @@
+From b55be8ded0c7e1119eb062a5831b246b618c89e8 Mon Sep 17 00:00:00 2001
+From: Mike Massonnet <mmassonnet@gmail.com>
+Date: Thu, 8 Apr 2010 22:38:50 +0200
+Subject: [PATCH] use right comment character (! and not #) in Xft.xrdb file (bug 6314)
+
+ scripts/Xft.xrdb | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scripts/Xft.xrdb b/scripts/Xft.xrdb
+index af45361..cd26513 100644
+--- a/scripts/Xft.xrdb
++++ b/scripts/Xft.xrdb
+@@ -1,7 +1,7 @@
+-# Those are fallback settings, use the ui plugin to change it
+-# or add your overrides to ~/.Xresources
+-# Xft.hintstyle: hintnone/hintslight/hintmedium/hintfull
+-# Xft hinting: 1/0
++! Those are fallback settings, use the ui plugin to change it
++! or add your overrides to ~/.Xresources
++! Xft.hintstyle: hintnone/hintslight/hintmedium/hintfull
++! Xft hinting: 1/0
+
+ Xft.hinting: 1
+ Xft.hintstyle: hintmedium
diff --git a/source/xap/xfce/patches/mousepad-fix_find.diff b/source/xap/xfce/patches/mousepad-fix_find.diff
new file mode 100644
index 00000000..6477cd78
--- /dev/null
+++ b/source/xap/xfce/patches/mousepad-fix_find.diff
@@ -0,0 +1,43 @@
+commit a6383ccf4e3ba425ffb6489a795785e6a626c048
+Author: Nick Schermer <nick@xfce.org>
+Date: Tue Jul 6 17:53:54 2010 +0200
+
+ Also fix find (bug #6544).
+
+diff --git a/src/search.c b/src/search.c
+index 4fb1c5b..91f69cf 100644
+--- a/src/search.c
++++ b/src/search.c
+@@ -78,7 +78,7 @@ gboolean document_search_real(StructData *sd, gint direction)
+ static gint document_replace_real(StructData *sd)
+ {
+ GtkTextIter iter, match_start, match_end;
+- GtkTextMark *mark_init = NULL;
++ GtkTextMark *mark_init = NULL, *mark_start, *mark_end;
+ gboolean res;
+ gint num = 0;
+ GtkWidget *q_dialog = NULL;
+@@ -113,6 +113,11 @@ static gint document_replace_real(StructData *sd)
+ if (num == 0 && q_dialog == NULL)
+ q_dialog = create_dialog_message_question(
+ gtk_widget_get_toplevel(sd->mainwin->textview), _("Replace?"));
++
++ gtk_text_buffer_get_selection_bounds(textbuffer, &match_start, &match_end);
++ mark_start = gtk_text_buffer_create_mark(textbuffer, NULL, &match_start, FALSE);
++ mark_end = gtk_text_buffer_create_mark(textbuffer, NULL, &match_end, FALSE);
++
+ switch (gtk_dialog_run(GTK_DIALOG(q_dialog))) {
+ case GTK_RESPONSE_CANCEL:
+ res = 0;
+@@ -122,6 +127,11 @@ static gint document_replace_real(StructData *sd)
+ case GTK_RESPONSE_NO:
+ continue;
+ }
++
++ gtk_text_buffer_get_iter_at_mark(textbuffer, &match_start, mark_start);
++ gtk_text_buffer_get_iter_at_mark(textbuffer, &match_end, mark_end);
++ gtk_text_buffer_move_mark_by_name(textbuffer, "selection_bound", &match_start);
++ gtk_text_buffer_move_mark_by_name(textbuffer, "insert", &match_end);
+ }
+ gtk_text_buffer_delete_selection(textbuffer, TRUE, TRUE);
+ undo_set_sequency(TRUE);
diff --git a/source/xap/xfce/patches/mousepad-fix_find_and_replace.diff b/source/xap/xfce/patches/mousepad-fix_find_and_replace.diff
new file mode 100644
index 00000000..5db73b1e
--- /dev/null
+++ b/source/xap/xfce/patches/mousepad-fix_find_and_replace.diff
@@ -0,0 +1,36 @@
+commit 80819d447df5661ee6c9e9cd22f501cee612da8b
+Author: Lionel Le Folgoc <mrpouit@gmail.com>
+Date: Mon Jul 5 19:57:53 2010 +0200
+
+ Fix find and replace (bug #5831).
+
+diff --git a/src/search.c b/src/search.c
+index 07e29c7..4fb1c5b 100644
+--- a/src/search.c
++++ b/src/search.c
+@@ -210,8 +210,11 @@ gint run_dialog_find(StructData *sd)
+ G_CALLBACK(toggle_sensitivity), NULL);
+ g_signal_connect(G_OBJECT(entry_find), "delete-text",
+ G_CALLBACK(toggle_sensitivity), NULL);
+- if (sd->search.string_find)
++ if (sd->search.string_find) {
+ gtk_entry_set_text(GTK_ENTRY(entry_find), sd->search.string_find);
++ gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog),
++ GTK_RESPONSE_OK, TRUE);
++ }
+
+ gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
+ gtk_entry_set_activates_default(GTK_ENTRY(entry_find), TRUE);
+@@ -275,8 +278,11 @@ gint run_dialog_replace(StructData *sd)
+ G_CALLBACK(toggle_sensitivity), NULL);
+ g_signal_connect(G_OBJECT(entry_find), "delete-text",
+ G_CALLBACK(toggle_sensitivity), NULL);
+- if (sd->search.string_find)
++ if (sd->search.string_find) {
+ gtk_entry_set_text(GTK_ENTRY(entry_find), sd->search.string_find);
++ gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog),
++ GTK_RESPONSE_OK, TRUE);
++ }
+ label_replace = gtk_label_new_with_mnemonic(_("Re_place with: "));
+ gtk_misc_set_alignment(GTK_MISC(label_replace), 0, 0.5);
+ gtk_table_attach_defaults(GTK_TABLE(table), label_replace, 0, 1, 1, 2);
diff --git a/source/xap/xfce/patches/no_sensitive_panel_during_plugin_moves.patch b/source/xap/xfce/patches/no_sensitive_panel_during_plugin_moves.patch
new file mode 100644
index 00000000..6e5b4a9a
--- /dev/null
+++ b/source/xap/xfce/patches/no_sensitive_panel_during_plugin_moves.patch
@@ -0,0 +1,26 @@
+From 8ae5177d843802b49e90ecf801d8a4fac00b866a Mon Sep 17 00:00:00 2001
+From: Robby Workman <rworkman@slackware.com>
+Date: Tue, 22 Feb 2011 21:48:56 -0600
+Subject: [PATCH] panel/panel.c: Don't make panel insensitive during plugin moves
+
+This fixes http://bugzilla.xfce.org/show_bug.cgi?id=6818 while
+working around https://bugzilla.gnome.org/show_bug.cgi?id=634765
+---
+ panel/panel.c | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/panel/panel.c b/panel/panel.c
+index fa0709b..e7a9eac 100644
+--- a/panel/panel.c
++++ b/panel/panel.c
+@@ -811,7 +811,6 @@ _item_start_move (GtkWidget *item,
+
+ if (!priv->edit_mode)
+ {
+- panel_set_items_sensitive (p, FALSE);
+ xfce_itembar_raise_event_window (XFCE_ITEMBAR (priv->itembar));
+ panel_block_autohide (p);
+ }
+--
+1.7.4.1
+
diff --git a/source/xap/xfce/patches/terminal.gtk.2.18.fix.diff b/source/xap/xfce/patches/terminal.gtk.2.18.fix.diff
deleted file mode 100644
index 69a9e70e..00000000
--- a/source/xap/xfce/patches/terminal.gtk.2.18.fix.diff
+++ /dev/null
@@ -1,101 +0,0 @@
-From 028dc2efd846defe796c7fa097ed84818bb43431 Mon Sep 17 00:00:00 2001
-From: Nick Schermer <nick@xfce.org>
-Date: Sun, 21 Mar 2010 22:05:31 +0000
-Subject: Disconnect bindings before closing the dialog.
-
-This avoids possible problems when Gtk+ emits property
-changes before the widgets are destroyed. This is currently
-the case for text entries in some Gtk 2.18 releases.
----
-diff --git a/terminal/terminal-preferences-dialog.c b/terminal/terminal-preferences-dialog.c
-index 587bd92..8f33628 100644
---- a/terminal/terminal-preferences-dialog.c
-+++ b/terminal/terminal-preferences-dialog.c
-@@ -64,24 +64,28 @@ terminal_preferences_dialog_class_init (TerminalPreferencesDialogClass *klass)
-
-
- #define BIND_PROPERTIES(name, property) \
-- { object = gtk_builder_get_object (GTK_BUILDER (dialog), name); \
-+ G_STMT_START { \
-+ object = gtk_builder_get_object (GTK_BUILDER (dialog), name); \
- terminal_return_if_fail (G_IS_OBJECT (object)); \
-- exo_mutual_binding_new (G_OBJECT (dialog->preferences), name, \
-- G_OBJECT (object), property); }
-+ binding = exo_mutual_binding_new (G_OBJECT (dialog->preferences), name, \
-+ G_OBJECT (object), property); \
-+ dialog->bindings = g_slist_prepend (dialog->bindings, binding); \
-+ } G_STMT_END
-
-
-
- static void
- terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog)
- {
-- GError *error = NULL;
-- guint i;
-- GObject *object, *object2;
-- GtkWidget *editor;
-- gchar palette_name[16];
-- GtkFileFilter *filter;
-- gchar *file;
-- const gchar *props_active[] = { "title-mode", "command-login-shell",
-+ GError *error = NULL;
-+ guint i;
-+ GObject *object, *object2;
-+ GtkWidget *editor;
-+ gchar palette_name[16];
-+ GtkFileFilter *filter;
-+ gchar *file;
-+ ExoMutualBinding *binding;
-+ const gchar *props_active[] = { "title-mode", "command-login-shell",
- "command-update-records", "scrolling-single-line",
- "scrolling-on-output", "scrolling-on-keystroke",
- "scrolling-bar", "font-allow-bold",
-@@ -94,9 +98,9 @@ terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog)
- , "font-anti-alias"
- #endif
- };
-- const gchar *props_color[] = { "color-foreground", "color-cursor",
-- "color-background", "tab-activity-color",
-- "color-selection" };
-+ const gchar *props_color[] = { "color-foreground", "color-cursor",
-+ "color-background", "tab-activity-color",
-+ "color-selection" };
-
- dialog->preferences = terminal_preferences_get ();
-
-@@ -248,6 +252,8 @@ terminal_preferences_dialog_response (GtkWidget *widget,
- gint response,
- TerminalPreferencesDialog *dialog)
- {
-+ GSList *li;
-+
- /* check if we should open the user manual */
- if (G_UNLIKELY (response == 1))
- {
-@@ -256,6 +262,11 @@ terminal_preferences_dialog_response (GtkWidget *widget,
- }
- else
- {
-+ /* disconnect all the bindings */
-+ for (li = dialog->bindings; li != NULL; li = li->next)
-+ exo_mutual_binding_unbind (li->data);
-+ g_slist_free (dialog->bindings);
-+
- /* close the preferences dialog */
- gtk_widget_destroy (widget);
- }
-diff --git a/terminal/terminal-preferences-dialog.h b/terminal/terminal-preferences-dialog.h
-index b2db4f5..268d70a 100644
---- a/terminal/terminal-preferences-dialog.h
-+++ b/terminal/terminal-preferences-dialog.h
-@@ -48,6 +48,7 @@ struct _TerminalPreferencesDialog
-
- TerminalPreferences *preferences;
- guint signal_id;
-+ GSList *bindings;
- };
-
- GType terminal_preferences_dialog_get_type (void) G_GNUC_CONST;
---
-cgit v0.8.2.1
diff --git a/source/xap/xfce/patches/thunar-1.0.1-fixup_docdir.diff b/source/xap/xfce/patches/thunar-1.0.1-fixup_docdir.diff
deleted file mode 100644
index 52d076d9..00000000
--- a/source/xap/xfce/patches/thunar-1.0.1-fixup_docdir.diff
+++ /dev/null
@@ -1,360 +0,0 @@
-diff -Nur Thunar-1.0.1.orig/Makefile.in Thunar-1.0.1/Makefile.in
---- Thunar-1.0.1.orig/Makefile.in 2009-04-18 09:41:09.000000000 -0500
-+++ Thunar-1.0.1/Makefile.in 2009-07-20 19:36:55.895440657 -0500
-@@ -932,7 +932,7 @@
-
- ThunarHelp: ThunarHelp.in Makefile
- rm -f ThunarHelp.gen ThunarHelp
-- sed -e "s,\@datadir\@,$(datadir),g" \
-+ sed -e "s,\@htmldir\@,$(htmldir),g" \
- < $(srcdir)/ThunarHelp.in \
- > ThunarHelp.gen
- mv ThunarHelp.gen ThunarHelp
-diff -Nur Thunar-1.0.1.orig/ThunarHelp.in Thunar-1.0.1/ThunarHelp.in
---- Thunar-1.0.1.orig/ThunarHelp.in 2008-10-22 01:43:23.000000000 -0500
-+++ Thunar-1.0.1/ThunarHelp.in 2009-07-20 19:36:38.235721255 -0500
-@@ -19,7 +19,7 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #
-
--HELPDIR="@datadir@/doc/Thunar/html/"
-+HELPDIR="@htmldir@/"
-
- if test -n "$LC_ALL"; then
- LC=$LC_ALL
-diff -Nur Thunar-1.0.1.orig/docs/Makefile.in Thunar-1.0.1/docs/Makefile.in
---- Thunar-1.0.1.orig/docs/Makefile.in 2009-04-18 09:40:14.000000000 -0500
-+++ Thunar-1.0.1/docs/Makefile.in 2009-07-20 19:36:38.235721255 -0500
-@@ -292,7 +292,7 @@
- builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
--docdir = $(datadir)/doc/Thunar
-+docdir = @docdir@
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
-diff -Nur Thunar-1.0.1.orig/docs/manual/C/Makefile.in Thunar-1.0.1/docs/manual/C/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/C/Makefile.in 2009-04-18 09:40:19.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/C/Makefile.in 2009-07-20 19:36:38.235721255 -0500
-@@ -319,7 +319,7 @@
- SUBDIRS = \
- images
-
--TARGET_DIR = $(datadir)/doc/Thunar/html/C
-+TARGET_DIR = $(htmldir)/C
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
-
-diff -Nur Thunar-1.0.1.orig/docs/manual/C/images/Makefile.in Thunar-1.0.1/docs/manual/C/images/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/C/images/Makefile.in 2009-04-18 09:40:21.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/C/images/Makefile.in 2009-07-20 19:36:38.235721255 -0500
-@@ -313,7 +313,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/C/images
-+imagesdir = $(htmldir)/C/images
- images_DATA = \
- bulk-rename.png \
- file-manager-window.png \
-diff -Nur Thunar-1.0.1.orig/docs/manual/Makefile.in Thunar-1.0.1/docs/manual/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/Makefile.in 2009-04-18 09:40:22.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/Makefile.in 2009-07-20 19:36:38.235721255 -0500
-@@ -338,7 +338,7 @@
- tr \
- zh_TW
-
--cssdir = $(datadir)/doc/Thunar/html
-+cssdir = $(htmldir)
- css_DATA = \
- thunar.css
-
-diff -Nur Thunar-1.0.1.orig/docs/manual/da/Makefile.in Thunar-1.0.1/docs/manual/da/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/da/Makefile.in 2009-04-18 09:40:22.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/da/Makefile.in 2009-07-20 19:36:38.239694094 -0500
-@@ -317,7 +317,7 @@
- SUBDIRS = \
- images
-
--TARGET_DIR = $(datadir)/doc/Thunar/html/da
-+TARGET_DIR = $(htmldir)/da
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
-
-diff -Nur Thunar-1.0.1.orig/docs/manual/da/images/Makefile.in Thunar-1.0.1/docs/manual/da/images/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/da/images/Makefile.in 2009-04-18 09:40:24.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/da/images/Makefile.in 2009-07-20 19:36:38.239694094 -0500
-@@ -311,7 +311,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/da/images
-+imagesdir = $(htmldir)/da/images
- images_DATA = \
- bulk-rename.png \
- file-manager-window.png \
-diff -Nur Thunar-1.0.1.orig/docs/manual/es/Makefile.in Thunar-1.0.1/docs/manual/es/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/es/Makefile.in 2009-04-18 09:40:24.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/es/Makefile.in 2009-07-20 19:36:38.239694094 -0500
-@@ -319,7 +319,7 @@
- SUBDIRS = \
- images
-
--TARGET_DIR = $(datadir)/doc/Thunar/html/es
-+TARGET_DIR = $(htmldir)/es
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
-
-diff -Nur Thunar-1.0.1.orig/docs/manual/es/images/Makefile.in Thunar-1.0.1/docs/manual/es/images/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/es/images/Makefile.in 2009-04-18 09:40:25.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/es/images/Makefile.in 2009-07-20 19:36:38.239694094 -0500
-@@ -313,7 +313,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/es/images
-+imagesdir = $(htmldir)/es/images
- images_DATA = \
- bulk-rename.png \
- file-manager-window.png \
-diff -Nur Thunar-1.0.1.orig/docs/manual/eu/Makefile.in Thunar-1.0.1/docs/manual/eu/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/eu/Makefile.in 2009-04-18 09:40:25.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/eu/Makefile.in 2009-07-20 19:36:38.239694094 -0500
-@@ -319,7 +319,7 @@
- SUBDIRS = \
- images
-
--TARGET_DIR = $(datadir)/doc/Thunar/html/eu
-+TARGET_DIR = $(htmldir)/eu
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
-
-diff -Nur Thunar-1.0.1.orig/docs/manual/eu/images/Makefile.in Thunar-1.0.1/docs/manual/eu/images/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/eu/images/Makefile.in 2009-04-18 09:40:26.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/eu/images/Makefile.in 2009-07-20 19:36:38.239694094 -0500
-@@ -313,7 +313,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/eu/images
-+imagesdir = $(htmldir)/eu/images
- images_DATA = \
- bulk-rename.png \
- file-manager-window.png \
-diff -Nur Thunar-1.0.1.orig/docs/manual/fr/Makefile.in Thunar-1.0.1/docs/manual/fr/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/fr/Makefile.in 2009-04-18 09:40:26.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/fr/Makefile.in 2009-07-20 19:36:38.243692845 -0500
-@@ -319,7 +319,7 @@
- SUBDIRS = \
- images
-
--TARGET_DIR = $(datadir)/doc/Thunar/html/fr
-+TARGET_DIR = $(htmldir)/fr
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
-
-diff -Nur Thunar-1.0.1.orig/docs/manual/fr/images/Makefile.in Thunar-1.0.1/docs/manual/fr/images/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/fr/images/Makefile.in 2009-04-18 09:40:27.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/fr/images/Makefile.in 2009-07-20 19:36:38.243692845 -0500
-@@ -313,7 +313,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/fr/images
-+imagesdir = $(htmldir)/fr/images
- images_DATA = \
- bulk-rename.png \
- file-manager-window.png \
-diff -Nur Thunar-1.0.1.orig/docs/manual/gl/Makefile.in Thunar-1.0.1/docs/manual/gl/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/gl/Makefile.in 2009-04-18 09:40:27.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/gl/Makefile.in 2009-07-20 19:36:38.243692845 -0500
-@@ -319,7 +319,7 @@
- SUBDIRS = \
- images
-
--TARGET_DIR = $(datadir)/doc/Thunar/html/gl
-+TARGET_DIR = $(htmldir)/gl
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
-
-diff -Nur Thunar-1.0.1.orig/docs/manual/gl/images/Makefile.in Thunar-1.0.1/docs/manual/gl/images/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/gl/images/Makefile.in 2009-04-18 09:40:29.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/gl/images/Makefile.in 2009-07-20 19:36:38.243692845 -0500
-@@ -313,7 +313,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/C/images
-+imagesdir = $(htmldir)/C/images
- images_DATA = \
- bulk-rename.png \
- file-manager-window.png \
-diff -Nur Thunar-1.0.1.orig/docs/manual/it/Makefile.in Thunar-1.0.1/docs/manual/it/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/it/Makefile.in 2009-04-18 09:40:30.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/it/Makefile.in 2009-07-20 19:36:38.243692845 -0500
-@@ -317,7 +317,7 @@
- SUBDIRS = \
- images
-
--TARGET_DIR = $(datadir)/doc/Thunar/html/it
-+TARGET_DIR = $(htmldir)/it
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
-
-diff -Nur Thunar-1.0.1.orig/docs/manual/it/images/Makefile.in Thunar-1.0.1/docs/manual/it/images/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/it/images/Makefile.in 2009-04-18 09:40:31.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/it/images/Makefile.in 2009-07-20 19:36:38.243692845 -0500
-@@ -311,7 +311,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/it/images
-+imagesdir = $(htmldir)/it/images
- images_DATA = \
- bulk-rename.png \
- file-manager-window.png \
-diff -Nur Thunar-1.0.1.orig/docs/manual/ja/Makefile.in Thunar-1.0.1/docs/manual/ja/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/ja/Makefile.in 2009-04-18 09:40:32.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/ja/Makefile.in 2009-07-20 19:36:38.247717296 -0500
-@@ -319,7 +319,7 @@
- SUBDIRS = \
- images
-
--TARGET_DIR = $(datadir)/doc/Thunar/html/ja
-+TARGET_DIR = $(htmldir)/ja
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
-
-diff -Nur Thunar-1.0.1.orig/docs/manual/ja/images/Makefile.in Thunar-1.0.1/docs/manual/ja/images/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/ja/images/Makefile.in 2009-04-18 09:40:33.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/ja/images/Makefile.in 2009-07-20 19:36:38.247717296 -0500
-@@ -313,7 +313,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/ja/images
-+imagesdir = $(htmldir)/ja/images
- images_DATA = \
- bulk-rename.png \
- file-manager-window.png \
-diff -Nur Thunar-1.0.1.orig/docs/manual/nl/Makefile.in Thunar-1.0.1/docs/manual/nl/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/nl/Makefile.in 2009-04-18 09:40:34.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/nl/Makefile.in 2009-07-20 19:36:38.247717296 -0500
-@@ -319,7 +319,7 @@
- SUBDIRS = \
- images
-
--TARGET_DIR = $(datadir)/doc/Thunar/html/nl
-+TARGET_DIR = $(htmldir)/nl
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
-
-diff -Nur Thunar-1.0.1.orig/docs/manual/nl/images/Makefile.in Thunar-1.0.1/docs/manual/nl/images/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/nl/images/Makefile.in 2009-04-18 09:40:34.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/nl/images/Makefile.in 2009-07-20 19:36:38.247717296 -0500
-@@ -313,7 +313,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/nl/images
-+imagesdir = $(htmldir)/nl/images
- images_DATA = \
- bulk-rename.png \
- file-manager-window.png \
-diff -Nur Thunar-1.0.1.orig/docs/manual/pl/Makefile.in Thunar-1.0.1/docs/manual/pl/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/pl/Makefile.in 2009-04-18 09:40:34.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/pl/Makefile.in 2009-07-20 19:36:38.247717296 -0500
-@@ -319,7 +319,7 @@
- SUBDIRS = \
- images
-
--TARGET_DIR = $(datadir)/doc/Thunar/html/pl
-+TARGET_DIR = $(htmldir)/pl
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
-
-diff -Nur Thunar-1.0.1.orig/docs/manual/pl/images/Makefile.in Thunar-1.0.1/docs/manual/pl/images/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/pl/images/Makefile.in 2009-04-18 09:40:34.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/pl/images/Makefile.in 2009-07-20 19:36:38.247717296 -0500
-@@ -313,7 +313,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/pl/images
-+imagesdir = $(htmldir)/pl/images
- images_DATA = \
- bulk-rename.png \
- file-manager-window.png \
-diff -Nur Thunar-1.0.1.orig/docs/manual/ru/Makefile.in Thunar-1.0.1/docs/manual/ru/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/ru/Makefile.in 2009-04-18 09:40:35.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/ru/Makefile.in 2009-07-20 19:36:38.251717303 -0500
-@@ -319,7 +319,7 @@
- SUBDIRS = \
- images
-
--TARGET_DIR = $(datadir)/doc/Thunar/html/ru
-+TARGET_DIR = $(htmldir)/ru
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
-
-diff -Nur Thunar-1.0.1.orig/docs/manual/ru/images/Makefile.in Thunar-1.0.1/docs/manual/ru/images/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/ru/images/Makefile.in 2009-04-18 09:40:35.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/ru/images/Makefile.in 2009-07-20 19:36:38.251717303 -0500
-@@ -313,7 +313,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/ru/images
-+imagesdir = $(htmldir)/ru/images
- images_DATA = \
- bulk-rename.png \
- file-manager-window.png \
-diff -Nur Thunar-1.0.1.orig/docs/manual/tr/Makefile.in Thunar-1.0.1/docs/manual/tr/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/tr/Makefile.in 2009-04-18 09:40:35.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/tr/Makefile.in 2009-07-20 19:36:38.251717303 -0500
-@@ -317,7 +317,7 @@
- SUBDIRS = \
- images
-
--TARGET_DIR = $(datadir)/doc/Thunar/html/tr
-+TARGET_DIR = $(htmldir)/tr
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
-
-diff -Nur Thunar-1.0.1.orig/docs/manual/tr/images/Makefile.in Thunar-1.0.1/docs/manual/tr/images/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/tr/images/Makefile.in 2009-04-18 09:40:36.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/tr/images/Makefile.in 2009-07-20 19:36:38.251717303 -0500
-@@ -311,7 +311,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/tr/images
-+imagesdir = $(htmldir)/tr/images
- images_DATA = \
- bulk-rename.png \
- file-manager-window.png \
-diff -Nur Thunar-1.0.1.orig/docs/manual/zh_TW/Makefile.in Thunar-1.0.1/docs/manual/zh_TW/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/zh_TW/Makefile.in 2009-04-18 09:40:36.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/zh_TW/Makefile.in 2009-07-20 19:36:38.251717303 -0500
-@@ -319,7 +319,7 @@
- SUBDIRS = \
- images
-
--TARGET_DIR = $(datadir)/doc/Thunar/html/zh_TW
-+TARGET_DIR = $(htmldir)/zh_TW
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
-
-diff -Nur Thunar-1.0.1.orig/docs/manual/zh_TW/images/Makefile.in Thunar-1.0.1/docs/manual/zh_TW/images/Makefile.in
---- Thunar-1.0.1.orig/docs/manual/zh_TW/images/Makefile.in 2009-04-18 09:40:36.000000000 -0500
-+++ Thunar-1.0.1/docs/manual/zh_TW/images/Makefile.in 2009-07-20 19:36:38.251717303 -0500
-@@ -313,7 +313,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/zh_TW/images
-+imagesdir = $(htmldir)/zh_TW/images
- images_DATA = \
- bulk-rename.png \
- file-manager-window.png \
diff --git a/source/xap/xfce/patches/thunar-1.0.1-png14.diff b/source/xap/xfce/patches/thunar-1.0.1-png14.diff
deleted file mode 100644
index 6c67a407..00000000
--- a/source/xap/xfce/patches/thunar-1.0.1-png14.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./thunar-vfs/thunar-vfs-thumb.c.orig 2009-01-12 14:38:49.000000000 -0600
-+++ ./thunar-vfs/thunar-vfs-thumb.c 2010-02-12 13:24:33.000000000 -0600
-@@ -1169,7 +1169,7 @@
- goto done0;
-
- /* verify the png signature */
-- if (G_LIKELY (png_check_sig ((png_bytep) signature, sizeof (signature))))
-+ if (G_LIKELY (png_sig_cmp ((png_bytep) signature, 0, sizeof (signature)) == 0))
- rewind (fp);
- else
- goto done0;
diff --git a/source/xap/xfce/patches/thunar-1.0.2-fixup_docdir.diff b/source/xap/xfce/patches/thunar-1.0.2-fixup_docdir.diff
new file mode 100644
index 00000000..7315ecea
--- /dev/null
+++ b/source/xap/xfce/patches/thunar-1.0.2-fixup_docdir.diff
@@ -0,0 +1,384 @@
+diff -Nur Thunar-1.0.2.orig//Makefile.in Thunar-1.0.2/Makefile.in
+--- Thunar-1.0.2.orig//Makefile.in 2010-05-21 12:11:02.000000000 -0500
++++ Thunar-1.0.2/Makefile.in 2010-05-23 17:44:59.068552125 -0500
+@@ -1040,7 +1040,7 @@
+
+ ThunarHelp: ThunarHelp.in Makefile
+ rm -f ThunarHelp.gen ThunarHelp
+- sed -e "s,\@datadir\@,$(datadir),g" \
++ sed -e "s,\@htmldir\@,$(htmldir),g" \
+ < $(srcdir)/ThunarHelp.in \
+ > ThunarHelp.gen
+ mv ThunarHelp.gen ThunarHelp
+diff -Nur Thunar-1.0.2.orig//ThunarHelp.in Thunar-1.0.2/ThunarHelp.in
+--- Thunar-1.0.2.orig//ThunarHelp.in 2010-05-21 12:10:52.000000000 -0500
++++ Thunar-1.0.2/ThunarHelp.in 2010-05-23 17:45:26.207677481 -0500
+@@ -19,7 +19,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ #
+
+-HELPDIR="@datadir@/doc/Thunar/html/"
++HELPDIR="@htmldir@/"
+
+ if test -n "$LC_ALL"; then
+ LC=$LC_ALL
+diff -Nur Thunar-1.0.2.orig//docs/Makefile.in Thunar-1.0.2/docs/Makefile.in
+--- Thunar-1.0.2.orig//docs/Makefile.in 2010-05-21 12:10:57.000000000 -0500
++++ Thunar-1.0.2/docs/Makefile.in 2010-05-23 17:46:08.776567272 -0500
+@@ -322,7 +322,7 @@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-docdir = $(datadir)/doc/Thunar
++docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+diff -Nur Thunar-1.0.2.orig//docs/manual/C/Makefile.in Thunar-1.0.2/docs/manual/C/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/C/Makefile.in 2010-05-21 12:10:57.000000000 -0500
++++ Thunar-1.0.2/docs/manual/C/Makefile.in 2010-05-23 17:46:52.539542089 -0500
+@@ -336,7 +336,7 @@
+ SUBDIRS = \
+ images
+
+-TARGET_DIR = $(datadir)/doc/Thunar/html/C
++TARGET_DIR = $(htmldir)/C
+ STYLESHEET = ../thunar.xsl
+ DOCUMENT = Thunar.xml
+
+diff -Nur Thunar-1.0.2.orig//docs/manual/C/images/Makefile.in Thunar-1.0.2/docs/manual/C/images/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/C/images/Makefile.in 2010-05-21 12:10:57.000000000 -0500
++++ Thunar-1.0.2/docs/manual/C/images/Makefile.in 2010-05-23 17:47:25.359542363 -0500
+@@ -316,7 +316,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xfconf_query_found = @xfconf_query_found@
+-imagesdir = $(datadir)/doc/Thunar/html/C/images
++imagesdir = $(htmldir)/C/images
+ images_DATA = \
+ bulk-rename.png \
+ file-manager-window.png \
+diff -Nur Thunar-1.0.2.orig//docs/manual/Makefile.in Thunar-1.0.2/docs/manual/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/Makefile.in 2010-05-21 12:10:57.000000000 -0500
++++ Thunar-1.0.2/docs/manual/Makefile.in 2010-05-23 17:48:04.650570173 -0500
+@@ -370,7 +370,7 @@
+ tr \
+ zh_TW
+
+-cssdir = $(datadir)/doc/Thunar/html
++cssdir = $(htmldir)
+ css_DATA = \
+ thunar.css
+
+diff -Nur Thunar-1.0.2.orig//docs/manual/am/Makefile.in Thunar-1.0.2/docs/manual/am/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/am/Makefile.in 2010-05-21 12:10:58.000000000 -0500
++++ Thunar-1.0.2/docs/manual/am/Makefile.in 2010-05-23 17:48:35.304542671 -0500
+@@ -336,7 +336,7 @@
+ SUBDIRS = \
+ images
+
+-TARGET_DIR = $(datadir)/doc/Thunar/html/am
++TARGET_DIR = $(htmldir)/am
+ STYLESHEET = ../thunar.xsl
+ DOCUMENT = Thunar.xml
+
+diff -Nur Thunar-1.0.2.orig//docs/manual/am/images/Makefile.in Thunar-1.0.2/docs/manual/am/images/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/am/images/Makefile.in 2010-05-21 12:10:58.000000000 -0500
++++ Thunar-1.0.2/docs/manual/am/images/Makefile.in 2010-05-23 17:51:21.111542305 -0500
+@@ -316,7 +316,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xfconf_query_found = @xfconf_query_found@
+-imagesdir = $(datadir)/doc/Thunar/html/am/images
++imagesdir = $(htmldir)/am/images
+ images_DATA = \
+ bulk-rename.png \
+ file-manager-window.png \
+diff -Nur Thunar-1.0.2.orig//docs/manual/da/Makefile.in Thunar-1.0.2/docs/manual/da/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/da/Makefile.in 2010-05-21 12:10:58.000000000 -0500
++++ Thunar-1.0.2/docs/manual/da/Makefile.in 2010-05-23 17:48:52.108550193 -0500
+@@ -334,7 +334,7 @@
+ SUBDIRS = \
+ images
+
+-TARGET_DIR = $(datadir)/doc/Thunar/html/da
++TARGET_DIR = $(htmldir)/da
+ STYLESHEET = ../thunar.xsl
+ DOCUMENT = Thunar.xml
+
+diff -Nur Thunar-1.0.2.orig//docs/manual/da/images/Makefile.in Thunar-1.0.2/docs/manual/da/images/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/da/images/Makefile.in 2010-05-21 12:10:58.000000000 -0500
++++ Thunar-1.0.2/docs/manual/da/images/Makefile.in 2010-05-23 17:51:27.753542103 -0500
+@@ -314,7 +314,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xfconf_query_found = @xfconf_query_found@
+-imagesdir = $(datadir)/doc/Thunar/html/da/images
++imagesdir = $(htmldir)/da/images
+ images_DATA = \
+ bulk-rename.png \
+ file-manager-window.png \
+diff -Nur Thunar-1.0.2.orig//docs/manual/es/Makefile.in Thunar-1.0.2/docs/manual/es/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/es/Makefile.in 2010-05-21 12:10:58.000000000 -0500
++++ Thunar-1.0.2/docs/manual/es/Makefile.in 2010-05-23 17:48:58.300552519 -0500
+@@ -336,7 +336,7 @@
+ SUBDIRS = \
+ images
+
+-TARGET_DIR = $(datadir)/doc/Thunar/html/es
++TARGET_DIR = $(htmldir)/es
+ STYLESHEET = ../thunar.xsl
+ DOCUMENT = Thunar.xml
+
+diff -Nur Thunar-1.0.2.orig//docs/manual/es/images/Makefile.in Thunar-1.0.2/docs/manual/es/images/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/es/images/Makefile.in 2010-05-21 12:10:58.000000000 -0500
++++ Thunar-1.0.2/docs/manual/es/images/Makefile.in 2010-05-23 17:51:34.373542961 -0500
+@@ -316,7 +316,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xfconf_query_found = @xfconf_query_found@
+-imagesdir = $(datadir)/doc/Thunar/html/es/images
++imagesdir = $(htmldir)/es/images
+ images_DATA = \
+ bulk-rename.png \
+ file-manager-window.png \
+diff -Nur Thunar-1.0.2.orig//docs/manual/eu/Makefile.in Thunar-1.0.2/docs/manual/eu/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/eu/Makefile.in 2010-05-21 12:10:58.000000000 -0500
++++ Thunar-1.0.2/docs/manual/eu/Makefile.in 2010-05-23 17:49:05.977677434 -0500
+@@ -336,7 +336,7 @@
+ SUBDIRS = \
+ images
+
+-TARGET_DIR = $(datadir)/doc/Thunar/html/eu
++TARGET_DIR = $(htmldir)/eu
+ STYLESHEET = ../thunar.xsl
+ DOCUMENT = Thunar.xml
+
+diff -Nur Thunar-1.0.2.orig//docs/manual/eu/images/Makefile.in Thunar-1.0.2/docs/manual/eu/images/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/eu/images/Makefile.in 2010-05-21 12:10:58.000000000 -0500
++++ Thunar-1.0.2/docs/manual/eu/images/Makefile.in 2010-05-23 17:51:42.643542360 -0500
+@@ -316,7 +316,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xfconf_query_found = @xfconf_query_found@
+-imagesdir = $(datadir)/doc/Thunar/html/eu/images
++imagesdir = $(htmldir)/eu/images
+ images_DATA = \
+ bulk-rename.png \
+ file-manager-window.png \
+diff -Nur Thunar-1.0.2.orig//docs/manual/fr/Makefile.in Thunar-1.0.2/docs/manual/fr/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/fr/Makefile.in 2010-05-21 12:10:58.000000000 -0500
++++ Thunar-1.0.2/docs/manual/fr/Makefile.in 2010-05-23 17:49:12.495542046 -0500
+@@ -336,7 +336,7 @@
+ SUBDIRS = \
+ images
+
+-TARGET_DIR = $(datadir)/doc/Thunar/html/fr
++TARGET_DIR = $(htmldir)/fr
+ STYLESHEET = ../thunar.xsl
+ DOCUMENT = Thunar.xml
+
+diff -Nur Thunar-1.0.2.orig//docs/manual/fr/images/Makefile.in Thunar-1.0.2/docs/manual/fr/images/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/fr/images/Makefile.in 2010-05-21 12:10:58.000000000 -0500
++++ Thunar-1.0.2/docs/manual/fr/images/Makefile.in 2010-05-23 17:51:51.116702819 -0500
+@@ -316,7 +316,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xfconf_query_found = @xfconf_query_found@
+-imagesdir = $(datadir)/doc/Thunar/html/fr/images
++imagesdir = $(htmldir)/fr/images
+ images_DATA = \
+ bulk-rename.png \
+ file-manager-window.png \
+diff -Nur Thunar-1.0.2.orig//docs/manual/gl/Makefile.in Thunar-1.0.2/docs/manual/gl/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/gl/Makefile.in 2010-05-21 12:10:58.000000000 -0500
++++ Thunar-1.0.2/docs/manual/gl/Makefile.in 2010-05-23 17:49:19.882542284 -0500
+@@ -336,7 +336,7 @@
+ SUBDIRS = \
+ images
+
+-TARGET_DIR = $(datadir)/doc/Thunar/html/gl
++TARGET_DIR = $(htmldir)/gl
+ STYLESHEET = ../thunar.xsl
+ DOCUMENT = Thunar.xml
+
+diff -Nur Thunar-1.0.2.orig//docs/manual/gl/images/Makefile.in Thunar-1.0.2/docs/manual/gl/images/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/gl/images/Makefile.in 2010-05-21 12:10:58.000000000 -0500
++++ Thunar-1.0.2/docs/manual/gl/images/Makefile.in 2010-05-23 17:51:57.596588720 -0500
+@@ -316,7 +316,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xfconf_query_found = @xfconf_query_found@
+-imagesdir = $(datadir)/doc/Thunar/html/gl/images
++imagesdir = $(htmldir)/gl/images
+ images_DATA = \
+ bulk-rename.png \
+ file-manager-window.png \
+diff -Nur Thunar-1.0.2.orig//docs/manual/it/Makefile.in Thunar-1.0.2/docs/manual/it/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/it/Makefile.in 2010-05-21 12:10:58.000000000 -0500
++++ Thunar-1.0.2/docs/manual/it/Makefile.in 2010-05-23 17:49:27.597676807 -0500
+@@ -334,7 +334,7 @@
+ SUBDIRS = \
+ images
+
+-TARGET_DIR = $(datadir)/doc/Thunar/html/it
++TARGET_DIR = $(htmldir)/it
+ STYLESHEET = ../thunar.xsl
+ DOCUMENT = Thunar.xml
+
+diff -Nur Thunar-1.0.2.orig//docs/manual/it/images/Makefile.in Thunar-1.0.2/docs/manual/it/images/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/it/images/Makefile.in 2010-05-21 12:10:58.000000000 -0500
++++ Thunar-1.0.2/docs/manual/it/images/Makefile.in 2010-05-23 17:52:05.152568701 -0500
+@@ -314,7 +314,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xfconf_query_found = @xfconf_query_found@
+-imagesdir = $(datadir)/doc/Thunar/html/it/images
++imagesdir = $(htmldir)/it/images
+ images_DATA = \
+ bulk-rename.png \
+ file-manager-window.png \
+diff -Nur Thunar-1.0.2.orig//docs/manual/ja/Makefile.in Thunar-1.0.2/docs/manual/ja/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/ja/Makefile.in 2010-05-21 12:10:59.000000000 -0500
++++ Thunar-1.0.2/docs/manual/ja/Makefile.in 2010-05-23 17:49:35.728552141 -0500
+@@ -336,7 +336,7 @@
+ SUBDIRS = \
+ images
+
+-TARGET_DIR = $(datadir)/doc/Thunar/html/ja
++TARGET_DIR = $(htmldir)/ja
+ STYLESHEET = ../thunar.xsl
+ DOCUMENT = Thunar.xml
+
+diff -Nur Thunar-1.0.2.orig//docs/manual/ja/images/Makefile.in Thunar-1.0.2/docs/manual/ja/images/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/ja/images/Makefile.in 2010-05-21 12:10:59.000000000 -0500
++++ Thunar-1.0.2/docs/manual/ja/images/Makefile.in 2010-05-23 17:52:13.534542157 -0500
+@@ -316,7 +316,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xfconf_query_found = @xfconf_query_found@
+-imagesdir = $(datadir)/doc/Thunar/html/ja/images
++imagesdir = $(htmldir)/ja/images
+ images_DATA = \
+ bulk-rename.png \
+ file-manager-window.png \
+diff -Nur Thunar-1.0.2.orig//docs/manual/nl/Makefile.in Thunar-1.0.2/docs/manual/nl/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/nl/Makefile.in 2010-05-21 12:10:59.000000000 -0500
++++ Thunar-1.0.2/docs/manual/nl/Makefile.in 2010-05-23 17:49:42.981677782 -0500
+@@ -336,7 +336,7 @@
+ SUBDIRS = \
+ images
+
+-TARGET_DIR = $(datadir)/doc/Thunar/html/nl
++TARGET_DIR = $(htmldir)/nl
+ STYLESHEET = ../thunar.xsl
+ DOCUMENT = Thunar.xml
+
+diff -Nur Thunar-1.0.2.orig//docs/manual/nl/images/Makefile.in Thunar-1.0.2/docs/manual/nl/images/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/nl/images/Makefile.in 2010-05-21 12:10:59.000000000 -0500
++++ Thunar-1.0.2/docs/manual/nl/images/Makefile.in 2010-05-23 17:52:19.353553300 -0500
+@@ -316,7 +316,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xfconf_query_found = @xfconf_query_found@
+-imagesdir = $(datadir)/doc/Thunar/html/nl/images
++imagesdir = $(htmldir)/nl/images
+ images_DATA = \
+ bulk-rename.png \
+ file-manager-window.png \
+diff -Nur Thunar-1.0.2.orig//docs/manual/pl/Makefile.in Thunar-1.0.2/docs/manual/pl/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/pl/Makefile.in 2010-05-21 12:10:59.000000000 -0500
++++ Thunar-1.0.2/docs/manual/pl/Makefile.in 2010-05-23 17:49:51.863542378 -0500
+@@ -336,7 +336,7 @@
+ SUBDIRS = \
+ images
+
+-TARGET_DIR = $(datadir)/doc/Thunar/html/pl
++TARGET_DIR = $(htmldir)/pl
+ STYLESHEET = ../thunar.xsl
+ DOCUMENT = Thunar.xml
+
+diff -Nur Thunar-1.0.2.orig//docs/manual/pl/images/Makefile.in Thunar-1.0.2/docs/manual/pl/images/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/pl/images/Makefile.in 2010-05-21 12:10:59.000000000 -0500
++++ Thunar-1.0.2/docs/manual/pl/images/Makefile.in 2010-05-23 17:52:27.285677594 -0500
+@@ -316,7 +316,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xfconf_query_found = @xfconf_query_found@
+-imagesdir = $(datadir)/doc/Thunar/html/pl/images
++imagesdir = $(htmldir)/pl/images
+ images_DATA = \
+ bulk-rename.png \
+ file-manager-window.png \
+diff -Nur Thunar-1.0.2.orig//docs/manual/ru/Makefile.in Thunar-1.0.2/docs/manual/ru/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/ru/Makefile.in 2010-05-21 12:10:59.000000000 -0500
++++ Thunar-1.0.2/docs/manual/ru/Makefile.in 2010-05-23 17:49:59.951552903 -0500
+@@ -336,7 +336,7 @@
+ SUBDIRS = \
+ images
+
+-TARGET_DIR = $(datadir)/doc/Thunar/html/ru
++TARGET_DIR = $(htmldir)/ru
+ STYLESHEET = ../thunar.xsl
+ DOCUMENT = Thunar.xml
+
+diff -Nur Thunar-1.0.2.orig//docs/manual/ru/images/Makefile.in Thunar-1.0.2/docs/manual/ru/images/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/ru/images/Makefile.in 2010-05-21 12:10:59.000000000 -0500
++++ Thunar-1.0.2/docs/manual/ru/images/Makefile.in 2010-05-23 17:52:33.673677284 -0500
+@@ -316,7 +316,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xfconf_query_found = @xfconf_query_found@
+-imagesdir = $(datadir)/doc/Thunar/html/ru/images
++imagesdir = $(htmldir)/ru/images
+ images_DATA = \
+ bulk-rename.png \
+ file-manager-window.png \
+diff -Nur Thunar-1.0.2.orig//docs/manual/tr/Makefile.in Thunar-1.0.2/docs/manual/tr/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/tr/Makefile.in 2010-05-21 12:10:59.000000000 -0500
++++ Thunar-1.0.2/docs/manual/tr/Makefile.in 2010-05-23 17:50:08.415553080 -0500
+@@ -334,7 +334,7 @@
+ SUBDIRS = \
+ images
+
+-TARGET_DIR = $(datadir)/doc/Thunar/html/tr
++TARGET_DIR = $(htmldir)/tr
+ STYLESHEET = ../thunar.xsl
+ DOCUMENT = Thunar.xml
+
+diff -Nur Thunar-1.0.2.orig//docs/manual/tr/images/Makefile.in Thunar-1.0.2/docs/manual/tr/images/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/tr/images/Makefile.in 2010-05-21 12:10:59.000000000 -0500
++++ Thunar-1.0.2/docs/manual/tr/images/Makefile.in 2010-05-23 17:52:40.320542409 -0500
+@@ -314,7 +314,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xfconf_query_found = @xfconf_query_found@
+-imagesdir = $(datadir)/doc/Thunar/html/tr/images
++imagesdir = $(htmldir)/tr/images
+ images_DATA = \
+ bulk-rename.png \
+ file-manager-window.png \
+diff -Nur Thunar-1.0.2.orig//docs/manual/zh_TW/Makefile.in Thunar-1.0.2/docs/manual/zh_TW/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/zh_TW/Makefile.in 2010-05-21 12:10:59.000000000 -0500
++++ Thunar-1.0.2/docs/manual/zh_TW/Makefile.in 2010-05-23 17:50:20.989569041 -0500
+@@ -336,7 +336,7 @@
+ SUBDIRS = \
+ images
+
+-TARGET_DIR = $(datadir)/doc/Thunar/html/zh_TW
++TARGET_DIR = $(htmldir)/zh_TW
+ STYLESHEET = ../thunar.xsl
+ DOCUMENT = Thunar.xml
+
+diff -Nur Thunar-1.0.2.orig//docs/manual/zh_TW/images/Makefile.in Thunar-1.0.2/docs/manual/zh_TW/images/Makefile.in
+--- Thunar-1.0.2.orig//docs/manual/zh_TW/images/Makefile.in 2010-05-21 12:10:59.000000000 -0500
++++ Thunar-1.0.2/docs/manual/zh_TW/images/Makefile.in 2010-05-23 17:52:47.172552372 -0500
+@@ -316,7 +316,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xfconf_query_found = @xfconf_query_found@
+-imagesdir = $(datadir)/doc/Thunar/html/zh_TW/images
++imagesdir = $(htmldir)/zh_TW/images
+ images_DATA = \
+ bulk-rename.png \
+ file-manager-window.png \
diff --git a/source/xap/xfce/patches/thunar-fix_umask_properly.diff b/source/xap/xfce/patches/thunar-fix_umask_properly.diff
deleted file mode 100644
index 2070b580..00000000
--- a/source/xap/xfce/patches/thunar-fix_umask_properly.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-commit eb58c6a6ba7f77c2c16016db064524df598ef421
-Author: Jannis Pohlmann <jannis@xfce.org>
-Date: Sat Oct 3 11:49:41 2009 +0200
-
- Fix bugs #3532 (umask < 0022 not honoured) and #5813 properly (I hope).
-
- The previous patch applied in e53de71e6add9b28ba034111a1d19db7def8f7e7
- made things worse than before: it used DEFFILEMODE which seems to be
- BSD-specific for creating files. It also reset the umask to 0 when
- creating the first directory with _thunar_vfs_io_jobs_mkdir().
-
- What we really want is to use 0777 (dirs) and 0666 (files) and let the
- standard C system calls like open() apply the umask value. This should
- work on all POSIX-compliant systems.
-
- Patch provided by Craig Ringer <craig@postnewspapers.com.au>.
-
-diff --git a/thunar-vfs/thunar-vfs-io-jobs.c b/thunar-vfs/thunar-vfs-io-jobs.c
-index 8d70812..c94523a 100644
---- a/thunar-vfs/thunar-vfs-io-jobs.c
-+++ b/thunar-vfs/thunar-vfs-io-jobs.c
-@@ -432,8 +432,12 @@ _thunar_vfs_io_jobs_create (ThunarVfsJob *job,
- absolute_path = thunar_vfs_path_dup_string (lp->data);
-
- again:
-- /* try to create the file at the given path */
-- fd = g_open (absolute_path, O_CREAT | O_EXCL | O_WRONLY, DEFFILEMODE);
-+ /* Try to create the file at the given path.
-+ *
-+ * Note that despite the 0666 mask, we won't really create a world-writable
-+ * file unless the user's umask permits it (ie the umask is 0000).
-+ */
-+ fd = g_open (absolute_path, O_CREAT | O_EXCL | O_WRONLY, 0666);
- if (G_UNLIKELY (fd < 0))
- {
- /* check if the file already exists */
-@@ -707,8 +711,13 @@ _thunar_vfs_io_jobs_mkdir (ThunarVfsJob *job,
- /* update the progress information */
- _thunar_vfs_job_process_path (job, lp);
-
-- /* try to create the target directory */
-- if (!_thunar_vfs_io_ops_mkdir (lp->data, 0777 & ~umask(0), THUNAR_VFS_IO_OPS_NONE, error))
-+ /* try to create the target directory
-+ *
-+ * Note that the mode specified here is limited by the user's umask, so we will not
-+ * actually be creating a world writable directory unless the user's umask permits
-+ * it.
-+ */
-+ if (!_thunar_vfs_io_ops_mkdir (lp->data, 0777, THUNAR_VFS_IO_OPS_NONE, error))
- return FALSE;
- }
-
diff --git a/source/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff b/source/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff
new file mode 100644
index 00000000..fde47a9e
--- /dev/null
+++ b/source/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff
@@ -0,0 +1,11 @@
+diff -Nur xfce-utils-4.6.2.orig//scripts/xinitrc.in.in xfce-utils-4.6.2/scripts/xinitrc.in.in
+--- xfce-utils-4.6.2.orig//scripts/xinitrc.in.in 2010-05-21 11:56:26.000000000 -0500
++++ xfce-utils-4.6.2/scripts/xinitrc.in.in 2011-03-09 22:56:18.687297854 -0600
+@@ -97,6 +97,7 @@
+ cat /dev/null $XRESOURCES | xrdb -nocpp -merge -
+
+ # load local modmap
++test -r /etc/X11/xinit/.Xmodmap && xmodmap /etc/X11/xinit/.Xmodmap
+ test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
+
+ # Launch xscreensaver (if available), but only as non-root user
diff --git a/source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff b/source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff
index a8d5b2a5..206f6607 100644
--- a/source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff
+++ b/source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff
@@ -1,11 +1,15 @@
--- ./scripts/xinitrc.in.in.orig 2009-04-09 18:21:13.000000000 -0500
-+++ ./scripts/xinitrc.in.in 2010-05-06 03:06:02.000000000 -0500
-@@ -131,7 +131,7 @@
++++ ./scripts/xinitrc.in.in 2010-06-18 11:33:37.000000000 -0500
+@@ -131,7 +131,11 @@
x|xno*)
;;
*)
- $xfcesm
-+ ck-launch-session $xfcesm
++ if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
++ ck-launch-session $xfcesm
++ else
++ $xfcesm
++ fi
if test $kill_sshagent -eq 1; then
eval `$sshagent -k`
diff --git a/source/xap/xfce/patches/xfce4-settings.libxklavier5.diff b/source/xap/xfce/patches/xfce4-settings.libxklavier5.diff
deleted file mode 100644
index d5f8ed8c..00000000
--- a/source/xap/xfce/patches/xfce4-settings.libxklavier5.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./dialogs/keyboard-settings/xfce-keyboard-settings.c.orig 2010-01-02 07:31:06.000000000 -0600
-+++ ./dialogs/keyboard-settings/xfce-keyboard-settings.c 2010-02-12 02:11:05.000000000 -0600
-@@ -457,7 +457,7 @@
-
- #ifdef HAVE_LIBXKLAVIER
- /* Stop xklavier engine */
-- xkl_engine_stop_listen (settings->priv->xkl_engine);
-+ xkl_engine_stop_listen (settings->priv->xkl_engine, XKLL_TRACK_KEYBOARD_STATE);
- #endif /* HAVE_LIBXKLAVIER */
-
- g_object_unref (settings->priv->provider);
diff --git a/source/xap/xfce/patches/xfsm-compat-kde.c-start-kde4-services.diff b/source/xap/xfce/patches/xfsm-compat-kde.c-start-kde4-services.diff
new file mode 100644
index 00000000..9c54cf9a
--- /dev/null
+++ b/source/xap/xfce/patches/xfsm-compat-kde.c-start-kde4-services.diff
@@ -0,0 +1,49 @@
+From 51ee1e872e8671bf439e5d391b86432904cbc5ef Mon Sep 17 00:00:00 2001
+From: Robby Workman <rworkman@slackware.com>
+Date: Sun, 6 Mar 2011 23:55:35 -0600
+Subject: [PATCH] xfsm-compat-kde.c: Start KDE4 services instead of KDE3
+
+---
+ xfce4-session/xfsm-compat-kde.c | 10 ++++------
+ 1 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/xfce4-session/xfsm-compat-kde.c b/xfce4-session/xfsm-compat-kde.c
+index ced6ece..b51387e 100644
+--- a/xfce4-session/xfsm-compat-kde.c
++++ b/xfce4-session/xfsm-compat-kde.c
+@@ -123,10 +123,10 @@ xfsm_compat_kde_startup (XfsmSplashScreen *splash)
+ if (G_LIKELY (splash != NULL))
+ xfsm_splash_screen_next (splash, _("Starting KDE services"));
+
+- run ("kdeinit");
++ run ("kdeinit4");
+
+ /* tell klauncher about the session manager */
+- g_snprintf (command, 256, "dcop klauncher klauncher setLaunchEnv "
++ g_snprintf (command, 256, "qdbus org.kde.klauncher /KLauncher setLaunchEnv "
+ "SESSION_MANAGER \"%s\"",
+ g_getenv ("SESSION_MANAGER"));
+ run (command);
+@@ -134,7 +134,7 @@ xfsm_compat_kde_startup (XfsmSplashScreen *splash)
+ /* tell kde if we are running multi-head */
+ if (gdk_display_get_n_screens (gdk_display_get_default ()) > 1)
+ {
+- g_snprintf (command, 256, "dcop klauncher klauncher setLaunchEnv "
++ g_snprintf (command, 256, "qdbus org.kde.klauncher /KLauncher setLaunchEnv "
+ "KDE_MULTIHEAD \"true\"");
+ run (command);
+ }
+@@ -150,9 +150,7 @@ xfsm_compat_kde_shutdown (void)
+ return;
+
+ /* shutdown KDE services */
+- run ("kdeinit_shutdown");
+- run ("dcopserver_shutdown");
+- run ("artsshell -q terminate");
++ run ("kdeinit4_shutdown");
+
+ kde_compat_started = FALSE;
+ }
+--
+1.7.4.1
+