diff options
| author | Chess Griffin <chess@chessgriffin.com> | 2010-05-11 22:22:01 +0200 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2010-05-11 22:22:01 +0200 |
| commit | 0995f6612ec16a6f16409d4ece4a02c581b18bb4 (patch) | |
| tree | 77f25fa99cce91be96ad3b30134685d8f2c7e1a9 /desktop/openbox/openbox.SlackBuild | |
| parent | 37b906fa0b44f2a8da36d998c2062ce1cd0616e5 (diff) | |
| download | slackbuilds-0995f6612ec16a6f16409d4ece4a02c581b18bb4.tar.gz | |
desktop/openbox: Updated for version 3.4.7.2
Diffstat (limited to 'desktop/openbox/openbox.SlackBuild')
| -rw-r--r-- | desktop/openbox/openbox.SlackBuild | 42 |
1 files changed, 35 insertions, 7 deletions
diff --git a/desktop/openbox/openbox.SlackBuild b/desktop/openbox/openbox.SlackBuild index cb76a523df..e837aa537f 100644 --- a/desktop/openbox/openbox.SlackBuild +++ b/desktop/openbox/openbox.SlackBuild @@ -3,13 +3,15 @@ # Slackware build script for Openbox # Written by Chess Griffin <chess@chessgriffin.com> + # Modifications for KDE and GNOME xinitrc scripts -# by Phillip Warner <pc_warner@yahoo.com> +# and Slackware 12.1 KDM session fixes +# by Phillip Warner <pc_warner@yahoo.com> PRGNAM=openbox -VERSION=3.4.6.1 +VERSION=${VERSION:-3.4.7.2} ARCH=${ARCH:-i486} -BUILD=${BUILD:-2} +BUILD=${BUILD:-4} TAG=${TAG:-_SBo} CWD=$(pwd) @@ -35,6 +37,8 @@ if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" fi set -e @@ -46,7 +50,11 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . -chmod -R u+w,go+r-w,a-s . +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" \ CXXFLAGS="$SLKCFLAGS" \ @@ -55,7 +63,9 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ - --enable-startup-notification + --enable-startup-notification \ + --build=$ARCH-slackware-linux \ + --host=$ARCH-slackware-linux make make install DESTDIR=$PKG @@ -73,6 +83,9 @@ make install DESTDIR=$PKG # Add xinitrc.openbox so that openbox will show up as an option in xwmconfig install -D -m 0755 $CWD/xinitrc.openbox $PKG/etc/X11/xinit/xinitrc.openbox +# Add xinitrc.openbox-session so that openbox-session will show up as an option in xwmconfig +install -D -m 0755 $CWD/xinitrc.openbox-session $PKG/etc/X11/xinit/xinitrc.openbox-session + # Optionally install xinitrc scripts for running Openbox in KDE or GNOME # Move the scripts from /usr/bin if the xinitrc scripts are not installed. if [ "$KXINIT" == "YES" ]; then @@ -88,12 +101,27 @@ else rm -vf $PKG/usr/bin/openbox-gnome-session fi +# Change name of openbox.desktop KDM session file so it corresponds to openbox-session +( cd $PKG/usr/share/xsessions + mv openbox.desktop openbox-session.desktop + sed -i "s/Name=Openbox/Name=Openbox-Session/" openbox-session.desktop +) + +# Create symlinks to KDM session desktop files so KDM will use them +mkdir -p $PKG/usr/share/apps/kdm/sessions +( cd $PKG/usr/share/apps/kdm/sessions + for i in $PKG/usr/share/xsessions/openbox*.desktop ; do + ln -s /usr/share/xsessions/$(basename $i) $(basename $i) ; + done +) + mkdir -p $PKG/usr/doc mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION rmdir $PKG/usr/share/doc cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION -for i in $CWD/xinitrc.*openbox ; do - cat $i > $PKG/usr/doc/$PRGNAM-$VERSION/$(basename $i) ; +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/xinit +for i in $CWD/xinitrc.*openbox* ; do + cat $i > $PKG/usr/doc/$PRGNAM-$VERSION/xinit/$(basename $i) ; done cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild ( cd $PKG/usr/doc ; ln -s $PRGNAM-$VERSION $PRGNAM ) |