summaryrefslogtreecommitdiff
path: root/source/xap/xfce
diff options
context:
space:
mode:
Diffstat (limited to 'source/xap/xfce')
-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/thunar-1.0.2-fixup_docdir.diff384
-rw-r--r--source/xap/xfce/patches/xfcalendar.desktop.in.diff9
-rw-r--r--source/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff11
-rw-r--r--source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff15
-rw-r--r--source/xap/xfce/patches/xfdesktop-fix_education_icon.diff11
-rw-r--r--source/xap/xfce/patches/xfsm-compat-kde.c-start-kde4-services.diff49
-rwxr-xr-xsource/xap/xfce/profile.d/xfce.csh6
-rwxr-xr-xsource/xap/xfce/profile.d/xfce.sh7
-rw-r--r--source/xap/xfce/slack-desc19
-rwxr-xr-xsource/xap/xfce/xfce.SlackBuild248
15 files changed, 0 insertions, 908 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 7d92c3e4..00000000
--- 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 be64a2da..00000000
--- 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 6477cd78..00000000
--- 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 5db73b1e..00000000
--- 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 6e5b4a9a..00000000
--- 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 7315ecea..00000000
--- 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 d8826781..00000000
--- 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 fde47a9e..00000000
--- 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 206f6607..00000000
--- 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 56a34060..00000000
--- 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 9c54cf9a..00000000
--- 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
-
diff --git a/source/xap/xfce/profile.d/xfce.csh b/source/xap/xfce/profile.d/xfce.csh
deleted file mode 100755
index ccc2b8f1..00000000
--- a/source/xap/xfce/profile.d/xfce.csh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/csh
-if ( $?XDG_CONFIG_DIRS ) then
- setenv XDG_CONFIG_DIRS ${XDG_CONFIG_DIRS}:/etc/xfce/xdg
-else
- setenv XDG_CONFIG_DIRS /etc/xdg:/etc/xfce/xdg
-endif
diff --git a/source/xap/xfce/profile.d/xfce.sh b/source/xap/xfce/profile.d/xfce.sh
deleted file mode 100755
index adb187c1..00000000
--- a/source/xap/xfce/profile.d/xfce.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-if [ ! "$XDG_CONFIG_DIRS" = "" ]; then
- XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/etc/xfce/xdg
-else
- XDG_CONFIG_DIRS=/etc/xdg:/etc/xfce/xdg
-fi
-export XDG_CONFIG_DIRS
diff --git a/source/xap/xfce/slack-desc b/source/xap/xfce/slack-desc
deleted file mode 100644
index ecedf010..00000000
--- a/source/xap/xfce/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
- |-----handy-ruler------------------------------------------------------|
-xfce: xfce (a fast and lightweight desktop environment for X)
-xfce:
-xfce: Xfce is a fast and lightweight desktop environment that is both
-xfce: visually appealing and easy to use.
-xfce:
-xfce: For more information, see: http://www.xfce.org
-xfce:
-xfce: Xfce was developed by Olivier Fourdan.
-xfce:
-xfce:
-xfce:
diff --git a/source/xap/xfce/xfce.SlackBuild b/source/xap/xfce/xfce.SlackBuild
deleted file mode 100755
index aaa38f99..00000000
--- a/source/xap/xfce/xfce.SlackBuild
+++ /dev/null
@@ -1,248 +0,0 @@
-#!/bin/sh
-
-# Copyright 2003 Slackware Linux, Inc., Concord, CA, USA
-# Copyright 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-VERSION=4.6.2
-BUILD=${BUILD:-5}
-
-# A few tarballs have different versions; handle them here
-XDT_VERS=4.8.0 # xfce4-dev-tools version
-# We're going to ship xdt from xfce-4.8 since it's not used for building
-# release tarballs anyway, but it's handy to have around for building from
-# git, and some folks might want to do that later...
-EXO_VERS=0.3.107 # exo version
-THUNAR_VERS=1.0.2 # thunar version
-GXE_VERS=2.6.0 # gtk-xfce-engine version
-TERM_VERS=0.4.6 # terminal version
-MPAD_VERS=0.2.16 # mousepad version
-XFWM_VERS=4.6.2 # xfwm4 version
-XFWMTHEME_VERS=4.6.0 # xfwm4-themes version
-SETTINGS_VERS=4.6.5 # xfce4-settings version
-SESSION_VERS=4.6.2 # xfce4-settings version
-PANEL_VERS=4.6.4 # xfce4-panel version
-XFCEGUI_VERS=4.6.4 # libxfcegui4 version
-XFCEMENU_VERS=4.6.2 # libxfce4menu version
-LIBUTIL_VERS=4.6.2 # libxfce4util version
-UTILS_VERS=4.6.2 # xfce-utils version
-APPFINDER_VERS=4.6.2 # xfce4-appfinder version
-XFCONF_VERS=4.6.2 # xfconf version
-XFDESKTOP_VERS=4.6.2 # xfdesktop version
-MIXER_VERS=4.6.1 # xfce4-mixer version
-XFPRINT_VERS=4.6.1 # xfprint version
-ORAGE_VERS=4.6.1 # orage version
-
-NUMJOBS=${NUMJOBS:--j6}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) export ARCH=i486 ;;
- arm*) export ARCH=arm ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
- *) export ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/xfce-build-dir}
-PKG=$TMP/package-xfce
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP || exit 1
-
-COMPRESSION=xz
-COMPRESSUTIL=xz
-
-for file in \
- xfce4-dev-tools-$XDT_VERS.tar.$COMPRESSION \
- libxfce4util-$LIBUTIL_VERS.tar.$COMPRESSION \
- xfconf-$XFCONF_VERS.tar.$COMPRESSION \
- libxfcegui4-$XFCEGUI_VERS.tar.$COMPRESSION \
- libxfce4menu-$XFCEMENU_VERS.tar.$COMPRESSION \
- exo-$EXO_VERS.tar.$COMPRESSION \
- xfce4-panel-$PANEL_VERS.tar.$COMPRESSION \
- Thunar-$THUNAR_VERS.tar.$COMPRESSION \
- xfce4-settings-$SETTINGS_VERS.tar.$COMPRESSION \
- xfce4-session-$SESSION_VERS.tar.$COMPRESSION \
- xfdesktop-$XFDESKTOP_VERS.tar.$COMPRESSION \
- xfwm4-$XFWM_VERS.tar.$COMPRESSION \
- xfce-utils-$UTILS_VERS.tar.$COMPRESSION \
- xfce4-mixer-$MIXER_VERS.tar.$COMPRESSION \
- xfprint-$XFPRINT_VERS.tar.$COMPRESSION \
- xfce4-appfinder-$APPFINDER_VERS.tar.$COMPRESSION \
- gtk-xfce-engine-$GXE_VERS.tar.$COMPRESSION \
- Terminal-$TERM_VERS.tar.$COMPRESSION \
- xfwm4-themes-$XFWMTHEME_VERS.tar.$COMPRESSION \
- mousepad-$MPAD_VERS.tar.$COMPRESSION \
- orage-$ORAGE_VERS.tar.$COMPRESSION ;
-do
- $COMPRESSUTIL -dc $CWD/src/$file | tar xvf - || exit 1
- cd $(basename $file .tar.$COMPRESSION) || exit 1
- chown -R root:root .
- find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
- # Here's where we patch or set up any other package-specific stuff:
- # Patch to only show xfcalendar in XFce (otherwise it shows up in
- # KDE's Lost & Found and does not work):
- if [ "$file" = "orage-$ORAGE_VERS.tar.$COMPRESSION" ]; then
- zcat $CWD/patches/xfcalendar.desktop.in.diff.gz | patch -p1 --verbose || exit 1
- fi
- # Make Thunar respect --docdir
- if [ "$file" = "Thunar-$THUNAR_VERS.tar.$COMPRESSION" ]; then
- zcat $CWD/patches/thunar-1.0.2-fixup_docdir.diff.gz | patch -p1 --verbose || exit 1
- zcat $CWD/patches/Thunar.thunar-vfs-io-local.diff.gz | patch -p0 --verbose || exit 1
- fi
- # Fix the missing education icon in the desktop menu
- if [ "$file" = "xfdesktop-$XFDESKTOP_VERS.tar.$COMPRESSION" ]; then
- zcat $CWD/patches/xfdesktop-fix_education_icon.diff.gz | patch -p1 --verbose || exit 1
- fi
- # 1) Launch xfce through consolekit so that ck enabled stuff works in xfce
- # 2) Fix comments in /etc/xfce/xdg/xfce4/Xft.xrdb
- # http://bugzilla.xfce.org/show_bug.cgi?id=6314
- # 3) Load system-wide .Xmodmap, not just the one in $HOME
- if [ "$file" = "xfce-utils-$UTILS_VERS.tar.$COMPRESSION" ]; then
- zcat $CWD/patches/xfce-utils.xinitrc.consolekit.diff.gz | patch -p1 --verbose || exit 1
- zcat $CWD/patches/fixup_comments_in_xfce-utils-Xft.xrdb.diff.gz | patch -p1 --verbose || exit 1
- zcat $CWD/patches/xfce-utils-load_systemwide_Xmodmap.diff.gz | patch -p1 --verbose || exit 1
- fi
- # Fix a couple of bugs from mousepad git
- if [ "$file" = "mousepad-$MPAD_VERS.tar.$COMPRESSION" ]; then
- zcat $CWD/patches/mousepad-fix_find_and_replace.diff.gz | patch -p1 --verbose || exit 1
- zcat $CWD/patches/mousepad-fix_find.diff.gz | patch -p1 --verbose || exit 1
- fi
- # Fix a plugin moving bug in the panel
- if [ "$file" = "xfce4-panel-$PANEL_VERS.tar.$COMPRESSION" ]; then
- zcat $CWD/patches/no_sensitive_panel_during_plugin_moves.patch.gz | patch -p1 --verbose || exit 1
- fi
- # Start kde4 services instead of kde3
- # http://bugzilla.xfce.org/show_bug.cgi?id=7382
- if [ "$file" = "xfce4-session-$SESSION_VERS.tar.$COMPRESSION" ]; then
- zcat $CWD/patches/xfsm-compat-kde.c-start-kde4-services.diff.gz | patch -p1 --verbose || exit 1
- fi
- # End patches/package-specific stuff
-
- CFLAGS="$SLKCFLAGS" \
- CXXFLAGS="$SLKCFLAGS" \
- ./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc/xfce \
- --mandir=/usr/man \
- --docdir=/usr/doc/xfce-$VERSION/$(basename $file .tar.$COMPRESSION) \
- --htmldir=/usr/doc/xfce-$VERSION/$(basename $file .tar.$COMPRESSION)/html \
- --disable-static \
- --build=$ARCH-slackware-linux \
- $PACKAGE_SPECIFIC_OPTIONS
-
- # Unset this now -- we're done with it
- unset PACKAGE_SPECIFIC_OPTIONS
-
- make $NUMJOBS || make || exit 1
- make install || exit 1
- make install DESTDIR=$PKG
-
- mkdir -p $PKG/usr/doc/xfce-$VERSION/$(basename $file .tar.$COMPRESSION)
- # This will cause errors, but won't miss any docs:
- cp -a \
- AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
- NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
- $PKG/usr/doc/xfce-$VERSION/$(basename $file .tar.$COMPRESSION) \
- 2> /dev/null || true
-
- # If there's a ChangeLog, installing at least part of the recent history
- # is useful, but don't let it get totally out of control:
- if [ -r ChangeLog ]; then
- DOCSDIR=$(echo $PKG/usr/doc/xfce-$VERSION/$(basename $file .tar.$COMPRESSION))
- cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
- touch -r ChangeLog $DOCSDIR/ChangeLog
- fi
-
- cd - ;
-done
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# The Rodent icon theme isn't xdg compliant, so it spews errors quite often
-# and just flat breaks some things here and there, so the Xfce team elected
-# not to ship it with 4.6.x. In the meantime, we'll default to gnome.
-sed -i s/Rodent/gnome/ \
- $PKG/etc/xfce/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
-
-# We're going to borrow the "applications-education" icons (six of them)
-# from the kde oxygen icon theme (it's LGPL)
-tar xf $CWD/icons.tar.xz -C $PKG/usr/share
-
-# We don't want any of those icon caches
-find $PKG/usr/share/icons -type f -name "index-theme.cache" -exec rm -f {} \;
-
-# Compress and if needed symlink the man pages:
-if [ -d $PKG/usr/man ]; then
- ( cd $PKG/usr/man
- for manpagedir in $(find . -type d -name "man*") ; do
- ( cd $manpagedir
- for eachpage in $( find . -type l -maxdepth 1) ; do
- ln -s $( readlink $eachpage ).gz $eachpage.gz
- rm $eachpage
- done
- gzip -9 *.?
- )
- done
- )
-fi
-
-mkdir -p $PKG/etc/profile.d
-cp -a $CWD/profile.d/* $PKG/etc/profile.d
-chown root:root $PKG/etc/profile.d/*
-chmod 755 $PKG/etc/profile.d/*
-
-mkdir -p $PKG/etc/X11/xinit
-( cd $PKG/etc/X11/xinit
- ln -sf ../../xfce/xdg/xfce4/xinitrc xinitrc.xfce
- chmod 755 ../../xfce/xdg/xfce4/xinitrc
-)
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/xfce-$VERSION-$ARCH-$BUILD.txz
-
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-01 21:33:36 +0000