diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2012-01-13 23:23:48 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2012-01-13 23:23:48 +0000 |
| commit | c6501ab36d7a8f43a94256ab2346ebf71599e1bf (patch) | |
| tree | 4e3ff1277ee2e0327e4bf6875a1dc3ee2981e04d /x11-misc | |
| parent | Version bumps. (diff) | |
| download | gentoo-2-c6501ab36d7a8f43a94256ab2346ebf71599e1bf.tar.gz gentoo-2-c6501ab36d7a8f43a94256ab2346ebf71599e1bf.tar.bz2 gentoo-2-c6501ab36d7a8f43a94256ab2346ebf71599e1bf.zip | |
Apply pkglibexec patch. Thanks to Alphat-PC <AlphatPC@gmail.com>. Bug #397399
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/lightdm/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-misc/lightdm/files/lightdm-1.0.6-pkglibexec.patch | 25 | ||||
| -rw-r--r-- | x11-misc/lightdm/lightdm-1.0.6-r3.ebuild | 6 |
3 files changed, 34 insertions, 5 deletions
diff --git a/x11-misc/lightdm/ChangeLog b/x11-misc/lightdm/ChangeLog index 08a8ad617d8c..0864142d8a81 100644 --- a/x11-misc/lightdm/ChangeLog +++ b/x11-misc/lightdm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/lightdm -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.23 2011/11/19 20:27:34 hwoarang Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.24 2012/01/13 23:23:48 hwoarang Exp $ + + 13 Jan 2012; Markos Chandras <hwoarang@gentoo.org> + +files/lightdm-1.0.6-pkglibexec.patch, lightdm-1.0.6-r3.ebuild: + Apply pkglibexec patch. Thanks to Alphat-PC <AlphatPC@gmail.com>. Bug #397399 *lightdm-1.0.6-r3 (19 Nov 2011) diff --git a/x11-misc/lightdm/files/lightdm-1.0.6-pkglibexec.patch b/x11-misc/lightdm/files/lightdm-1.0.6-pkglibexec.patch new file mode 100644 index 000000000000..ef208a7f11af --- /dev/null +++ b/x11-misc/lightdm/files/lightdm-1.0.6-pkglibexec.patch @@ -0,0 +1,25 @@ +Install dir: + /usr/libexec/lightdm-guest-session-wrapper + /usr/libexec/lightdm-set-defaults + /usr/libexec/lightdm/gdmflexiserver + +Due to the following change, pkglibexec_SCRIPTS is invalid: + http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf + +--- + utils/Makefile.am | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/utils/Makefile.am b/utils/Makefile.am +index 41df48b..ee527cf 100644 +--- a/utils/Makefile.am ++++ b/utils/Makefile.am +@@ -1,6 +1,7 @@ + bin_PROGRAMS = dm-tool + libexec_PROGRAMS = lightdm-set-defaults +-dist_pkglibexec_SCRIPTS = gdmflexiserver ++ldmlibexecdir = $(libexecdir)/@PACKAGE@ ++dist_ldmlibexec_SCRIPTS = gdmflexiserver + + dm_tool_SOURCES = \ + dm-tool.c diff --git a/x11-misc/lightdm/lightdm-1.0.6-r3.ebuild b/x11-misc/lightdm/lightdm-1.0.6-r3.ebuild index b90f2ca76a59..46a46b55b5e5 100644 --- a/x11-misc/lightdm/lightdm-1.0.6-r3.ebuild +++ b/x11-misc/lightdm/lightdm-1.0.6-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.0.6-r3.ebuild,v 1.1 2011/11/19 20:27:34 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.0.6-r3.ebuild,v 1.2 2012/01/13 23:23:48 hwoarang Exp $ EAPI=4 inherit autotools eutils pam @@ -42,7 +42,7 @@ src_prepare() { sed -i -e "/minimum-uid/s:500:1000:" data/users.conf || die sed -i -e "s:gtk+-3.0:gtk+-2.0:" configure.ac || die epatch "${FILESDIR}"/session-wrapper-${PN}.patch - + epatch "${FILESDIR}"/${P}-pkglibexec.patch if has_version dev-libs/gobject-introspection; then eautoreconf else |