desktop/lxde-common: Switch from gksu-polkit to ktsuss.

Small cleanups and fixes

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
This commit is contained in:
Matteo Bernardini 2013-11-06 18:59:18 +01:00 committed by Robby Workman
parent 9eaa90faa7
commit 1db5e5bf5b
4 changed files with 26 additions and 23 deletions

View File

@ -1,6 +1,2 @@
lxde-common (a set of default configurations for LXDE)
The lxde-common package provides a set of default configurations and bitmaps
for LXDE.
lxde-settings is the XSettings daemon of LXDE. It presents configurations
values to other programs via the XSETTINGS protocol defined by freedesktop.org.
The lxde-common package provides a set of default configurations
and bitmaps for LXDE.

View File

@ -14,7 +14,7 @@ sysmodmap=/etc/X11/xinit/.Xmodmap
# Start the window manager:
if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
ck-launch-session startlxde
ck-launch-session dbus-launch --exit-with-session startlxde
else
startlxde
fi

View File

@ -12,6 +12,7 @@ config() {
}
config etc/xdg/lxsession/LXDE/desktop.conf.new
config etc/xdg/lxsession/LXDE/autostart.new
config etc/xdg/pcmanfm/LXDE/pcmanfm.conf.new
if [ -x /usr/bin/update-desktop-database ]; then

View File

@ -36,14 +36,17 @@
# * Update.
# 0.5.0-1: 13/sep/2010 by Matteo Bernardini <ponce@slackbuilds.org>
# * Adapted to slackbuilds.org's autotools template.
# * fixed lxpanel and xinitrc
# * Fixed lxpanel and xinitrc.
# 20110313_736ded3: 29/mar/2011 by Matteo Bernardini <ponce@slackbuilds.org>
# * updated to git version.
# * Updated to git version.
# 0.5.5-1: 26/dec/2011 by Matteo Bernardini <ponce@slackbuilds.org>
# * Update.
# * su_cmd defaults to gksu-polkit.
# 0.5.5-2: 31/dec/2011 by Matteo Bernardini <ponce@slackbuilds.org>
# * updated panel default config with battery indicator
# * Updated panel default config with battery indicator.
# 0.5.5-3: 07/jun/2013 by Matteo Bernardini <ponce@slackbuilds.org>
# * Switched from gksu-polkit to ktsuss.
# * Small cleanups and fixes.
#
# Run 'sh lxde-common.SlackBuild' to build a Slackware package.
# The package is created in /tmp .
@ -53,7 +56,7 @@
PRGNAM=lxde-common
VERSION=${VERSION:-0.5.5}
BUILD=${BUILD:-2}
BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@ -101,7 +104,7 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
# Look for a renamed file
# look for a renamed file
sed -i -e 's|lxde\.conf|LXDE.conf|' Makefile.am
sh autogen.sh || true
@ -122,30 +125,33 @@ CFLAGS="$SLKCFLAGS" \
make
make DESTDIR=$PKG install
# this slipped the make install
# this slips the make install
install -m 0644 -D lxde-logout.desktop \
$PKG/usr/share/applications/lxde-logout.desktop
# Add a xinitrc file for xwmconfig:
# add a xinitrc file for xwmconfig:
install -m 0755 -D $CWD/config/xinitrc.lxde \
$PKG/etc/X11/xinit/xinitrc.lxde
# Make sure that KDM picks up the LXDE session type as well:
# make sure that KDM picks up the LXDE session type as well:
mkdir -p $PKG/usr/share/apps/kdm/sessions
( cd $PKG/usr/share/apps/kdm/sessions
for i in $(ls ../../../xsessions/*.desktop) ; do ln -sf $i ; done
)
for i in $(ls ../../../xsessions/*.desktop) ; do ln -sf $i ; done )
# Patch desktop.conf to use the Tango icon theme
# patch desktop.conf to use the Tango icon theme
sed -i -e 's#nuoveXT2#Tango#' $PKG/etc/xdg/lxsession/LXDE/desktop.conf
# Patch pcmanfm.conf to use gksu-polkit by default instead of xdg-su
sed -i -e "s|su_cmd.*|su_cmd=gksu-polkit '%s'|" \
# patch pcmanfm.conf to use ktsuss by default instead of xdg-su
sed -i -e "s|su_cmd.*|su_cmd=ktsuss '%s'|" \
$PKG/etc/xdg/pcmanfm/LXDE/pcmanfm.conf
# preserve modified config files
mv $PKG/etc/xdg/lxsession/LXDE/desktop.conf{,.new}
mv $PKG/etc/xdg/pcmanfm/LXDE/pcmanfm.conf{,.new}
mv $PKG/etc/xdg/lxsession/LXDE/desktop.conf \
$PKG/etc/xdg/lxsession/LXDE/desktop.conf.new
mv $PKG/etc/xdg/lxsession/LXDE/autostart \
$PKG/etc/xdg/lxsession/LXDE/autostart.new
mv $PKG/etc/xdg/pcmanfm/LXDE/pcmanfm.conf \
$PKG/etc/xdg/pcmanfm/LXDE/pcmanfm.conf.new
# use some sane defaults for lxpanel
install -m 0644 $CWD/config/panel \
@ -153,7 +159,7 @@ install -m 0644 $CWD/config/panel \
install -m 0644 $CWD/config/config \
$PKG/usr/share/lxpanel/profile/LXDE/config
# Add documentation:
# add documentation:
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild