Slackware 14.0slackware-14.0

Wed Sep 26 01:10:42 UTC 2012
Slackware 14.0 x86_64 stable is released!

We're perfectionists here at Slackware, so this release has been a long
time a-brewing.  But we think you'll agree that it was worth the wait.
Slackware 14.0 combines modern components, ease of use, and flexible
configuration... our "KISS" philosophy demands it.

The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
project by picking up a copy from store.slackware.com.  We're taking
pre-orders now, and offer a discount if you sign up for a subscription.

Thanks to everyone who helped make this happen.  The Slackware team, the
upstream developers, and (of course) the awesome Slackware user
community.

Have fun!  :-)

11 files changed, 0 insertions, 628 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
deleted file mode 100644
index 7d92c3e4d..000000000
--- a/source/xap/xfce/patches/Thunar.thunar-vfs-io-local.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
deleted file mode 100644
index be64a2da6..000000000
--- a/source/xap/xfce/patches/fixup_comments_in_xfce-utils-Xft.xrdb.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 6477cd78b..000000000
--- a/source/xap/xfce/patches/mousepad-fix_find.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-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
deleted file mode 100644
index 5db73b1e2..000000000
--- a/source/xap/xfce/patches/mousepad-fix_find_and_replace.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-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
deleted file mode 100644
index 6e5b4a9a6..000000000
--- a/source/xap/xfce/patches/no_sensitive_panel_during_plugin_moves.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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/thunar-1.0.2-fixup_docdir.diff b/source/xap/xfce/patches/thunar-1.0.2-fixup_docdir.diff
deleted file mode 100644
index 7315ecea5..000000000
--- a/source/xap/xfce/patches/thunar-1.0.2-fixup_docdir.diff
+++ /dev/null
@@ -1,384 +0,0 @@
-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/xfcalendar.desktop.in.diff b/source/xap/xfce/patches/xfcalendar.desktop.in.diff
deleted file mode 100644
index d88267815..000000000
--- a/source/xap/xfce/patches/xfcalendar.desktop.in.diff
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/xfcalendar.desktop.in	2009-03-01 10:13:10.349305702 -0600
-+++ b/xfcalendar.desktop.in	2009-03-01 10:13:29.564307721 -0600
-@@ -10,4 +10,5 @@
- Terminal=false
- Type=Application
- Categories=X-XFCE;Office;Calendar;GTK;
-+OnlyShowIn=XFCE;
- _GenericName=Calendar
-
diff --git a/source/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff b/source/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff
deleted file mode 100644
index fde47a9e8..000000000
--- a/source/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644
index 206f6607a..000000000
--- a/source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./scripts/xinitrc.in.in.orig	2009-04-09 18:21:13.000000000 -0500
-+++ ./scripts/xinitrc.in.in	2010-06-18 11:33:37.000000000 -0500
-@@ -131,7 +131,11 @@
- 	x|xno*)
- 		;;
- 	*)
--		$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/xfdesktop-fix_education_icon.diff b/source/xap/xfce/patches/xfdesktop-fix_education_icon.diff
deleted file mode 100644
index 56a340608..000000000
--- a/source/xap/xfce/patches/xfdesktop-fix_education_icon.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur xfdesktop-4.6.1.orig/modules/menu/directory-data/xfce-education.directory.in xfdesktop-4.6.1/modules/menu/directory-data/xfce-education.directory.in
---- xfdesktop-4.6.1.orig/modules/menu/directory-data/xfce-education.directory.in	2009-01-12 16:03:19.000000000 -0600
-+++ xfdesktop-4.6.1/modules/menu/directory-data/xfce-education.directory.in	2009-07-31 01:04:29.029467762 -0500
-@@ -2,6 +2,6 @@
- Version=1.0
- Encoding=UTF-8
- Type=Directory
--Icon=
-+Icon=applications-education
- _Name=Education
- _Comment=Educational software
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
deleted file mode 100644
index 9c54cf9a7..000000000
--- a/source/xap/xfce/patches/xfsm-compat-kde.c-start-kde4-services.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-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
-