Miroirs/slackbuilds_ponce
1
0
Fork 0
mirror of https://github.com/Ponce/slackbuilds synced 2024-11-22 19:44:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

desktop/openbox: Various fixups for Slackware 15.0

Browse source
This commit is contained in:
Robby Workman 2021-04-25 13:53:53 -05:00 committed by Willy Sudiarto Raharjo
parent 22bda2efbe
commit 17b89afc4b
No known key found for this signature in database
GPG key ID: 3F617144D7238786
3 changed files with 13 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
desktop/openbox/openbox.SlackBuild
View file

@ -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

4
desktop/openbox/xinitrc.openbox
View file

@ -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

4
desktop/openbox/xinitrc.openbox-session
View file

@ -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