diff options
| author |   Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2011-10-21 11:52:53 +0200 |
|---|---|---|
| committer | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2011-10-21 11:52:53 +0200 |
| commit | ad1072198f61e6f4cee2d13fb0e47e7a403c8684 (patch) | |
| tree | 82c5fe9b27191a0810fee90f9c3f1a3bff93c8cf | |
| parent | update tracker (diff) | |
| download | keruspe-ad1072198f61e6f4cee2d13fb0e47e7a403c8684.tar.gz keruspe-ad1072198f61e6f4cee2d13fb0e47e7a403c8684.tar.bz2 keruspe-ad1072198f61e6f4cee2d13fb0e47e7a403c8684.zip | |
fix gdm
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
| -rw-r--r-- | gnome-base/gdm/Manifest | 3 | ||||
| -rw-r--r-- | gnome-base/gdm/files/gdm-2.32.0-custom-session.patch | 51 | ||||
| -rw-r--r-- | gnome-base/gdm/gdm-9999.ebuild | 3 |
3 files changed, 1 insertions, 56 deletions
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest index 21f3cb72..46b1e04f 100644 --- a/gnome-base/gdm/Manifest +++ b/gnome-base/gdm/Manifest @@ -1,11 +1,10 @@ AUX 49-keychain 181 RMD160 32ce131e93fc2d8640edee72ad42124537860156 SHA1 b4518f9d8ba65d0cf4d64ded844e59be343088d3 SHA256 d73e07847bfa6ac69938aa309f5c137d4c36248cedf9834db1315ba1b2b87140 AUX 50-ssh-agent 243 RMD160 14327252dc1da75bdb49380960434a613b28cfa6 SHA1 e808be7a34324b269d493585990f134e82cc722a SHA256 f0790148b975ef1e7a37ffe8f5d90f943746f0a3bcf9d7fad8500219e2114042 AUX gdm-2.32.0-automagic-libxklavier-support.patch 2069 RMD160 805e7bfd5b2429c8fb5aeac397c2d564620ae41c SHA1 80bb72815646d40eb6a750a7be52d8e4f399d840 SHA256 91fdd46ab5ad1b4071cb798499ddd98bee47c67961906d1db0ee47cd4919fac5 -AUX gdm-2.32.0-custom-session.patch 1317 RMD160 ca07b9580da3bb436629c4655a89b4b6374eb6ba SHA1 db023e279217896849c541dfb50cb96491280ad6 SHA256 3f79b0355225669dd791527a50d5bd0f7ceca850a8eab7bb32f52d609b10eed6 AUX gdm-2.32.0-fix-daemonize-regression.patch 4048 RMD160 4219fec833f0e62a10e52dee89ef5d1a8618d1c1 SHA1 69c5ed6869d5a467e64249f3afe695796c17c463 SHA256 e95e1ebfcfe2c896130e4925fa6f23911bcfe4db27e2a6788229538c6bb2a59d AUX gdm-2.32.0-fix-vt-problems.patch 6135 RMD160 7b0a458df1363937c2a6269be192bdb8121c2540 SHA1 69ab0dfb4bc9cb2008a4d7fabfd029cca570368f SHA256 702594b647a728aad7f834f4e38f100f954019f63b7d786b2c9646fe8a24f78d AUX gdm-2.32.0-selinux-remove-attr.patch 851 RMD160 10dc29802fb29047188bff7aafe979a5e15e030a SHA1 d78bde425b7a141c91767c3e639ee0011feddadc SHA256 ad13d4b1253dca7d5ac362bcce9f5861c2830a3df32e5370a5a0d975c32ec258 AUX gdm-2.32.0-xinitrc-ssh-agent.patch 863 RMD160 6ea58bdc1fa24d41f3c51fc7cdbabc05417053f0 SHA1 ad98258168b84c80d581085804b61649ac67e4d5 SHA256 71231d08baf41ee7b91c33c3d8a731c078d1d29328e09223efb1f579bacdaffe AUX gdm@.service 219 RMD160 b965e650228a7e2459905420852cb35b1f99b2cb SHA1 37e5a70938d9fb6a621e215244e5ade0d40c203b SHA256 a785cffadd414300a1f520ec9e445328b8dda4efddffdca314dc01fab7e8d08b DIST gdm-2.20.9-gentoo-files-r1.tar.bz2 3494 RMD160 9d8f9954bd0d8b657a2faf2516b4548b9f1556d3 SHA1 28ceedb42440fdb50dffa7e69b18f213b00e3935 SHA256 666c0bf1ba28ccc257bf1235b5286e1eb9e15230c0036413ab428e09c54238f9 -EBUILD gdm-9999.ebuild 6422 RMD160 0cb0bac658cd78f990873df2677e651412c2d048 SHA1 494021815f462b26c7b7276105805dc91e750329 SHA256 9f617edb048407c2b03a3005865726247d4148863095c6589f0b85345862edc1 +EBUILD gdm-9999.ebuild 6324 RMD160 dbb32c79248b8fda0e7eec72e6fdca7a27ec3887 SHA1 d65565c74540bf3350bff876419ef2af58464126 SHA256 d87e0b9df711e274453ab1d2f37e7342906996e36e84affe14ad86cc5d90064f diff --git a/gnome-base/gdm/files/gdm-2.32.0-custom-session.patch b/gnome-base/gdm/files/gdm-2.32.0-custom-session.patch deleted file mode 100644 index c48cb074..00000000 --- a/gnome-base/gdm/files/gdm-2.32.0-custom-session.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 2dc0d268c7cc5d6133a9594adcd67dc543288b8f Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Tue, 2 Nov 2010 23:19:07 +0100 -Subject: [PATCH 4/6] make custom session work - -Gentoo bug: #216984 - -fix custom sessions not doing sourcing in the proper order. ---- - data/Xsession.in | 18 +++++++++--------- - 1 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/data/Xsession.in b/data/Xsession.in -index b2d98f2..0da187d 100755 ---- a/data/Xsession.in -+++ b/data/Xsession.in -@@ -153,15 +153,6 @@ if [ -n "$GDM_LANG" ]; then - export LANG - fi - --# run all system xinitrc shell scripts. --if [ -d /etc/X11/xinit/xinitrc.d ]; then -- for i in /etc/X11/xinit/xinitrc.d/* ; do -- if [ -x "$i" -a ! -d "$i" ]; then -- . "$i" -- fi -- done --fi -- - if [ "x$command" = "xcustom" ] ; then - if [ -x "$HOME/.xsession" ]; then - command="$HOME/.xsession" -@@ -189,6 +180,15 @@ if [ "x$command" = "xdefault" ] ; then - fi - fi - -+# run all system xinitrc shell scripts. -+if [ -d /etc/X11/xinit/xinitrc.d ]; then -+ for i in /etc/X11/xinit/xinitrc.d/* ; do -+ if [ -x "$i" ]; then -+ . "$i" -+ fi -+ done -+fi -+ - # add ssh-agent if found - sshagent="`gdmwhich ssh-agent`" - if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then --- -1.7.3.1 - diff --git a/gnome-base/gdm/gdm-9999.ebuild b/gnome-base/gdm/gdm-9999.ebuild index 3bcbcb54..ba1137a7 100644 --- a/gnome-base/gdm/gdm-9999.ebuild +++ b/gnome-base/gdm/gdm-9999.ebuild @@ -120,9 +120,6 @@ src_prepare() { # GDM grabs VT2 instead of VT7, bug 261339, bug 284053, bug 288852 epatch "${FILESDIR}/${PN}-2.32.0-fix-vt-problems.patch" - # make custom session work, bug #216984 - epatch "${FILESDIR}/${PN}-2.32.0-custom-session.patch" - # ssh-agent handling must be done at xinitrc.d, bug #220603 epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch" |