Fix underlinking problem (bug #497118, thanks to d_dart).

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

3 files changed, 39 insertions, 4 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index 14d25a77be02..80b914789984 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-applets
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.375 2013/12/25 10:04:52 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.376 2014/01/05 08:40:17 tetromino Exp $
+
+  05 Jan 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-applets-2.32.1.1-r2.ebuild,
+  +files/gnome-applets-2.32.1.1-mixer-libm.patch:
+  Fix underlinking problem (bug #497118, thanks to d_dart).
 
   25 Dec 2013; Pacho Ramos <pacho@gentoo.org> -gnome-applets-2.32.1.1-r1.ebuild,
   -gnome-applets-3.6.0-r1.ebuild:
diff --git a/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-mixer-libm.patch b/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-mixer-libm.patch
new file mode 100644
index 000000000000..813f336853b9
--- /dev/null
+++ b/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-mixer-libm.patch
@@ -0,0 +1,26 @@
+From f2a7c6548ad508c94398e10c49c962363e15d739 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Wed, 19 Sep 2012 18:27:22 -0400
+Subject: [PATCH] configure: add -lm dependency on mixer libs
+
+the mixer applet requires -lm to build.
+this commit adds that dependency.
+---
+ configure.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.in b/configure.in
+index 7c1c8fc..b318fb5 100644
+--- a/configure.in
++++ b/configure.in
+@@ -297,6 +297,7 @@ if test "x$enable_mixer" != "xno"; then
+         AC_MSG_ERROR([Mixer applet explicitly requested but a compatible gstreamer version was not found])
+     fi
+ fi
++MIXER_LIBS="$MIXER_LIBS -lm"
+ AM_CONDITIONAL(BUILD_MIXER_APPLET, test "x$enable_mixer" = "xyes")
+ AC_SUBST(MIXER_CFLAGS)
+ AC_SUBST(MIXER_LIBS)
+-- 
+1.8.5.2
+
diff --git a/gnome-base/gnome-applets/gnome-applets-2.32.1.1-r2.ebuild b/gnome-base/gnome-applets/gnome-applets-2.32.1.1-r2.ebuild
index a7c0fd54e324..df97274ea6ae 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.32.1.1-r2.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.32.1.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 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/gnome-applets/gnome-applets-2.32.1.1-r2.ebuild,v 1.8 2013/04/01 18:24:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.32.1.1-r2.ebuild,v 1.9 2014/01/05 08:40:17 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -89,6 +89,9 @@ src_prepare() {
 	# gweather: fix NetworkManager support to compile, see upstream bug 636217 and bug 358043
 	epatch "${FILESDIR}"/${P}-dbus-fix.patch
 
+	# underlinking in mixer applet, bug #497118
+	epatch "${FILESDIR}/${P}-mixer-libm.patch"
+
 	# Invest applet tests need gconf/proxy/...
 	sed 's/^TESTS.*/TESTS=/g' -i invest-applet/invest/Makefile.am \
 		invest-applet/invest/Makefile.in || die "disabling invest tests failed"
@@ -96,6 +99,7 @@ src_prepare() {
 	python_clean_py-compile_files
 	python_convert_shebangs -r 2 .
 
+	rm missing || die # old missing script causes autoreconf warnings
 	eautoreconf
 	gnome2_src_prepare
 }