lxdm: remove LXDM 0.4.1 in favor of LXDM 0.5 of meta-openembeddeddaisy

Remove LXDM 0.4.1 receipts in favor of LXDM 0.5 from meta-openembedded.
The version 0.5 also supports systemd-logind as login/session manager
which allows to remove now unsupported ConsoleKit without losing
functionality.

12 files changed, 0 insertions, 379 deletions

diff --git a/recipes-lxde/lxdm/files/init b/recipes-lxde/lxdm/files/init
deleted file mode 100644
index d8bb4eb..0000000
--- a/recipes-lxde/lxdm/files/init
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-. /etc/init.d/functions
-
-DAEMON=/usr/sbin/lxdm
-PIDDIR=/var/run
-PIDFILE=$PIDDIR/lxdm.pid
-
-for x in $(cat /proc/cmdline); do
-	case $x in
-	x11=false)
-		echo "LXDM disabled"
-		exit 0;
-		;;
-	esac
-done
-
-case "$1" in
-	start)
-		echo "Starting LXDM"
-		start-stop-daemon --start --quiet --pidfile $PIDFILE -m -b \
-			--exec $DAEMON
-	;;
-
-	stop)
-		echo "Stopping LXDM"
-		start-stop-daemon --stop --quiet --pidfile $PIDFILE
-	;;
-
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-	;;
-
-	*)
-		echo "usage: $0 { start | stop | restart }"
-	;;
-esac
-
-exit 0
diff --git a/recipes-lxde/lxdm/files/lxdm-configure-ac.patch b/recipes-lxde/lxdm/files/lxdm-configure-ac.patch
deleted file mode 100644
index c9197b9..0000000
--- a/recipes-lxde/lxdm/files/lxdm-configure-ac.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lxdm-0.4.1/configure.ac~	2014-04-30 17:20:10.000000000 +0200
-+++ lxdm-0.4.1/configure.ac	2014-04-30 17:58:10.553136640 +0200
-@@ -3,7 +3,7 @@
- 
- AC_PREREQ([2.63])
- AC_INIT([lxdm], [0.4.1], [http://lxde.org/])
--AM_INIT_AUTOMAKE([-Wall -Werror foreign])
-+AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
- 
- AC_CONFIG_SRCDIR([src/lxdm.c])
- AC_CONFIG_HEADERS([config.h])
diff --git a/recipes-lxde/lxdm/files/xinitrc b/recipes-lxde/lxdm/files/xinitrc
deleted file mode 100644
index 68121fb..0000000
--- a/recipes-lxde/lxdm/files/xinitrc
+++ /dev/null
@@ -1,51 +0,0 @@
-# Script based on Gentoo lxdm xinitrc
-
-case $SHELL in
-  */bash)
-    [ -z "$BASH" ] && exec $SHELL $0 "$@"
-    set +o posix
-    [ -f /etc/profile ] && . /etc/profile
-    if [ -f $HOME/.bash_profile ]; then
-      . $HOME/.bash_profile
-    elif [ -f $HOME/.bash_login ]; then
-      . $HOME/.bash_login
-    elif [ -f $HOME/.profile ]; then
-      . $HOME/.profile
-    fi
-    ;;
-  */zsh)
-    [ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@"
-    emulate -R zsh
-    [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc
-    zhome=${ZDOTDIR:-$HOME}
-    # zshenv is always sourced automatically.
-    [ -f $zdir/zprofile ] && . $zdir/zprofile
-    [ -f $zhome/.zprofile ] && . $zhome/.zprofile
-    [ -f $zdir/zlogin ] && . $zdir/zlogin
-    [ -f $zhome/.zlogin ] && . $zhome/.zlogin
-    ;;
-  */csh|*/tcsh)
-    # [t]cshrc is always sourced automatically.
-    # Note that sourcing csh.login after .cshrc is non-standard.
-    xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX`
-    $SHELL -c "if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c export -p >! $xsess_tmp"
-    . $xsess_tmp
-    rm -f $xsess_tmp
-    ;;
-  *) # Plain sh, ksh, and anything we do not know.
-    [ -f /etc/profile ] && . /etc/profile
-    [ -f $HOME/.profile ] && . $HOME/.profile
-    ;;
-esac
-
-[ -f /etc/xprofile ] && . /etc/xprofile
-[ -f $HOME/.xprofile ] && . $HOME/.xprofile
-
-# run all system xinitrc shell scripts.
-XINITDIR=/etc/X11/Xinit.d
-XINITFILES=`ls -X $XINITDIR`
-for XINITFILE in $XINITFILES; do
-  if [ -x "$XINITDIR/$XINITFILE" ]; then
-    . $XINITDIR/$XINITFILE
-  fi
-done
diff --git a/recipes-lxde/lxdm/lxdm-0.4.1/fix_event_check_bug_caused_cpu_100.patch b/recipes-lxde/lxdm/lxdm-0.4.1/fix_event_check_bug_caused_cpu_100.patch
deleted file mode 100644
index f0ca23b..0000000
--- a/recipes-lxde/lxdm/lxdm-0.4.1/fix_event_check_bug_caused_cpu_100.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d4e41ecb36a1ea29482b75674d804bb0f05540b2 Mon Sep 17 00:00:00 2001
-From: dgod <dgod.osa@gmail.com>
-Date: Sun, 25 Dec 2011 15:23:19 +0800
-Subject: [PATCH] fix event check bug caused cpu 100%
-
----
- src/lxcom.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/lxcom.c b/src/lxcom.c
-index 02763eb..18ee12e 100644
---- a/src/lxcom.c
-+++ b/src/lxcom.c
-@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout)
- 
- static gboolean lxcom_check(GSource *source)
- {
--	return TRUE;
-+	return (((LXComSource*)source)->poll.revents&G_IO_IN)?TRUE:FALSE;
- }
- 
- static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer user_data)
--- 
-1.7.4.1
-
diff --git a/recipes-lxde/lxdm/lxdm-0.4.1/lxdm-0.4.1-git-fix-null-pointer-deref.patch b/recipes-lxde/lxdm/lxdm-0.4.1/lxdm-0.4.1-git-fix-null-pointer-deref.patch
deleted file mode 100644
index 7abdbd4..0000000
--- a/recipes-lxde/lxdm/lxdm-0.4.1/lxdm-0.4.1-git-fix-null-pointer-deref.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 19f82a206b2cec964cea0475395d63dedf183788 Mon Sep 17 00:00:00 2001
-From: Andrea Florio <andrea@opensuse.org>
-Date: Fri, 29 Jul 2011 23:59:32 +0200
-Subject: [PATCH] fix null pointer dereference
-
----
- src/config.c |   25 ++++++++++---------------
- 1 files changed, 10 insertions(+), 15 deletions(-)
-
-diff --git a/src/config.c b/src/config.c
-index 3f92f7b..4603ab4 100644
---- a/src/config.c
-+++ b/src/config.c
-@@ -125,24 +125,19 @@ static gboolean image_file_valid(const char *filename)
- static void update_face_image(GtkWidget *w)
- {
- 	GdkPixbuf *pixbuf;
--	char *path;
--	path=g_build_filename(user->pw_dir,".face",NULL);
--	if(access(path,R_OK))
--	{
--		g_free(path);
--		if(ui_nobody)
--			pixbuf=gdk_pixbuf_new_from_file_at_scale(ui_nobody,48,48,FALSE,NULL);
--		if(!pixbuf)
--			pixbuf=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
-+	char *path=g_build_filename(user->pw_dir,".face",NULL);
-+	pixbuf=gdk_pixbuf_new_from_file_at_scale(path,48,48,FALSE,NULL);
-+	g_free(path);
-+	if(!pixbuf && ui_nobody)
-+		pixbuf=gdk_pixbuf_new_from_file_at_scale(ui_nobody,48,48,FALSE,NULL);
-+	if(!pixbuf)
-+		pixbuf=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
- 						"avatar-default", 48,GTK_ICON_LOOKUP_FORCE_SIZE,NULL);
--	}
--	else
-+	if(pixbuf)
- 	{
--		pixbuf=gdk_pixbuf_new_from_file_at_scale(path,48,48,FALSE,NULL);
--		g_free(path);
-+		gtk_image_set_from_pixbuf(GTK_IMAGE(w),pixbuf);
-+		g_object_unref(pixbuf);
- 	}
--	gtk_image_set_from_pixbuf(GTK_IMAGE(w),pixbuf);
--	g_object_unref(pixbuf);
- }
- 
- static void set_face_file(const char *filename)
--- 
-1.7.0.1
-
diff --git a/recipes-lxde/lxdm/lxdm-0.4.1/lxdm-0.4.1-oe-xsession.patch b/recipes-lxde/lxdm/lxdm-0.4.1/lxdm-0.4.1-oe-xsession.patch
deleted file mode 100644
index e4e4207..0000000
--- a/recipes-lxde/lxdm/lxdm-0.4.1/lxdm-0.4.1-oe-xsession.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- lxdm-0.4.1.orig/data/Xsession	2011-11-16 22:27:33.621019188 +0100
-+++ lxdm-0.4.1/data/Xsession	2011-11-17 20:20:24.011703381 +0100
-@@ -12,35 +12,12 @@
- [ -f /etc/xprofile ] && . /etc/xprofile
- [ -f ~/.xprofile ] && . ~/.xprofile
- 
--if [ -f /etc/X11/xinit/xinitrc-common ]; then
--# fedora
--	. /etc/X11/xinit/xinitrc-common
--	if ! [ -z "$XDG_SESSION_COOKIE" ]; then
--		CK_XINIT_SESSION=
--	elif [ -x /usr/bin/ck-launch-session -a -z "$CK_XINIT_SESSION" ]; then
--		CK_XINIT_SESSION="/usr/bin/ck-launch-session"
--	fi
--	exec -l $SHELL -c "$CK_XINIT_SESSION \"$LXSESSION\""
--elif [ -x /etc/X11/xinit/Xsession ]; then
--# fedora
--	exec /etc/X11/xinit/Xsession "$LXSESSION"
--elif [ -x /etc/X11/Xsession ]; then
--# mandriva, debian, ubuntu
--	exec /etc/X11/Xsession "$LXSESSION"
--elif [ -x /etc/X11/xinit/xinitrc ]; then
--#suse
--	export WINDOWMANAGER=$LXSESSION
--	exec -l $SHELL -c /etc/X11/xinit/xinitrc
--else
--# unknown, user should custom /etc/lxdm/xinitrc self
--	if [ -x /etc/lxdm/xinitrc ]; then
--		. /etc/lxdm/xinitrc
--	fi
--	if ! [ -z "$XDG_SESSION_COOKIE" ]; then
--		CK_XINIT_SESSION=
--	elif [ -x /usr/bin/ck-launch-session ]; then
--		CK_XINIT_SESSION="/usr/bin/ck-launch-session"
--	fi
--	exec -l $SHELL -c "$CK_XINIT_SESSION \"$LXSESSION\""
-+if [ -x /etc/lxdm/xinitrc ]; then
-+	. /etc/lxdm/xinitrc
- fi
--
-+if ! [ -z "$XDG_SESSION_COOKIE" ]; then
-+	CK_XINIT_SESSION=
-+elif [ -x /usr/bin/ck-launch-session ]; then
-+	CK_XINIT_SESSION="/usr/bin/ck-launch-session"
-+fi
-+exec -l $SHELL -c "$CK_XINIT_SESSION \"$LXSESSION\""
diff --git a/recipes-lxde/lxdm/lxdm-0.4.1/lxdm-0.4.1-pam_console-disable.patch b/recipes-lxde/lxdm/lxdm-0.4.1/lxdm-0.4.1-pam_console-disable.patch
deleted file mode 100644
index 628e9a5..0000000
--- a/recipes-lxde/lxdm/lxdm-0.4.1/lxdm-0.4.1-pam_console-disable.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- lxdm-0.4.0.orig/pam/lxdm
-+++ lxdm-0.4.0/pam/lxdm
-@@ -5,5 +5,5 @@ account    include	system-auth
- session    optional	pam_keyinit.so force revoke
- session    include	system-auth
- session    required	pam_loginuid.so
--session    optional	pam_console.so
-+#session    optional	pam_console.so
- session    optional	pam_gnome_keyring.so auto_start
diff --git a/recipes-lxde/lxdm/lxdm-0.4.1/lxdm-0.4.1-uclibc-friendly.patch b/recipes-lxde/lxdm/lxdm-0.4.1/lxdm-0.4.1-uclibc-friendly.patch
deleted file mode 100644
index 2adab16..0000000
--- a/recipes-lxde/lxdm/lxdm-0.4.1/lxdm-0.4.1-uclibc-friendly.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -auNr lxdm-0.4.1.orig//configure.ac lxdm-0.4.1/configure.ac
---- lxdm-0.4.1.orig//configure.ac	2011-11-16 22:27:33.624019150 +0100
-+++ lxdm-0.4.1/configure.ac	2011-11-16 22:29:49.537310486 +0100
-@@ -23,7 +23,7 @@
- 
- # Checks for header files.
- AC_PATH_X
--AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h utmpx.h])
-+AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h utmpx.h, execinfo.h])
- 
- # Checks for typedefs, structures, and compiler characteristics.
- AC_TYPE_PID_T
-diff -auNr lxdm-0.4.1.orig//src/lxdm.c lxdm-0.4.1/src/lxdm.c
---- lxdm-0.4.1.orig//src/lxdm.c	2011-11-16 22:27:33.617019240 +0100
-+++ lxdm-0.4.1/src/lxdm.c	2011-11-16 22:29:19.030694008 +0100
-@@ -52,7 +52,9 @@
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- 
-+#ifdef HAVE_EXECINFO_H
- #include <execinfo.h>
-+#endif
- 
- #ifdef HAVE_UTMPX_H
- #include <utmpx.h>
-@@ -1576,6 +1578,7 @@
- 	return success;;
- }
- 
-+#ifdef HAVE_EXECINFO_H
- static void log_sigsegv(void)
- {
- 	void *array[40];
-@@ -1591,12 +1594,15 @@
- 
- 	free(bt_strs);
- }
-+#endif
- 
- static void sigsegv_handler(int sig)
- {
- 	switch(sig){
- 	case SIGSEGV:
-+#ifdef HAVE_EXECINFO_H
- 		log_sigsegv();
-+#endif
- 		lxdm_quit_self(0);
- 		break;
- 	default:
diff --git a/recipes-lxde/lxdm/lxdm-0.4.1/lxdm-0.4.1-use-oe-pam-config.patch b/recipes-lxde/lxdm/lxdm-0.4.1/lxdm-0.4.1-use-oe-pam-config.patch
deleted file mode 100644
index c1c8b0f..0000000
--- a/recipes-lxde/lxdm/lxdm-0.4.1/lxdm-0.4.1-use-oe-pam-config.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lxdm-0.4.1.orig/src/lxdm.c	2011-11-16 22:27:33.617019240 +0100
-+++ lxdm-0.4.1/src/lxdm.c	2011-11-17 19:42:08.674559677 +0100
-@@ -874,7 +874,7 @@
-     int err;
-     char x[256];
-  
--    if(!s->pamh && PAM_SUCCESS != pam_start("lxdm", pw->pw_name, &conv, &s->pamh))
-+    if(!s->pamh && PAM_SUCCESS != pam_start("login", pw->pw_name, &conv, &s->pamh))
-     {
-         s->pamh = NULL;
-         return;
diff --git a/recipes-lxde/lxdm/lxdm-0.4.1/lxdm-0.4.1-use-xserver-script.patch b/recipes-lxde/lxdm/lxdm-0.4.1/lxdm-0.4.1-use-xserver-script.patch
deleted file mode 100644
index b8faa1d..0000000
--- a/recipes-lxde/lxdm/lxdm-0.4.1/lxdm-0.4.1-use-xserver-script.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lxdm-0.4.1.orig/data/lxdm.conf.in	2011-11-16 22:27:33.621019188 +0100
-+++ lxdm-0.4.1/data/lxdm.conf.in	2011-11-17 19:46:30.870263430 +0100
-@@ -20,7 +20,7 @@
- 
- [server]
- ## arg used to start xserver, not fully function
--# arg=/usr/bin/X -background vt1
-+arg=/etc/X11/Xserver
- 
- [display]
- ## gtk theme used by greeter
diff --git a/recipes-lxde/lxdm/lxdm-0.4.1/missingAM_GLIB_GNU_GETTEXT.patch b/recipes-lxde/lxdm/lxdm-0.4.1/missingAM_GLIB_GNU_GETTEXT.patch
deleted file mode 100644
index 43a8b1c..0000000
--- a/recipes-lxde/lxdm/lxdm-0.4.1/missingAM_GLIB_GNU_GETTEXT.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urNdb lxdm-0.4.1.old//config.h.in lxdm-0.4.1//config.h.in
---- lxdm-0.4.1.old//config.h.in	2011-07-29 15:43:45.000000000 +0200
-+++ lxdm-0.4.1//config.h.in	2011-11-29 22:26:14.000000000 +0100
-@@ -1,5 +1,8 @@
- /* config.h.in.  Generated from configure.ac by autoheader.  */
- 
-+/* always defined to indicate that i18n is enabled */
-+/*#undef ENABLE_NLS*/
-+
- /* Gettext package. */
- #undef GETTEXT_PACKAGE
- 
-diff -urNdb lxdm-0.4.1.old//configure.ac lxdm-0.4.1//configure.ac
---- lxdm-0.4.1.old//configure.ac	2011-07-29 15:42:33.000000000 +0200
-+++ lxdm-0.4.1//configure.ac	2011-11-29 22:23:08.000000000 +0100
-@@ -141,6 +141,9 @@
- GETTEXT_PACKAGE=lxdm
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
-+AM_GLIB_GNU_GETTEXT
-+
-+#AC_SUBST(GMSGFMT, ($MSGFMT))
- 
- AC_CONFIG_FILES([
- 	Makefile
diff --git a/recipes-lxde/lxdm/lxdm_0.4.1.bb b/recipes-lxde/lxdm/lxdm_0.4.1.bb
deleted file mode 100644
index 50552e3..0000000
--- a/recipes-lxde/lxdm/lxdm_0.4.1.bb
+++ /dev/null
@@ -1,49 +0,0 @@
-DESCRIPTION = "LXDE Display Manager"
-HOMEPAGE = "http://lxde.org/"
-SECTION = "x11"
-
-PR = "r4"
-
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-
-DEPENDS += "virtual/libintl intltool-native iso-codes gtk+ consolekit libxcb ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
-
-RDEPENDS_${PN} = "xinit"
-
-RCONFLICTS_${PN} = "xserver-nodm-init"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz \
-           file://${P}-pam_console-disable.patch \
-           file://${P}-git-fix-null-pointer-deref.patch \
-           file://${P}-use-oe-pam-config.patch \
-           file://${P}-use-xserver-script.patch \
-           file://${P}-oe-xsession.patch \
-           file://${P}-uclibc-friendly.patch \
-           file://xinitrc \
-           file://init \
-           file://missingAM_GLIB_GNU_GETTEXT.patch \
-           file://fix_event_check_bug_caused_cpu_100.patch \
-           file://lxdm-configure-ac.patch \
-"
-SRC_URI[md5sum] = "8da1cfc2be6dc9217c85a7cf51e1e821"
-SRC_URI[sha256sum] = "9e0d0a5672fcf31a18de8178ce73eab1723d6ae7097dfe41e9fe2c46e180cf08"
-
-EXTRA_OECONF += "--enable-password --with-x --with-xconn=xcb"
-
-inherit autotools pkgconfig gettext update-rc.d
-
-INITSCRIPT_NAME = "lxdm"
-INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
-
-do_configure_prepend() {
-    cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/po/
-}
-
-do_install_append () {
-    rm ${D}/${sysconfdir}/pam.d/lxdm
-    install -d ${D}/${sysconfdir}/lxdm
-    install -d ${D}/${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/xinitrc ${D}/${sysconfdir}/lxdm
-    install -m 0755 ${WORKDIR}/init ${D}/etc/init.d/lxdm
-}