diff options
Diffstat (limited to '')
-rw-r--r-- | source/xap/xfce/patches/exo_quoting_fix.diff | 66 | ||||
-rw-r--r-- | source/xap/xfce/patches/launcher-plugin-migrate-icon-cat.diff | 48 | ||||
-rw-r--r-- | source/xap/xfce/patches/migrate-itheme-smartly.diff | 92 | ||||
-rw-r--r-- | source/xap/xfce/patches/terminal-0.4.0-fixup_docdir.diff | 132 | ||||
-rw-r--r-- | source/xap/xfce/patches/thunar-1.0.1-fixup_docdir.diff | 360 | ||||
-rw-r--r-- | source/xap/xfce/patches/xfcalendar.desktop.in.diff | 9 | ||||
-rw-r--r-- | source/xap/xfce/patches/xfdesktop-fix_education_icon.diff | 11 | ||||
-rwxr-xr-x | source/xap/xfce/profile.d/xfce.csh | 6 | ||||
-rwxr-xr-x | source/xap/xfce/profile.d/xfce.sh | 7 | ||||
-rw-r--r-- | source/xap/xfce/slack-desc | 19 | ||||
-rwxr-xr-x | source/xap/xfce/xfce.SlackBuild | 201 | ||||
-rw-r--r-- | source/xap/xfce4-power-manager/doinst.sh | 10 | ||||
-rw-r--r-- | source/xap/xfce4-power-manager/slack-desc | 19 | ||||
-rwxr-xr-x | source/xap/xfce4-power-manager/xfce4-power-manager.SlackBuild | 91 |
14 files changed, 1071 insertions, 0 deletions
diff --git a/source/xap/xfce/patches/exo_quoting_fix.diff b/source/xap/xfce/patches/exo_quoting_fix.diff new file mode 100644 index 000000000..ac6544576 --- /dev/null +++ b/source/xap/xfce/patches/exo_quoting_fix.diff @@ -0,0 +1,66 @@ +Index: exo-open/main.c +=================================================================== +--- exo-open/main.c (revision 30250) ++++ exo-open/main.c (revision 30251) +@@ -36,7 +36,17 @@ + #include <exo/exo.h> + + ++/** ++ * For testing this code the following commands should work: ++ * ++ * exo-open --launch WebBrowser http://xfce.org (bug #5461). ++ * exo-open http://xfce.org ++ * exo-open --launch TerminalEmulator ./script.sh 'something with a space' 'nospace' (bug #5132). ++ * exo-open --launch TerminalEmulator ssh -l username some.host.com ++ **/ + ++ ++ + static gboolean opt_help = FALSE; + static gboolean opt_version = FALSE; + static gchar *opt_launch = NULL; +@@ -143,6 +153,8 @@ + { + if (argc > 1) + { ++ /* NOTE: see the comment at the top of this document! */ ++ + /* combine all specified parameters to one parameter string */ + join = g_string_new (NULL); + for (i = 1; argv[i] != NULL; i++) +@@ -150,11 +162,18 @@ + /* separate the arguments */ + if (i > 1) + join = g_string_append_c (join, ' '); +- +- /* append the quoted argument */ +- quoted = g_shell_quote (argv[i]); +- join = g_string_append (join, quoted); +- g_free (quoted); ++ ++ /* only quote arguments with spaces */ ++ if (strchr (argv[i], ' ') != NULL) ++ { ++ quoted = g_shell_quote (argv[i]); ++ join = g_string_append (join, quoted); ++ g_free (quoted); ++ } ++ else ++ { ++ join = g_string_append (join, argv[i]); ++ } + } + parameter = g_string_free (join, FALSE); + } +@@ -163,6 +182,10 @@ + parameter = NULL; + } + ++#ifndef NDEBUG ++ g_message ("launch=%s, wd=%s, parameters (%d)=%s", opt_launch, opt_working_directory, argc, parameter); ++#endif ++ + /* run the preferred application */ + if (!exo_execute_preferred_application (opt_launch, parameter, opt_working_directory, NULL, &err)) + { diff --git a/source/xap/xfce/patches/launcher-plugin-migrate-icon-cat.diff b/source/xap/xfce/patches/launcher-plugin-migrate-icon-cat.diff new file mode 100644 index 000000000..4370281a3 --- /dev/null +++ b/source/xap/xfce/patches/launcher-plugin-migrate-icon-cat.diff @@ -0,0 +1,48 @@ +diff --git a/plugins/launcher/launcher.c b/plugins/launcher/launcher.c +index 8edc66c..1e370c4 100644 +--- a/plugins/launcher/launcher.c ++++ b/plugins/launcher/launcher.c +@@ -37,6 +37,30 @@ + #include "launcher-exec.h" + #include "launcher-dialog.h" + ++/* for 4.4 settings migration */ ++static const gchar *icon_category_map[] = { ++ "applications-other", ++ "accessories-text-editor", ++ "system-file-manager", ++ "applications-accessories", ++ "applications-games", ++ "help-browser", ++ "applications-multimedia", ++ "applications-internet", ++ "applications-graphics", ++ "printer", ++ "office-calendar", ++ "applications-office", ++ "audio-card", ++ "utilities-terminal", ++ "applications-development", ++ "preferences-desktop", ++ "applications-system", ++ "applications-other", ++ "applications-accessories", ++}; ++#define ICON_CATEGORY_MAP_MAX (G_N_ELEMENTS (icon_category_map) - 1) ++ + /* prototypes */ + static void launcher_utility_icon_theme_changed (GtkIconTheme *icon_theme, + LauncherPlugin *launcher); +@@ -1216,6 +1240,12 @@ launcher_plugin_read (LauncherPlugin *launcher) + entry->name = launcher_plugin_read_entry (rc, "Name"); + entry->comment = launcher_plugin_read_entry (rc, "Comment"); + entry->icon = launcher_plugin_read_entry (rc, "Icon"); ++ if (G_UNLIKELY (!entry->icon)) ++ { ++ gint icon_category = xfce_rc_read_int_entry (rc, "X-XFCE-IconCategory", -1); ++ if (G_LIKELY (icon_category >= 0 && icon_category <= ICON_CATEGORY_MAP_MAX)) ++ entry->icon = g_strdup (icon_category_map[icon_category]); ++ } + entry->exec = launcher_plugin_read_entry (rc, "Exec"); + entry->path = launcher_plugin_read_entry (rc, "Path"); + diff --git a/source/xap/xfce/patches/migrate-itheme-smartly.diff b/source/xap/xfce/patches/migrate-itheme-smartly.diff new file mode 100644 index 000000000..e9c66ed2e --- /dev/null +++ b/source/xap/xfce/patches/migrate-itheme-smartly.diff @@ -0,0 +1,92 @@ +Index: scripts/xfconf-migration-4.6.pl.in +=================================================================== +--- a/scripts/xfconf-migration-4.6.pl.in (revision 29645) ++++ b/scripts/xfconf-migration-4.6.pl.in (working copy) +@@ -256,6 +256,77 @@ + return $mcs.'.xml'; + } + ++sub icon_theme_exists ++{ ++ my ($dirref,$themename) = @_; ++ my @dirs = @{$dirref}; ++ ++ foreach my $d (@dirs) { ++ return 1 if(-f "$d/$themename/index.theme"); ++ } ++ ++ return 0; ++} ++ ++sub migrate_icon_theme ++{ ++ my ($ref,$chan) = @_; ++ my %opts = %{$ref}; ++ my $opt = 'Net/IconThemeName'; ++ ++ return if(!defined($opts{$opt})); ++ my $val = $opts{$opt}->{'value'}; ++ ++ if(lc($val) eq 'rodent') { ++ # we don't ship rodent anymore, so try to find something suitable ++ my @icondirs; ++ if(defined($ENV{'XDG_DATA_HOME'})) { ++ @icondirs = ( $ENV{'XDG_DATA_HOME'} . '/icons' ); ++ } else { ++ @icondirs = ( $ENV{'HOME'} . '/.local/share/icons' ); ++ } ++ ++ if(defined($ENV{'XDG_DATA_DIRS'})) { ++ push(@icondirs, split(/:/, $ENV{'XDG_DATA_DIRS'})); ++ } else { ++ push(@icondirs, ( '/usr/share/icons', '/usr/local/share/icons' )); ++ } ++ ++ $val = undef; ++ foreach my $itheme (('Tango', 'gnome', 'crystalsvg')) { ++ if(icon_theme_exists(\@icondirs, $itheme)) { ++ $val = $itheme; ++ last; ++ } ++ } ++ ++ if(!defined($val)) { ++ # pick the first one that is not 'hicolor' ++ foreach my $d (@icondirs) { ++ opendir(DIR, $d) and do { ++ my @subdirs = grep { $_ ne 'hicolor' && -d "$d/$_" } readdir(DIR); ++ foreach my $sd (@subdirs) { ++ if(-f "$d/$sd/index.theme") { ++ $val = $sd; ++ last; ++ } ++ } ++ closedir(DIR); ++ }; ++ last if(defined($val)); ++ } ++ ++ if(!defined($val)) { ++ # ok, their system is kinda b0rked; not much we can do ++ warn("Couldn't find a suitable icon theme to migrate to"); ++ return; ++ } ++ } ++ } ++ ++ xfconf_set($chan, 'string', '/Net/IconThemeName', $val); ++} ++ + sub migrate_xsettings + { + my $mcs = 'gtk'; +@@ -283,8 +354,7 @@ + '/Net/CursorBlinkTime', 'int'); + save_xfconf_prop($ref, $chan, 'Net/DndDragThreshold', + '/Net/DndDragThreshold', 'int'); +- save_xfconf_prop($ref, $chan, 'Net/IconThemeName', +- '/Net/IconThemeName', 'string'); ++ migrate_icon_theme($ref, $chan); + save_xfconf_prop($ref, $chan, 'Net/ThemeName', + '/Net/ThemeName', 'string'); + diff --git a/source/xap/xfce/patches/terminal-0.4.0-fixup_docdir.diff b/source/xap/xfce/patches/terminal-0.4.0-fixup_docdir.diff new file mode 100644 index 000000000..d9608470f --- /dev/null +++ b/source/xap/xfce/patches/terminal-0.4.0-fixup_docdir.diff @@ -0,0 +1,132 @@ +diff -Nur Terminal-0.4.0.orig/Makefile.in Terminal-0.4.0/Makefile.in +--- Terminal-0.4.0.orig/Makefile.in 2009-07-20 13:04:04.000000000 -0500 ++++ Terminal-0.4.0/Makefile.in 2009-07-20 13:50:20.529864039 -0500 +@@ -986,7 +986,7 @@ + + TerminalHelp: TerminalHelp.in Makefile + rm -f TerminalHelp.gen TerminalHelp +- sed -e "s,\@datadir\@,$(datadir),g" \ ++ sed -e "s,\@docdir\@,$(docdir),g" \ + < $(srcdir)/TerminalHelp.in \ + > TerminalHelp.gen + mv TerminalHelp.gen TerminalHelp +diff -Nur Terminal-0.4.0.orig/TerminalHelp.in Terminal-0.4.0/TerminalHelp.in +--- Terminal-0.4.0.orig/TerminalHelp.in 2009-07-20 13:03:50.000000000 -0500 ++++ Terminal-0.4.0/TerminalHelp.in 2009-07-20 13:50:20.529864039 -0500 +@@ -19,7 +19,7 @@ + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + # + +-HELPDIR="@datadir@/doc/Terminal/" ++HELPDIR="@docdir@/" + + if test -n "$LC_ALL"; then + LC=$LC_ALL +diff -Nur Terminal-0.4.0.orig/doc/C/Makefile.in Terminal-0.4.0/doc/C/Makefile.in +--- Terminal-0.4.0.orig/doc/C/Makefile.in 2009-07-20 13:04:02.000000000 -0500 ++++ Terminal-0.4.0/doc/C/Makefile.in 2009-07-20 13:50:20.533867320 -0500 +@@ -260,7 +260,7 @@ + SUBDIRS = \ + images + +-TARGET_DIR = $(datadir)/doc/Terminal/C ++TARGET_DIR = $(docdir)/C + STYLESHEET = ../terminal.xsl + DOCUMENT = Terminal.xml + +diff -Nur Terminal-0.4.0.orig/doc/C/images/Makefile.in Terminal-0.4.0/doc/C/images/Makefile.in +--- Terminal-0.4.0.orig/doc/C/images/Makefile.in 2009-07-20 13:04:02.000000000 -0500 ++++ Terminal-0.4.0/doc/C/images/Makefile.in 2009-07-20 13:50:20.533867320 -0500 +@@ -240,7 +240,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-imagesdir = $(datadir)/doc/Terminal/C/images ++imagesdir = $(docdir)/C/images + images_DATA = \ + terminal-compose-shortcut.png \ + terminal-edit-preferences.png \ +diff -Nur Terminal-0.4.0.orig/doc/Makefile.in Terminal-0.4.0/doc/Makefile.in +--- Terminal-0.4.0.orig/doc/Makefile.in 2009-07-20 13:04:02.000000000 -0500 ++++ Terminal-0.4.0/doc/Makefile.in 2009-07-20 13:51:00.229192942 -0500 +@@ -286,7 +286,7 @@ + fr \ + ja + +-cssdir = $(datadir)/doc/Terminal ++cssdir = $(docdir)/ + css_DATA = \ + terminal.css + +diff -Nur Terminal-0.4.0.orig/doc/da/Makefile.in Terminal-0.4.0/doc/da/Makefile.in +--- Terminal-0.4.0.orig/doc/da/Makefile.in 2009-07-20 13:04:02.000000000 -0500 ++++ Terminal-0.4.0/doc/da/Makefile.in 2009-07-20 13:50:20.533867320 -0500 +@@ -260,7 +260,7 @@ + SUBDIRS = \ + images + +-TARGET_DIR = $(datadir)/doc/Terminal/da ++TARGET_DIR = $(docdir)/da + STYLESHEET = ../terminal.xsl + DOCUMENT = Terminal.xml + +diff -Nur Terminal-0.4.0.orig/doc/da/images/Makefile.in Terminal-0.4.0/doc/da/images/Makefile.in +--- Terminal-0.4.0.orig/doc/da/images/Makefile.in 2009-07-20 13:04:02.000000000 -0500 ++++ Terminal-0.4.0/doc/da/images/Makefile.in 2009-07-20 13:50:20.533867320 -0500 +@@ -240,7 +240,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-imagesdir = $(datadir)/doc/Terminal/da/images ++imagesdir = $(docdir)/da/images + images_DATA = \ + terminal-compose-shortcut.png \ + terminal-edit-preferences.png \ +diff -Nur Terminal-0.4.0.orig/doc/fr/Makefile.in Terminal-0.4.0/doc/fr/Makefile.in +--- Terminal-0.4.0.orig/doc/fr/Makefile.in 2009-07-20 13:04:02.000000000 -0500 ++++ Terminal-0.4.0/doc/fr/Makefile.in 2009-07-20 13:50:20.533867320 -0500 +@@ -260,7 +260,7 @@ + SUBDIRS = \ + images + +-TARGET_DIR = $(datadir)/doc/Terminal/fr ++TARGET_DIR = $(docdir)/fr + STYLESHEET = ../terminal.xsl + DOCUMENT = Terminal.xml + +diff -Nur Terminal-0.4.0.orig/doc/fr/images/Makefile.in Terminal-0.4.0/doc/fr/images/Makefile.in +--- Terminal-0.4.0.orig/doc/fr/images/Makefile.in 2009-07-20 13:04:03.000000000 -0500 ++++ Terminal-0.4.0/doc/fr/images/Makefile.in 2009-07-20 13:50:20.533867320 -0500 +@@ -240,7 +240,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-imagesdir = $(datadir)/doc/Terminal/fr/images ++imagesdir = $(docdir)/fr/images + images_DATA = \ + terminal-compose-shortcut.png \ + terminal-edit-preferences.png \ +diff -Nur Terminal-0.4.0.orig/doc/ja/Makefile.in Terminal-0.4.0/doc/ja/Makefile.in +--- Terminal-0.4.0.orig/doc/ja/Makefile.in 2009-07-20 13:04:03.000000000 -0500 ++++ Terminal-0.4.0/doc/ja/Makefile.in 2009-07-20 13:50:20.537889876 -0500 +@@ -260,7 +260,7 @@ + SUBDIRS = \ + images + +-TARGET_DIR = $(datadir)/doc/Terminal/ja ++TARGET_DIR = $(docdir)/ja + STYLESHEET = ../terminal.xsl + DOCUMENT = Terminal.xml + +diff -Nur Terminal-0.4.0.orig/doc/ja/images/Makefile.in Terminal-0.4.0/doc/ja/images/Makefile.in +--- Terminal-0.4.0.orig/doc/ja/images/Makefile.in 2009-07-20 13:04:03.000000000 -0500 ++++ Terminal-0.4.0/doc/ja/images/Makefile.in 2009-07-20 13:50:20.537889876 -0500 +@@ -240,7 +240,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-imagesdir = $(datadir)/doc/Terminal/ja/images ++imagesdir = $(docdir)/ja/images + images_DATA = \ + terminal-compose-shortcut.png \ + terminal-edit-preferences.png \ 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 new file mode 100644 index 000000000..52d076d93 --- /dev/null +++ b/source/xap/xfce/patches/thunar-1.0.1-fixup_docdir.diff @@ -0,0 +1,360 @@ +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/xfcalendar.desktop.in.diff b/source/xap/xfce/patches/xfcalendar.desktop.in.diff new file mode 100644 index 000000000..d88267815 --- /dev/null +++ b/source/xap/xfce/patches/xfcalendar.desktop.in.diff @@ -0,0 +1,9 @@ +--- 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/xfdesktop-fix_education_icon.diff b/source/xap/xfce/patches/xfdesktop-fix_education_icon.diff new file mode 100644 index 000000000..56a340608 --- /dev/null +++ b/source/xap/xfce/patches/xfdesktop-fix_education_icon.diff @@ -0,0 +1,11 @@ +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/profile.d/xfce.csh b/source/xap/xfce/profile.d/xfce.csh new file mode 100755 index 000000000..ccc2b8f15 --- /dev/null +++ b/source/xap/xfce/profile.d/xfce.csh @@ -0,0 +1,6 @@ +#!/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 new file mode 100755 index 000000000..adb187c10 --- /dev/null +++ b/source/xap/xfce/profile.d/xfce.sh @@ -0,0 +1,7 @@ +#!/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 new file mode 100644 index 000000000..ecedf0104 --- /dev/null +++ b/source/xap/xfce/slack-desc @@ -0,0 +1,19 @@ +# 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 new file mode 100755 index 000000000..2ed8042e6 --- /dev/null +++ b/source/xap/xfce/xfce.SlackBuild @@ -0,0 +1,201 @@ +#!/bin/sh + +# Copyright 2003 Slackware Linux, Inc., Concord, CA, USA +# Copyright 2007, 2008, 2009 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.1 +ARCH=${ARCH:-x86_64} +BUILD=${BUILD:-5} + +# A few tarballs have different versions; handle them here +XDT_VERS=4.6.0 # xfce4-dev-tools version +EXO_VERS=0.3.101 # exo version +THUNAR_VERS=1.0.1 # thunar version +GXE_VERS=2.6.0 # gtk-xfce-engine version +TERM_VERS=0.4.0 # terminal version +MPAD_VERS=0.2.16 # mousepad version +XFWMTHEME_VERS=4.6.0 # xfwm4-themes version + +NUMJOBS=${NUMJOBS:--j6} + +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" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP || exit 1 + +COMPRESSION=xz +COMPRESSUTIL=xz + +# The Rodent theme isn't xdg-compliant, so they're not shipping it +# xfce4-icon-theme-$VERSION.tar.$COMPRESSION +# We'll set Tango as the system default instead... + +for file in \ + xfce4-dev-tools-$XDT_VERS.tar.$COMPRESSION \ + libxfce4util-$VERSION.tar.$COMPRESSION \ + xfconf-$VERSION.tar.$COMPRESSION \ + libxfcegui4-$VERSION.tar.$COMPRESSION \ + libxfce4menu-$VERSION.tar.$COMPRESSION \ + exo-$EXO_VERS.tar.$COMPRESSION \ + xfce4-panel-$VERSION.tar.$COMPRESSION \ + Thunar-$THUNAR_VERS.tar.$COMPRESSION \ + xfce4-settings-$VERSION.tar.$COMPRESSION \ + xfce4-session-$VERSION.tar.$COMPRESSION \ + xfdesktop-$VERSION.tar.$COMPRESSION \ + xfwm4-$VERSION.tar.$COMPRESSION \ + xfce-utils-$VERSION.tar.$COMPRESSION \ + xfce4-mixer-$VERSION.tar.$COMPRESSION \ + xfprint-$VERSION.tar.$COMPRESSION \ + xfce4-appfinder-$VERSION.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-$VERSION.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-$VERSION.tar.$COMPRESSION" ]; then + zcat $CWD/patches/xfcalendar.desktop.in.diff.gz | patch -p1 || exit 1 + fi + # Fix http://bugzilla.xfce.org/show_bug.cgi?id=5461 + # and enable python bindings in libexo + if [ "$file" = "exo-$EXO_VERS.tar.$COMPRESSION" ]; then + zcat $CWD/patches/exo_fix_quoting.diff.gz | patch -p0 || exit 1 + PACKAGE_SPECIFIC_OPTIONS="--enable-python" + fi + # Make Terminal respect --docdir + if [ "$file" = "Terminal-$TERM_VERS.tar.$COMPRESSION" ]; then + zcat $CWD/patches/terminal-0.4.0-fixup_docdir.diff.gz | patch -p1 || exit 1 + fi + # Make Thunar respect --docdir + if [ "$file" = "Thunar-$THUNAR_VERS.tar.$COMPRESSION" ]; then + zcat $CWD/patches/thunar-1.0.1-fixup_docdir.diff.gz | patch -p1 || exit 1 + fi + # Fix the missing education icon in the desktop menu + if [ "$file" = "xfdesktop-$VERSION.tar.$COMPRESSION" ]; then + zcat $CWD/patches/xfdesktop-fix_education_icon.diff.gz | patch -p1 || 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 + + 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.0. In the meantime, we'll default to Tango. +sed -i s/Rodent/Tango/ \ + $PKG/etc/xfce/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml + +# We're going to borrow the "applications-education" icons (six of them) +# from kde's 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 + diff --git a/source/xap/xfce4-power-manager/doinst.sh b/source/xap/xfce4-power-manager/doinst.sh new file mode 100644 index 000000000..1f8ff67de --- /dev/null +++ b/source/xap/xfce4-power-manager/doinst.sh @@ -0,0 +1,10 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi + diff --git a/source/xap/xfce4-power-manager/slack-desc b/source/xap/xfce4-power-manager/slack-desc new file mode 100644 index 000000000..d1dd7ec16 --- /dev/null +++ b/source/xap/xfce4-power-manager/slack-desc @@ -0,0 +1,19 @@ +# 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------------------------------------------------| +xfce4-power-manager: xfce4-power-manager (Power Management Daemon for Xfce) +xfce4-power-manager: +xfce4-power-manager: xfce4-power-manager makes power management functions (such as +xfce4-power-manager: suspend and hibernate) easy inside the Xfce Desktop Environment +xfce4-power-manager: (but it should also work in any other desktop environment). +xfce4-power-manager: +xfce4-power-manager: +xfce4-power-manager: +xfce4-power-manager: +xfce4-power-manager: +xfce4-power-manager: diff --git a/source/xap/xfce4-power-manager/xfce4-power-manager.SlackBuild b/source/xap/xfce4-power-manager/xfce4-power-manager.SlackBuild new file mode 100755 index 000000000..1487b2d05 --- /dev/null +++ b/source/xap/xfce4-power-manager/xfce4-power-manager.SlackBuild @@ -0,0 +1,91 @@ +#!/bin/sh + +# Slackware build script for xfce4-power-manager + +# Copyright 2008-2009 Robby Workman Northport, Alabama, USA +# Copyright 2009 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. + + +PRGNAM=xfce4-power-manager +VERSION=0.6.6 +ARCH=${ARCH:-x86_64} +BUILD=${BUILD:-1} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PRGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP || exit 1 +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1 +cd $PRGNAM-$VERSION || 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 {} \; + +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --sysconfdir=/etc/xfce \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --enable-debug=no \ + --build=$ARCH-slackware-linux + +make || exit 1 +make install DESTDIR=$PKG + +find $PKG | xargs file | grep -e "executable" -e "shared object" \ + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html +cp -a \ + AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \ + $PKG/usr/doc/$PRGNAM-$VERSION +( cd $PKG/usr/doc/$PRGNAM-$VERSION/html + ln -s /usr/share/xfce4/doc/C/xfce4-power-manager.html index.html + ln -s /usr/share/xfce4/doc/C/images . +) + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz + |