Gentoo Archives: gentoo-commits

From: "Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in gnome-base/gdm: ChangeLog gdm-2.20.11-r1.ebuild
Date: Fri, 03 Jan 2014 20:13:23
Message-Id: 20140103201317.3D06D2004E@flycatcher.gentoo.org
1 tetromino 14/01/03 20:13:17
2
3 Modified: ChangeLog gdm-2.20.11-r1.ebuild
4 Log:
5 Fix underlinking failure (bug #496914, thanks to d_dart).
6
7 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
8
9 Revision Changes Path
10 1.390 gnome-base/gdm/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/ChangeLog?rev=1.390&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/ChangeLog?rev=1.390&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/ChangeLog?r1=1.389&r2=1.390
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v
19 retrieving revision 1.389
20 retrieving revision 1.390
21 diff -u -r1.389 -r1.390
22 --- ChangeLog 24 Dec 2013 16:21:56 -0000 1.389
23 +++ ChangeLog 3 Jan 2014 20:13:17 -0000 1.390
24 @@ -1,6 +1,10 @@
25 # ChangeLog for gnome-base/gdm
26 -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.389 2013/12/24 16:21:56 pacho Exp $
28 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
29 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.390 2014/01/03 20:13:17 tetromino Exp $
30 +
31 + 03 Jan 2014; Alexandre Rostovtsev <tetromino@g.o>
32 + gdm-2.20.11-r1.ebuild, +files/gdm-2.20.11-underlinking.patch:
33 + Fix underlinking failure (bug #496914, thanks to d_dart).
34
35 *gdm-3.10.0.1 (24 Dec 2013)
36
37
38
39
40 1.12 gnome-base/gdm/gdm-2.20.11-r1.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/gdm-2.20.11-r1.ebuild?rev=1.12&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/gdm-2.20.11-r1.ebuild?rev=1.12&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/gdm-2.20.11-r1.ebuild?r1=1.11&r2=1.12
45
46 Index: gdm-2.20.11-r1.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.11-r1.ebuild,v
49 retrieving revision 1.11
50 retrieving revision 1.12
51 diff -u -r1.11 -r1.12
52 --- gdm-2.20.11-r1.ebuild 27 Sep 2012 08:54:42 -0000 1.11
53 +++ gdm-2.20.11-r1.ebuild 3 Jan 2014 20:13:17 -0000 1.12
54 @@ -1,13 +1,13 @@
55 -# Copyright 1999-2012 Gentoo Foundation
56 +# Copyright 1999-2014 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.11-r1.ebuild,v 1.11 2012/09/27 08:54:42 tetromino Exp $
59 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.11-r1.ebuild,v 1.12 2014/01/03 20:13:17 tetromino Exp $
60
61 EAPI="4"
62 GCONF_DEBUG="no"
63 GNOME2_LA_PUNT="yes"
64 GNOME_TARBALL_SUFFIX="bz2"
65
66 -inherit eutils pam gnome2 user
67 +inherit autotools eutils pam gnome2 user
68
69 DESCRIPTION="GNOME Display Manager"
70 HOMEPAGE="https://live.gnome.org/GDM"
71 @@ -101,8 +101,6 @@
72 }
73
74 src_prepare() {
75 - gnome2_src_prepare
76 -
77 # remove unneeded linker directive for selinux (#41022)
78 epatch "${FILESDIR}/${PN}-2.13.0.1-selinux-remove-attr.patch"
79
80 @@ -129,6 +127,13 @@
81 # Fix intltoolize broken file, see upstream #577133
82 sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
83 || die "sed failed"
84 +
85 + # Underlinking for libXau, libm; bug #496914
86 + epatch "${FILESDIR}/${P}-underlinking.patch"
87 + rm missing || die # old version in tarball
88 + eautoreconf
89 +
90 + gnome2_src_prepare
91 }
92
93 src_install() {