Fix underlinking of libdict as reported by Jeremy Olexa.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

4 files changed, 43 insertions, 12 deletions

diff --git a/xfce-extra/xfce4-dict/ChangeLog b/xfce-extra/xfce4-dict/ChangeLog
index 3c440e76db47..42a1e53ded94 100644
--- a/xfce-extra/xfce4-dict/ChangeLog
+++ b/xfce-extra/xfce4-dict/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-extra/xfce4-dict
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-dict/ChangeLog,v 1.49 2010/04/14 17:44:42 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-dict/ChangeLog,v 1.50 2011/12/07 15:28:28 ssuominen Exp $
+
+  07 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> xfce4-dict-0.6.0.ebuild,
+  +files/xfce4-dict-0.6.0-underlinking.patch:
+  Fix underlinking of libdict as reported by Jeremy Olexa.
 
   14 Apr 2010; Jeroen Roovers <jer@gentoo.org> xfce4-dict-0.6.0.ebuild:
   Stable for HPPA (bug #305657).
diff --git a/xfce-extra/xfce4-dict/Manifest b/xfce-extra/xfce4-dict/Manifest
index fd5d90491640..62061bf216f2 100644
--- a/xfce-extra/xfce4-dict/Manifest
+++ b/xfce-extra/xfce4-dict/Manifest
@@ -1,14 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX xfce4-dict-0.6.0-underlinking.patch 702 RMD160 4283b472bccda87b11c210dc4e95c7df2d6c5e31 SHA1 983e0dd3cd2e140b5998c6b9b89b6ff9010a9a5c SHA256 b3705741591209ca815387644f7d040539c45f146d8707812f5092e89bc2f9c3
 DIST xfce4-dict-0.6.0.tar.bz2 373420 RMD160 050def7ce94982683c14afb2611d1d415268f743 SHA1 af004096d6bd935d69b7ef3a989470e89c7be99b SHA256 a8188ca4c980ca2003be6bf2391589f5122830680c41d51105b10813850da0d3
-EBUILD xfce4-dict-0.6.0.ebuild 893 RMD160 77f51e27261665e3c2d4524d0bebab92cadd74b0 SHA1 d780fcea36559026e56ab67ac8a92f47e29c0f6e SHA256 9f36cb9fd74694b9cf08eaa25901d165600bfd4561da3f62a7adccbda364dac1
-MISC ChangeLog 5995 RMD160 af063bf2f7da36984d60405030d8c94da85a54bd SHA1 86026af8013649063e703a422ae564fb78d36cfd SHA256 22a056e5c070b31fc6b8d3c5b90a1246b859e4d64c062032fc0418df2e50d5cf
+EBUILD xfce4-dict-0.6.0.ebuild 924 RMD160 c5e49fc26cdb741ba60edbf8a8d2a6e702d8ae4d SHA1 07f2266db0757b0b1669be9c827c40a9a8fd00eb SHA256 9657338071cd76f8f95839e1b9ce6ff0bda8739c7733dcb7b8f8747703cb6efe
+MISC ChangeLog 6186 RMD160 d4078b00ba77a9191788201d93dbbb11afa153bf SHA1 d6afddcd4bca92f6bb6a4c6d24538d985a43bb2a SHA256 6bce50aec176ce14dc8723d183437314409ad254f33c60987bc5a0fefc615f1d
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk3VgVoACgkQXkR9YqOcLPG9/QEAmr3kOTRKc4xpXop4m44p3nNx
-zvnm3P/FSZ0q+5gTGTwA/jzRWrSh6idd993tFKAE5tq7QMdKGFOOYLpq/MAVkxlZ
-=eGMD
+iQEcBAEBAgAGBQJO34YIAAoJEEdUh39IaPFNsesH/jVq+KwKq4N8M5jqAIGrbusl
+BXbyd6ErW+3xNOe9/OxnnMAnLL8zVMgyK4SFEGg+KDnIZ8N9/vT50FtuF2OcLiZZ
+rR2LDpg6g7g3UfLhoJ/B5v5Ztu36R1jJKj7Z4hn3gw/ourwnOhw+7QINVKzn7Vrg
+kDwrXf7L8X3F4zwfJMeWkQHtQSrjCRqK2AkSg+4IXmSyZYgQYbDJhVsbVhk/XQSg
+WvatEvVeYEh283l0k4tc+gahPw176VPE7OZNtSHs14eNCUjGWO5QlxP391dd62ut
+7/eD3z3INmwt2SDAMLufCPeF5f4hQB5lL6Yx6jzogr4k48i4iB53Zh8oOwhVqas=
+=adi1
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-dict/files/xfce4-dict-0.6.0-underlinking.patch b/xfce-extra/xfce4-dict/files/xfce4-dict-0.6.0-underlinking.patch
new file mode 100644
index 000000000000..9366f0b059b7
--- /dev/null
+++ b/xfce-extra/xfce4-dict/files/xfce4-dict-0.6.0-underlinking.patch
@@ -0,0 +1,21 @@
+http://bugzilla.xfce.org/show_bug.cgi?id=8229
+
+Fix underlinking. See below. Function "floor" and math.h is used in common.c which is part of libdict.
+
+/path/to/ld: ../lib/.libs/libdict.a(libdict_la-common.o): undefined reference to symbol 'floor@@GLIBC_2.2.5'
+/path/to/ld: note: 'floor@@GLIBC_2.2.5' is defined in DSO /lib64/libm.so.6 so try adding it to the linker command line
+/lib/libm.so.6: could not read symbols: Invalid operation
+collect2: ld returned 1 exit status
+
+--- lib/Makefile.am
++++ lib/Makefile.am
+@@ -34,7 +34,8 @@
+ libdict_la_LIBADD =								\
+ 	$(LIBXFCE4PANEL_LIBS)						\
+ 	$(LIBXFCEGUI4_LIBS)							\
+-	@GTHREAD_LIBS@
++	@GTHREAD_LIBS@								\
++	-lm
+ 
+ 
+ noinst_DATA = 									\
diff --git a/xfce-extra/xfce4-dict/xfce4-dict-0.6.0.ebuild b/xfce-extra/xfce4-dict/xfce4-dict-0.6.0.ebuild
index e617e7b3bda9..5874d1c5dc0b 100644
--- a/xfce-extra/xfce4-dict/xfce4-dict-0.6.0.ebuild
+++ b/xfce-extra/xfce4-dict/xfce4-dict-0.6.0.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-dict/xfce4-dict-0.6.0.ebuild,v 1.9 2011/05/19 20:46:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-dict/xfce4-dict-0.6.0.ebuild,v 1.10 2011/12/07 15:28:28 ssuominen Exp $
 
 EAPI=4
+EAUTORECONF=yes
 inherit xfconf
 
 DESCRIPTION="A dict.org querying application and panel plug-in for the Xfce desktop"
@@ -12,7 +13,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/0.6/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="debug"
+IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.6:2
 	>=x11-libs/gtk+-2.6:2
@@ -24,6 +25,6 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 pkg_setup() {
-	XFCONF=( $(xfconf_use_debug) )
+	PATCHES=( "${FILESDIR}"/${P}-underlinking.patch )
 	DOCS=( AUTHORS ChangeLog README )
 }