diff options
Diffstat (limited to 'lxde-base/lxdm')
| -rw-r--r-- | lxde-base/lxdm/ChangeLog | 10 | ||||
| -rw-r--r-- | lxde-base/lxdm/files/lxdm-0.4.1-optional-consolekit.patch | 46 | ||||
| -rw-r--r-- | lxde-base/lxdm/lxdm-0.4.1-r8.ebuild | 86 | ||||
| -rw-r--r-- | lxde-base/lxdm/metadata.xml | 1 |
4 files changed, 142 insertions, 1 deletions
diff --git a/lxde-base/lxdm/ChangeLog b/lxde-base/lxdm/ChangeLog index 1855e1828ad5..b42174d5f7ce 100644 --- a/lxde-base/lxdm/ChangeLog +++ b/lxde-base/lxdm/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for lxde-base/lxdm # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxdm/ChangeLog,v 1.27 2013/12/13 20:34:53 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxdm/ChangeLog,v 1.28 2013/12/22 12:19:53 hwoarang Exp $ + +*lxdm-0.4.1-r8 (22 Dec 2013) + + 22 Dec 2013; Markos Chandras <hwoarang@gentoo.org> + +files/lxdm-0.4.1-optional-consolekit.patch, +lxdm-0.4.1-r8.ebuild, + metadata.xml: + Add (and fix) upstream patch for optional consolekit support. Thanks to + Bombino <teknocratdefunct@riseup.net>. Bug #443666 13 Dec 2013; Markos Chandras <hwoarang@gentoo.org> lxdm-0.4.1-r7.ebuild: Require automake-1.12. Bug #493996 thanks to piruthiviraj natarajan 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 new file mode 100644 index 000000000000..f21f4fd96057 --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.4.1-optional-consolekit.patch @@ -0,0 +1,46 @@ +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%2Flxdm;a=blobdiff_plain;f=configure.ac;h=9e21a22d893b45f1564e23b12c00a0bf546d95e8;hp=3c540df5cc76aa8c3ef394bae4f0d0cf33bff993;hb=371b018474217bdff1d5108b384fbf0f45aa873d;hpb=f625fd7b1f90caac260422a6c13e0cb12ccf1f96 + +Further Changes: Mmove the AC_CHECK_LIB([ck-connector]) inside the 'if' block +to avoid checking and enabling ck-connector even if --disable-consolekit was +passed. + +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 + +-AC_CHECK_LIB([ck-connector],[ck_connector_open_session]) +- + # Checks for header files. + AC_PATH_X + AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h utmpx.h]) +@@ -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_ARG_ENABLE(consolekit, ++ 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/lxdm-0.4.1-r8.ebuild b/lxde-base/lxdm/lxdm-0.4.1-r8.ebuild new file mode 100644 index 000000000000..437f3d81ee98 --- /dev/null +++ b/lxde-base/lxdm/lxdm-0.4.1-r8.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxdm/lxdm-0.4.1-r8.ebuild,v 1.1 2013/12/22 12:19:53 hwoarang Exp $ + +EAPI="2" + +WANT_AUTOMAKE="1.12" #493996 +inherit eutils autotools + +DESCRIPTION="LXDE Display Manager" +HOMEPAGE="http://lxde.org" +SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86" + +IUSE="consolekit debug gtk3 nls pam" + +RDEPEND="consolekit? ( sys-auth/consolekit ) + x11-libs/libxcb + gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( x11-libs/gtk+:2 ) + nls? ( sys-devel/gettext ) + pam? ( virtual/pam )" +DEPEND="${RDEPEND} + >=dev-util/intltool-0.40 + virtual/pkgconfig" + +src_prepare() { + # Upstream bug, tarball contains pre-made lxdm.conf + rm "${S}"/data/lxdm.conf || die + + # There is consolekit + epatch "${FILESDIR}/${P}-pam_console-disable.patch" + # Fix null pointer dereference, backported from git + epatch "${FILESDIR}/${P}-git-fix-null-pointer-deref.patch" + + epatch "${FILESDIR}"/${P}-configure-add-pam.patch + + # 403999 + epatch "${FILESDIR}"/${P}-missing-pam-defines.patch + + # 412025 + epatch "${FILESDIR}"/${P}-event-check.patch + + # 393329 Selinux support + epatch "${FILESDIR}"/${P}-selinux-support.patch + + # See https://bugs.launchpad.net/ubuntu/+source/lxdm/+bug/922363 + epatch "${FILESDIR}/${P}-fix-pam-100-cpu.patch" + + # Optional Consolekit support. bug #443666 + epatch "${FILESDIR}"/${P}-optional-consolekit.patch + + # this replaces the bootstrap/autogen script in most packages + eautoreconf + + # process LINGUAS + if use nls; then + einfo "Running intltoolize ..." + intltoolize --force --copy --automake || die + strip-linguas -i "${S}/po" || die + fi +} +src_configure() { + econf --enable-password \ + --with-x \ + --with-xconn=xcb \ + $(use_enable consolekit) \ + $(use_enable gtk3) \ + $(use_enable nls) \ + $(use_enable debug) \ + $(use_with pam) +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc AUTHORS README TODO || die +} + +pkg_postinst() { + echo + elog "Take into consideration that LXDM is in the early stages of development!" + echo +} diff --git a/lxde-base/lxdm/metadata.xml b/lxde-base/lxdm/metadata.xml index ad7b53289022..f732815e9984 100644 --- a/lxde-base/lxdm/metadata.xml +++ b/lxde-base/lxdm/metadata.xml @@ -3,6 +3,7 @@ <pkgmetadata> <herd>lxde</herd> <use> + <flag name="consolekit">Enables support for authorization using consolekit</flag> <flag name="gtk3">Use GTK+3 instead of 2</flag> </use> </pkgmetadata> |