diff options
Diffstat (limited to 'source/xap/xfce/xfce.SlackBuild')
| -rwxr-xr-x | source/xap/xfce/xfce.SlackBuild | 114 |
1 files changed, 65 insertions, 49 deletions
diff --git a/source/xap/xfce/xfce.SlackBuild b/source/xap/xfce/xfce.SlackBuild index a59aa9497..aaa38f994 100755 --- a/source/xap/xfce/xfce.SlackBuild +++ b/source/xap/xfce/xfce.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2003 Slackware Linux, Inc., Concord, CA, USA -# Copyright 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, 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 @@ -21,23 +21,34 @@ # 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 -BUILD=${BUILD:-8} +VERSION=4.6.2 +BUILD=${BUILD:-5} # A few tarballs have different versions; handle them here -XDT_VERS=4.7.2 # xfce4-dev-tools version -# We're going to ship xdt from git (targeting 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.106 # exo version -THUNAR_VERS=1.0.1 # thunar version +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.4 # terminal 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.4 # xfce4-settings version -PANEL_VERS=4.6.3 # xfce4-panel version -XFCEGUI_VERS=4.6.3 # libxfcegui4 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} @@ -76,32 +87,28 @@ 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 \ + libxfce4util-$LIBUTIL_VERS.tar.$COMPRESSION \ + xfconf-$XFCONF_VERS.tar.$COMPRESSION \ libxfcegui4-$XFCEGUI_VERS.tar.$COMPRESSION \ - libxfce4menu-$VERSION.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-$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 \ + 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-$VERSION.tar.$COMPRESSION ; + orage-$ORAGE_VERS.tar.$COMPRESSION ; do $COMPRESSUTIL -dc $CWD/src/$file | tar xvf - || exit 1 cd $(basename $file .tar.$COMPRESSION) || exit 1 @@ -115,31 +122,40 @@ do # 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 Terminal's title bar and preferences problems with GTK+ 2.18: - if [ "$file" = "Terminal-$TERM_VERS.tar.$COMPRESSION" ]; then - zcat $CWD/patches/terminal.gtk.2.18.fix.diff.gz | patch -p1 || exit 1 + 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.1-fixup_docdir.diff.gz | patch -p1 || exit 1 - zcat $CWD/patches/thunar-fix_umask_properly.diff.gz | patch -p1 || exit 1 - # Port to PNG 1.4.0: - zcat $CWD/patches/thunar-1.0.1-png14.diff.gz | patch -p1 || exit 1 + 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-$VERSION.tar.$COMPRESSION" ]; then - zcat $CWD/patches/xfdesktop-fix_education_icon.diff.gz | patch -p1 || exit 1 + 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 - # Port xfce4-settings to libxklavier-5.x: - if [ "$file" = "xfce4-settings-$SETTINGS_VERS.tar.$COMPRESSION" ]; then - zcat $CWD/patches/xfce4-settings.libxklavier5.diff.gz | patch -p1 || exit 1 + # 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 - # Launch xfce through consolekit so that ck enabled stuff works in xfce: - if [ "$file" = "xfce-utils-$VERSION.tar.$COMPRESSION" ]; then - zcat $CWD/patches/xfce-utils.xinitrc.consolekit.diff.gz | patch -p1 || exit 1 + # 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 @@ -187,12 +203,12 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ # 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/ \ +# 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 kde's oxygen icon theme (it's LGPL) +# 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 |