diff options
Diffstat (limited to 'lxde-base/lxdm/files')
4 files changed, 88 insertions, 20 deletions
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-event-check.patch b/lxde-base/lxdm/files/lxdm-0.4.1-event-check.patch new file mode 100644 index 00000000..4c2d5b35 --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.4.1-event-check.patch @@ -0,0 +1,25 @@ +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 1/1] 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/lxde-base/lxdm/files/lxdm-0.4.1-fix-optional-pam.patch b/lxde-base/lxdm/files/lxdm-0.4.1-fix-optional-pam.patch new file mode 100644 index 00000000..0aecc085 --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.4.1-fix-optional-pam.patch @@ -0,0 +1,31 @@ +diff --git a/Makefile.am b/Makefile.am +index bfac56b..40710fc 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,10 +2,13 @@ NULL = + SUBDIRS= \ + src \ + po \ +- pam \ + data \ + $(NULL) + ++if HAVE_PAM ++SUBDIRS += pam ++endif ++ + rpm: dist @PACKAGE_NAME@.spec + rpmbuild -bb \ + --define "_sourcedir `pwd`" \ +diff --git a/configure.ac b/configure.ac +index ae5177f..aaa1bad 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -27,6 +27,7 @@ if test "x$USE_PAM" != "xno" ; then + AC_MSG_ERROR(["PAM support requested, but pam_open_session not found."]) + fi]) + fi ++AM_CONDITIONAL(HAVE_PAM, [test -n "$USE_PAM" -a "x$USE_PAM" != xno ]) + + # Checks for header files. + AC_PATH_X diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-optional-consolekit.patch b/lxde-base/lxdm/files/lxdm-0.4.1-optional-consolekit.patch index 021f3212..621a9d62 100644 --- a/lxde-base/lxdm/files/lxdm-0.4.1-optional-consolekit.patch +++ b/lxde-base/lxdm/files/lxdm-0.4.1-optional-consolekit.patch @@ -1,5 +1,13 @@ ---- a/configure.ac -+++ b/configure.ac +X-Gentoo-Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=443666 +X-Git-Url: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxdm;a=patch;h=902438eb83b4ae97d774e4e5f38b46f2d826df2f +X-Git-Url: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxdm;a=patch;h=371b018474217bdff1d5108b384fbf0f45aa873d + +Signed-off-by: Markos Chandras <hwoarang@gentoo.org> + +Index: lxdm-0.4.1/configure.ac +=================================================================== +--- lxdm-0.4.1.orig/configure.ac ++++ lxdm-0.4.1/configure.ac @@ -28,8 +28,6 @@ if test "x$USE_PAM" != "xno" ; then fi]) fi @@ -9,30 +17,27 @@ # Checks for header files. AC_PATH_X AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h utmpx.h]) -@@ -89,11 +87,21 @@ PKG_CHECK_MODULES(GTK, [$pkg_modules]) +@@ -89,11 +87,22 @@ PKG_CHECK_MODULES(GTK, [$pkg_modules]) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) -PKG_CHECK_MODULES(CONSOLEKIT, "ck-connector",[ -- AC_SUBST(CONSOLEKIT_CFLAGS) -- AC_SUBST(CONSOLEKIT_LIBS)],[ -- echo "ConsoleKit devel package not found" -- ]) ++ +AC_ARG_ENABLE(consolekit, -+AC_HELP_STRING([--enable-consolekit], [enable ConsoleKit support]), -+[case "${enableval}" in -+ yes) enable_ck=yes ;; -+ no) enable_ck=no ;; -+ *) AC_MSG_ERROR([bad value "${enableval}" for --enable-consolekit, use "yes" (default) or "no".]) ;; -+esac],[]) -+if test "x$enable_ck" = "xyes" ; then -+ AC_CHECK_LIB([ck-connector],[ck_connector_open_session]) -+ PKG_CHECK_MODULES(CONSOLEKIT, "ck-connector",[ -+ AC_SUBST(CONSOLEKIT_CFLAGS) -+ AC_SUBST(CONSOLEKIT_LIBS)],[ -+ echo "ConsoleKit devel package not found" -+ ]) ++ AC_HELP_STRING([--disable-consolekit],[disable ConsoleKit support]), ++ [enable_consolekit=$enableval], ++ [enable_consolekit=yes] ++) ++ ++if test "x$enable_consolekit" = "xyes" ; then ++ AC_CHECK_LIB([ck-connector],[ck_connector_open_session]) ++ PKG_CHECK_MODULES(CONSOLEKIT, "ck-connector",[ + AC_SUBST(CONSOLEKIT_CFLAGS) + AC_SUBST(CONSOLEKIT_LIBS)],[ + echo "ConsoleKit devel package not found" + ]) +fi ++ AC_ARG_ENABLE(password, AC_HELP_STRING([--enable-password],[enable to load autologin password store at config file]), diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-selinux-support.patch b/lxde-base/lxdm/files/lxdm-0.4.1-selinux-support.patch new file mode 100644 index 00000000..c7df391b --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.4.1-selinux-support.patch @@ -0,0 +1,7 @@ +--- a/pam/lxdm 2011-12-05 17:30:39.749064359 -0600 ++++ b/pam/lxdm 2011-12-05 17:31:19.355569211 -0600 +@@ -7,3 +7,4 @@ + session required pam_loginuid.so + #session optional pam_console.so + session optional pam_gnome_keyring.so auto_start ++session optional pam_selinux.so |