From db0ad6a42e667456691e9e6920b669a2074a4f8a Mon Sep 17 00:00:00 2001 From: ponce Date: Sat, 28 Jul 2012 20:55:04 +0200 Subject: system/lxdm: updated for version 20120728_102ea5e. Also set image in default config; fix a wrong path in lxdm.conf.in Signed-off-by: Robby Workman --- system/lxdm/lxdm.SlackBuild | 17 ++++++++++++++--- system/lxdm/lxdm.info | 6 +++--- .../patches/lxdm-0.3.0-set_DESKTOP_SESSION_in_env.diff | 14 -------------- system/lxdm/patches/lxdm-0.3.0-without_pam.diff | 14 +++++++------- .../lxdm/patches/lxdm-set_DESKTOP_SESSION_in_env.diff | 14 ++++++++++++++ system/lxdm/patches/remove_suse_from_Xsession.diff | 10 +++++----- 6 files changed, 43 insertions(+), 32 deletions(-) delete mode 100644 system/lxdm/patches/lxdm-0.3.0-set_DESKTOP_SESSION_in_env.diff create mode 100644 system/lxdm/patches/lxdm-set_DESKTOP_SESSION_in_env.diff (limited to 'system/lxdm') diff --git a/system/lxdm/lxdm.SlackBuild b/system/lxdm/lxdm.SlackBuild index e657a9e43a..a3209ffd06 100644 --- a/system/lxdm/lxdm.SlackBuild +++ b/system/lxdm/lxdm.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=lxdm -VERSION=${VERSION:-0.3.0} +VERSION=${VERSION:-20120728_102ea5e} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,7 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . find . \ @@ -69,6 +69,10 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# patch lxdm.conf.in to avoid a wrong libexec path - must go deep on +# why the build system gets it wrong +sed -i "s/@FULL_LIBEXECDIR@/\/usr\/libexec/" data/lxdm.conf.in + # Patch the Xsession file to source /etc/profile and xprofile on session start patch -p1 < $CWD/patches/source_profile_in_Xsession.diff @@ -89,7 +93,9 @@ patch -p1 < $CWD/patches/lxdm-0.3.0-without_pam.diff # both KDM and GDM set DESKTOP_SESSION regardless of whether PAM is used, # this seems the path of least resistance. This patch *should* be easy # to maintain ; let's hope I don't eat those words. --rworkman -patch -p1 < $CWD/patches/lxdm-0.3.0-set_DESKTOP_SESSION_in_env.diff +patch -p1 < $CWD/patches/lxdm-set_DESKTOP_SESSION_in_env.diff + +sh autogen.sh || true CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -109,6 +115,11 @@ make install DESTDIR=$PKG # We said --without-pam rm -rf $PKG/etc/pam.d +# change default non-existent background image to an lxde one and theme accordingly :P +sed -i -e "s|^bg=.*|bg=/usr/share/lxde/wallpapers/lxde_green.jpg|" \ + $PKG/etc/lxdm/lxdm.conf +sed -i -e "s|Clearlooks|Clearlooks-Olive|" $PKG/etc/lxdm/lxdm.conf + # Install a to-be-customized-if-needed /etc/lxdm/xinitrc cat $CWD/xinitrc > $PKG/etc/lxdm/xinitrc.new diff --git a/system/lxdm/lxdm.info b/system/lxdm/lxdm.info index 31785dbadd..e16c8094c4 100644 --- a/system/lxdm/lxdm.info +++ b/system/lxdm/lxdm.info @@ -1,8 +1,8 @@ PRGNAM="lxdm" -VERSION="0.3.0" +VERSION="20120728_102ea5e" HOMEPAGE="http://lxde.org/" -DOWNLOAD="http://downloads.sourceforge.net/lxde/lxdm-0.3.0.tar.gz" -MD5SUM="1d0688e088edab7c3c563263eb2f9654" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxdm-20120728_102ea5e.tar.xz" +MD5SUM="b81aced3c6892896030dae117b89952b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/lxdm/patches/lxdm-0.3.0-set_DESKTOP_SESSION_in_env.diff b/system/lxdm/patches/lxdm-0.3.0-set_DESKTOP_SESSION_in_env.diff deleted file mode 100644 index 4648db02e3..0000000000 --- a/system/lxdm/patches/lxdm-0.3.0-set_DESKTOP_SESSION_in_env.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nur lxdm-0.3.0.orig//src/lxdm.c lxdm-0.3.0/src/lxdm.c ---- lxdm-0.3.0.orig//src/lxdm.c 2010-09-24 10:43:49.000000000 -0500 -+++ lxdm-0.3.0/src/lxdm.c 2010-10-10 23:13:33.592124056 -0500 -@@ -1359,6 +1359,10 @@ - "is-local",&is_local, - NULL)) - setenv("XDG_SESSION_COOKIE", ck_connector_get_cookie(s->ckc), 1); -+ /* I really don't like doing this, but since both kdm and gdm -+ set this in the environment, and our xinitrc scripts depend -+ on it, here we go with a minor patch... */ -+ setenv("DESKTOP_SESSION", session_name, 1); - } - #endif - char** env, *path; diff --git a/system/lxdm/patches/lxdm-0.3.0-without_pam.diff b/system/lxdm/patches/lxdm-0.3.0-without_pam.diff index e9a8c5ae97..dacd16d770 100644 --- a/system/lxdm/patches/lxdm-0.3.0-without_pam.diff +++ b/system/lxdm/patches/lxdm-0.3.0-without_pam.diff @@ -1,18 +1,18 @@ -diff -Nur lxdm-0.3.0.orig//src/lxdm.c lxdm-0.3.0/src/lxdm.c ---- lxdm-0.3.0.orig//src/lxdm.c 2010-09-24 10:43:49.000000000 -0500 -+++ lxdm-0.3.0/src/lxdm.c 2010-10-10 23:01:24.711716765 -0500 -@@ -150,6 +150,7 @@ +diff -Naur lxdm-0.4.0.orig/src/lxdm.c lxdm-0.4.0/src/lxdm.c +--- lxdm-0.4.0.orig/src/lxdm.c 2011-07-13 14:00:34.000000000 +0200 ++++ lxdm-0.4.0/src/lxdm.c 2011-07-22 17:27:34.000000000 +0200 +@@ -153,6 +153,7 @@ while( waitpid(-1, 0, WNOHANG) > 0 ) ; } +/* Sorry, -ENOPAM here + #if HAVE_LIBPAM static void close_pam_session(pam_handle_t *pamh) { - int err; -@@ -159,6 +160,7 @@ - pam_end(pamh, err); +@@ -164,6 +165,7 @@ pamh = NULL; } + #endif +*/ static LXSession *lxsession_find_greeter(void) diff --git a/system/lxdm/patches/lxdm-set_DESKTOP_SESSION_in_env.diff b/system/lxdm/patches/lxdm-set_DESKTOP_SESSION_in_env.diff new file mode 100644 index 0000000000..6563354a68 --- /dev/null +++ b/system/lxdm/patches/lxdm-set_DESKTOP_SESSION_in_env.diff @@ -0,0 +1,14 @@ +diff -Naur lxdm-20120419_2ce143c.orig/src/lxdm.c lxdm-20120419_2ce143c/src/lxdm.c +--- lxdm-20120419_2ce143c.orig/src/lxdm.c 2012-04-19 16:31:16.000000000 +0200 ++++ lxdm-20120419_2ce143c/src/lxdm.c 2012-04-28 18:17:25.186023147 +0200 +@@ -1490,6 +1490,10 @@ + NULL)) + { + setenv("XDG_SESSION_COOKIE", ck_connector_get_cookie(s->ckc), 1); ++ /* I really don't like doing this, but since both kdm and gdm ++ set this in the environment, and our xinitrc scripts depend ++ on it, here we go with a minor patch... */ ++ setenv("DESKTOP_SESSION", session_name, 1); + } + else + { diff --git a/system/lxdm/patches/remove_suse_from_Xsession.diff b/system/lxdm/patches/remove_suse_from_Xsession.diff index df1da70b83..475c5c75a9 100644 --- a/system/lxdm/patches/remove_suse_from_Xsession.diff +++ b/system/lxdm/patches/remove_suse_from_Xsession.diff @@ -1,10 +1,10 @@ -diff -Nur lxdm-0.3.0.orig//data/Xsession lxdm-0.3.0/data/Xsession ---- lxdm-0.3.0.orig//data/Xsession 2010-10-12 20:13:01.316302089 -0500 -+++ lxdm-0.3.0/data/Xsession 2010-10-12 20:12:40.989504750 -0500 -@@ -31,10 +31,6 @@ +diff -Naur lxdm-0.4.0.orig/data/Xsession lxdm-0.4.0/data/Xsession +--- lxdm-0.4.0.orig/data/Xsession 2011-03-17 16:35:47.000000000 +0100 ++++ lxdm-0.4.0/data/Xsession 2011-07-22 17:23:49.000000000 +0200 +@@ -27,10 +27,6 @@ elif [ -x /etc/X11/Xsession ]; then # mandriva, debian, ubuntu - exec /etc/X11/Xsession $LXSESSION + exec /etc/X11/Xsession "$LXSESSION" -elif [ -x /etc/X11/xinit/xinitrc ]; then -#suse - export WINDOWMANAGER=$LXSESSION -- cgit v1.2.3