diff options
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/pekwm/README | 19 | ||||
| -rw-r--r-- | desktop/pekwm/doinst.sh | 28 | ||||
| -rw-r--r-- | desktop/pekwm/pekwm.SlackBuild | 41 | ||||
| -rw-r--r-- | desktop/pekwm/xinitrc.pekwm | 4 |
4 files changed, 30 insertions, 62 deletions
diff --git a/desktop/pekwm/README b/desktop/pekwm/README index 34bf314c79ca4..f2413e11ffbf9 100644 --- a/desktop/pekwm/README +++ b/desktop/pekwm/README @@ -1,11 +1,10 @@ -The Pek Window Manager a lightweight window manager with tabs -based on aewm++. +The Pek Window Manager a lightweight window manager with tabs based on aewm++. --grouping windows in a single frame (tabbed windows); --keychains (multi-level keybindings); --mouse actions; --root- and window-menus and keybindings for all menus; --dynamic menus that regenerate on every view from a script output; --multi-screen support via both XRandR and Xinerama; --support for window placement; --theming support with images, shaping and configurable buttons. +- grouping windows in a single frame (tabbed windows); +- keychains (multi-level keybindings); +- mouse actions; +- root- and window-menus and keybindings for all menus; +- dynamic menus that regenerate on every view from a script output; +- multi-screen support via both XRandR and Xinerama; +- support for window placement; +- theming support with images, shaping and configurable buttons. diff --git a/desktop/pekwm/doinst.sh b/desktop/pekwm/doinst.sh index 451bc82f73424..5fb28930db0b9 100644 --- a/desktop/pekwm/doinst.sh +++ b/desktop/pekwm/doinst.sh @@ -1,25 +1,3 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -config etc/pekwm/autoproperties.new -config etc/pekwm/autoproperties_typerules.new -config etc/pekwm/config.new -config etc/pekwm/config_system.new -config etc/pekwm/keys.new -config etc/pekwm/menu.new -config etc/pekwm/mouse.new -config etc/pekwm/mouse_click.new -config etc/pekwm/mouse_sloppy.new -config etc/pekwm/mouse_system.new -config etc/pekwm/start.new -config etc/pekwm/vars.new +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi diff --git a/desktop/pekwm/pekwm.SlackBuild b/desktop/pekwm/pekwm.SlackBuild index 15699b3c6b806..fece726f5657b 100644 --- a/desktop/pekwm/pekwm.SlackBuild +++ b/desktop/pekwm/pekwm.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for pekwm -# Copyright 2012, Eugene Suter, <easuter at gmail dot com> +# Copyright 2012 Eugene Suter, <easuter at gmail dot com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,28 +22,28 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Modified by Eugene M. <damagedone at gmx dot com> +# Modified by Eugene M., <damagedone at gmx dot com> PRGNAM=pekwm VERSION=${VERSION:-0.1.17} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} # For consistency's sake, use this +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} # Drop the package in /tmp +OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -56,7 +56,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -66,10 +66,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -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 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -91,18 +91,9 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -find $PKG -name perllocal.pod \ - -o -name ".packlist" \ - -o -name "*.bs" \ - | xargs rm -f - -install -D -m0755 $CWD/xinitrc.pekwm $PKG/etc/X11/xinit/xinitrc.pekwm -install -D -m0644 $CWD/pekwm.desktop $PKG/usr/share/xsessions/pekwm.desktop -install -D -m0644 $CWD/pekwm.desktop $PKG/usr/share/apps/kdm/sessions/pekwm.desktop - -for CONF in $PKG/etc/pekwm/* ; do - mv $CONF $CONF.new -done +install -Dm0755 $CWD/xinitrc.pekwm $PKG/etc/X11/xinit/xinitrc.pekwm +install -Dm0644 $CWD/pekwm.desktop $PKG/usr/share/xsessions/pekwm.desktop +install -Dm0644 $CWD/pekwm.desktop $PKG/usr/share/apps/kdm/sessions/pekwm.desktop mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ diff --git a/desktop/pekwm/xinitrc.pekwm b/desktop/pekwm/xinitrc.pekwm index bfbb9d3b70f4c..8337e08883664 100644 --- a/desktop/pekwm/xinitrc.pekwm +++ b/desktop/pekwm/xinitrc.pekwm @@ -25,8 +25,8 @@ fi # Start the window manager: if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then - exec ck-launch-session dbus-launch --exit-with-session /usr/bin/pekwm + exec ck-launch-session dbus-launch --exit-with-session /usr/bin/pekwm else - exec /usr/bin/pekwm + exec /usr/bin/pekwm fi |