Fix underlinking failure (bug #496914, thanks to d_dart).

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

3 files changed, 75 insertions, 7 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index bb4cce6276d5..619c6eda1c50 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gdm
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.389 2013/12/24 16:21:56 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.390 2014/01/03 20:13:17 tetromino Exp $
+
+  03 Jan 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gdm-2.20.11-r1.ebuild, +files/gdm-2.20.11-underlinking.patch:
+  Fix underlinking failure (bug #496914, thanks to d_dart).
 
 *gdm-3.10.0.1 (24 Dec 2013)
 
diff --git a/gnome-base/gdm/files/gdm-2.20.11-underlinking.patch b/gnome-base/gdm/files/gdm-2.20.11-underlinking.patch
new file mode 100644
index 000000000000..f7accccf3a46
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-2.20.11-underlinking.patch
@@ -0,0 +1,59 @@
+See https://bugs.gentoo.org/show_bug.cgi?id=496914
+
+diff --git a/configure.ac b/configure.ac
+index 3da7f33..8a0eedf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -160,6 +160,9 @@ AC_CHECK_TYPE(socklen_t,,
+ 
+ AC_CHECK_FUNCS([setresuid setenv unsetenv clearenv getutxent updwtmpx logwtmp login logout])
+ 
++AC_CHECK_LIBM
++AC_SUBST(LIBM)
++
+ dnl checks needed for Darwin compatibility to linux **environ.
+ AC_CHECK_HEADERS(crt_externs.h)
+ AC_CHECK_FUNCS(_NSGetEnviron)
+diff --git a/gui/Makefile.am b/gui/Makefile.am
+index 577dc9f..3334381 100644
+--- a/gui/Makefile.am
++++ b/gui/Makefile.am
+@@ -123,6 +123,7 @@ gdmchooser_LDADD = \
+ 	$(XINERAMA_LIBS)	\
+ 	$(X_LIBS)		\
+ 	$(XDMCP_LIBS)		\
++	-lXau			\
+ 	-lX11			\
+ 	-lfontconfig		\
+ 	$(NULL)
+@@ -143,8 +144,10 @@ gdmlogin_LDADD = \
+ 	$(X_EXTRA_LIBS)		\
+ 	$(XINERAMA_LIBS)	\
+ 	$(X_LIBS)		\
++	-lXau			\
+ 	-lX11			\
+ 	-lfontconfig		\
++	$(LIBM)			\
+ 	$(NULL)
+ 
+ # LIBGNOMEUI should be removed from gdmsetup at some point.
+@@ -183,6 +186,7 @@ gdmphotosetup_LDADD = \
+ 	$(INTLLIBS)		\
+ 	$(EXTRA_SOCKET_LIB)	\
+ 	$(EXTRA_NSL_LIB)	\
++	-lXau			\
+ 	-lX11			\
+ 	-lfontconfig		\
+ 	$(top_builddir)/common/libgdmcommon.a \
+diff --git a/gui/greeter/Makefile.am b/gui/greeter/Makefile.am
+index fd0f500..7b9840d 100644
+--- a/gui/greeter/Makefile.am
++++ b/gui/greeter/Makefile.am
+@@ -91,6 +91,7 @@ gdmgreeter_LDADD = \
+ 	$(X_EXTRA_LIBS)		\
+ 	$(XINERAMA_LIBS)	\
+ 	$(X_LIBS)		\
++	-lXau			\
+ 	-lX11			\
+ 	-lfontconfig
+ 
diff --git a/gnome-base/gdm/gdm-2.20.11-r1.ebuild b/gnome-base/gdm/gdm-2.20.11-r1.ebuild
index bc237bde84d0..4e8bb36ef129 100644
--- a/gnome-base/gdm/gdm-2.20.11-r1.ebuild
+++ b/gnome-base/gdm/gdm-2.20.11-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 GNOME_TARBALL_SUFFIX="bz2"
 
-inherit eutils pam gnome2 user
+inherit autotools eutils pam gnome2 user
 
 DESCRIPTION="GNOME Display Manager"
 HOMEPAGE="https://live.gnome.org/GDM"
@@ -101,8 +101,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	# remove unneeded linker directive for selinux (#41022)
 	epatch "${FILESDIR}/${PN}-2.13.0.1-selinux-remove-attr.patch"
 
@@ -129,6 +127,13 @@ src_prepare() {
 	# Fix intltoolize broken file, see upstream #577133
 	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
 		|| die "sed failed"
+
+	# Underlinking for libXau, libm; bug #496914
+	epatch "${FILESDIR}/${P}-underlinking.patch"
+	rm missing || die # old version in tarball
+	eautoreconf
+
+	gnome2_src_prepare
 }
 
 src_install() {