diff options
| author | Robby Workman <rworkman@slackbuilds.org> | 2021-04-25 13:53:53 -0500 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2021-04-26 11:51:53 +0700 |
| commit | 17b89afc4b5dcb16cbdd87819c368145230dea13 (patch) | |
| tree | 3930d3117290af99b65fccc7116b0785e4c1e02e | |
| parent | 22bda2efbe26556def7e717d4699d30a1b53b1d3 (diff) | |
| download | slackbuilds-17b89afc4b5dcb16cbdd87819c368145230dea13.tar.gz | |
desktop/openbox: Various fixups for Slackware 15.0
| -rw-r--r-- | desktop/openbox/openbox.SlackBuild | 29 | ||||
| -rw-r--r-- | desktop/openbox/xinitrc.openbox | 4 | ||||
| -rw-r--r-- | desktop/openbox/xinitrc.openbox-session | 4 |
3 files changed, 13 insertions, 24 deletions
diff --git a/desktop/openbox/openbox.SlackBuild b/desktop/openbox/openbox.SlackBuild index 9e0819048b..64aff701c9 100644 --- a/desktop/openbox/openbox.SlackBuild +++ b/desktop/openbox/openbox.SlackBuild @@ -28,8 +28,6 @@ # Patch for converting openbox-xdg-autostart from python2 to python3 # is prepared by Igor Alexandrov <igor.alexandrov@outlook.com> -# Currently maintained by Robby Workman <rw@rlworkman.net> - PRGNAM=openbox VERSION=${VERSION:-3.6.1} BUILD=${BUILD:-1} @@ -37,7 +35,7 @@ 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 @@ -62,8 +60,8 @@ GXINIT=${GXINIT:-NO} DOCS="AUTHORS CHANGELOG COMPLIANCE COPYING README" -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" @@ -104,8 +102,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --enable-startup-notification \ --enable-static=no \ - --build=$ARCH-slackware-linux \ - --host=$ARCH-slackware-linux + --build=$ARCH-slackware-linux make make install DESTDIR=$PKG @@ -138,18 +135,10 @@ else 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 -) +mv $PKG/usr/share/xsessions/openbox.desktop \ + $PKG/usr/share/xsessions/openbox-session.desktop +sed -i "s,Name=Openbox,Name=Openbox-Session," \ + $PKG/usr/share/xsessions/openbox-session.desktop mkdir -p $PKG/usr/doc mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION @@ -160,7 +149,7 @@ 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 ) +ln -s $PRGNAM-$VERSION $PKG/usr/doc/$PRGNAM mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/desktop/openbox/xinitrc.openbox b/desktop/openbox/xinitrc.openbox index add97d8ad1..0a6d6001a4 100644 --- a/desktop/openbox/xinitrc.openbox +++ b/desktop/openbox/xinitrc.openbox @@ -19,8 +19,8 @@ if [ ! -d $HOME/.config/openbox ]; then cat /etc/xdg/openbox/rc.xml > $HOME/.config/openbox/rc.xml fi -if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then - exec ck-launch-session dbus-launch --exit-with-session openbox +if [ -z "$DESKTOP_SESSION" ]; then + exec dbus-launch --exit-with-session openbox else exec openbox fi diff --git a/desktop/openbox/xinitrc.openbox-session b/desktop/openbox/xinitrc.openbox-session index 027c9080ee..90d135f50e 100644 --- a/desktop/openbox/xinitrc.openbox-session +++ b/desktop/openbox/xinitrc.openbox-session @@ -19,8 +19,8 @@ if [ ! -d $HOME/.config/openbox ]; then cat /etc/xdg/openbox/rc.xml > $HOME/.config/openbox/rc.xml fi -if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then - exec ck-launch-session dbus-launch --exit-with-session openbox-session +if [ -z "$DESKTOP_SESSION" ]; then + exec dbus-launch --exit-with-session openbox-session else exec openbox-session fi |