diff options
| -rw-r--r-- | desktop/lxde-common/README | 8 | ||||
| -rw-r--r-- | desktop/lxde-common/config/xinitrc.lxde | 2 | ||||
| -rw-r--r-- | desktop/lxde-common/doinst.sh | 1 | ||||
| -rw-r--r-- | desktop/lxde-common/lxde-common.SlackBuild | 38 |
4 files changed, 26 insertions, 23 deletions
diff --git a/desktop/lxde-common/README b/desktop/lxde-common/README index 5a7617206bb8..62620f4fe811 100644 --- a/desktop/lxde-common/README +++ b/desktop/lxde-common/README @@ -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. diff --git a/desktop/lxde-common/config/xinitrc.lxde b/desktop/lxde-common/config/xinitrc.lxde index 89a8d89c55b6..2fb6dc0dfbd5 100644 --- a/desktop/lxde-common/config/xinitrc.lxde +++ b/desktop/lxde-common/config/xinitrc.lxde @@ -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 diff --git a/desktop/lxde-common/doinst.sh b/desktop/lxde-common/doinst.sh index 171fb6928946..98f0e082df92 100644 --- a/desktop/lxde-common/doinst.sh +++ b/desktop/lxde-common/doinst.sh @@ -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 diff --git a/desktop/lxde-common/lxde-common.SlackBuild b/desktop/lxde-common/lxde-common.SlackBuild index 095c760932fe..10bf4ff79875 100644 --- a/desktop/lxde-common/lxde-common.SlackBuild +++ b/desktop/lxde-common/lxde-common.SlackBuild @@ -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 |