summaryrefslogtreecommitdiff
path: root/source/xap/fluxbox
diff options
context:
space:
mode:
Diffstat (limited to 'source/xap/fluxbox')
-rwxr-xr-xsource/xap/fluxbox/fluxbox.SlackBuild23
-rw-r--r--source/xap/fluxbox/fluxbox.startfluxbox.dbus.diff14
-rw-r--r--source/xap/fluxbox/xinitrc.fluxbox1
3 files changed, 35 insertions, 3 deletions
diff --git a/source/xap/fluxbox/fluxbox.SlackBuild b/source/xap/fluxbox/fluxbox.SlackBuild
index 2be30410..52864abb 100755
--- a/source/xap/fluxbox/fluxbox.SlackBuild
+++ b/source/xap/fluxbox/fluxbox.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
PKGNAM=fluxbox
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-4}
NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -59,6 +59,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
+rm -rf fluxbox-$VERSION
tar xvf $CWD/fluxbox-$VERSION.tar.?z* || exit 1
cd fluxbox-$VERSION || exit 1
chown -R root:root .
@@ -68,6 +69,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Make sure that dbus-launch is started for the session:
+zcat $CWD/fluxbox.startfluxbox.dbus.diff.gz | patch -p1 --verbose || exit 1
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -87,7 +91,20 @@ make install DESTDIR=$PKG || exit 1
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-gzip -9 $PKG/usr/man/man?/*
+# Compress and link manpages, if any:
+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/X11/xinit
zcat $CWD/xinitrc.fluxbox.gz > $PKG/etc/X11/xinit/xinitrc.fluxbox
diff --git a/source/xap/fluxbox/fluxbox.startfluxbox.dbus.diff b/source/xap/fluxbox/fluxbox.startfluxbox.dbus.diff
new file mode 100644
index 00000000..71bea31d
--- /dev/null
+++ b/source/xap/fluxbox/fluxbox.startfluxbox.dbus.diff
@@ -0,0 +1,14 @@
+--- ./util/startfluxbox.in.orig 2011-10-29 08:46:15.000000000 -0500
++++ ./util/startfluxbox.in 2012-08-08 23:35:10.841041336 -0500
+@@ -50,6 +50,11 @@
+ # wmsmixer -w &
+ # idesk &
+
++# Start DBUS session bus:
++if [ -z "\$DBUS_SESSION_BUS_ADDRESS" ]; then
++ eval \$(dbus-launch --sh-syntax --exit-with-session)
++fi
++
+ # And last but not least we start fluxbox.
+ # Because it is the last app you have to run it with ''exec'' before it.
+
diff --git a/source/xap/fluxbox/xinitrc.fluxbox b/source/xap/fluxbox/xinitrc.fluxbox
index 62e425b3..fd08cbc2 100644
--- a/source/xap/fluxbox/xinitrc.fluxbox
+++ b/source/xap/fluxbox/xinitrc.fluxbox
@@ -30,3 +30,4 @@ if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
else
exec /usr/bin/startfluxbox
fi
+