Explicitely link against -lm (as reported by Jeremy Olexa). Remove USE="debug" becaus...

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

diff --git a/xfce-extra/xfce4-diskperf-plugin/ChangeLog b/xfce-extra/xfce4-diskperf-plugin/ChangeLog
index 32d72adbf976f86e3c77f96b26066731f472bf27..3a07e1f8a4cb4a5ee5ad00a8c31512bd95ba2873 100644 (file)
--- a/xfce-extra/xfce4-diskperf-plugin/ChangeLog
+++ b/xfce-extra/xfce4-diskperf-plugin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-extra/xfce4-diskperf-plugin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-diskperf-plugin/ChangeLog,v 1.10 2011/04/23 17:35:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-diskperf-plugin/ChangeLog,v 1.11 2011/12/07 15:43:53 ssuominen Exp $
+
+  07 Dec 2011; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-diskperf-plugin-2.3.0.ebuild,
+  +files/xfce4-diskperf-plugin-2.3.0-underlinking.patch:
+  Explicitely link against -lm (as reported by Jeremy Olexa). Remove
+  USE="debug" because the package is still using libxfcegui4 and doesn't pass
+  with -DXFCE_DISABLE_DEPRECATED flag.
 
   23 Apr 2011; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-diskperf-plugin-2.3.0.ebuild:

diff --git a/xfce-extra/xfce4-diskperf-plugin/Manifest b/xfce-extra/xfce4-diskperf-plugin/Manifest
index b24f6eed17fd9163c37662eee28eb146b70ad5a6..56bab813155f4b8a7b32686c200a13042d70e9b0 100644 (file)
--- a/xfce-extra/xfce4-diskperf-plugin/Manifest
+++ b/xfce-extra/xfce4-diskperf-plugin/Manifest
@@ -1,14 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX xfce4-diskperf-plugin-2.3.0-underlinking.patch 669 RMD160 308a852a23c1d8dce8d9697f43db9b5afb6b4d8c SHA1 66aff3259d438f3cf317dd716cbf27a82d336ad1 SHA256 90784ca0f6737739dd7783d1c47e5332f881ceb5b4ccef66ba8366d599101db9
 DIST xfce4-diskperf-plugin-2.3.0.tar.bz2 316597 RMD160 df835cc792ba93bbb0dab294f19ef6fd95ca95e1 SHA1 f771250a21b3e030622fe3717f70fe1367c69901 SHA256 d75e2cd846c784cba804c5cc7796964b3965c764003ca4c1751c68ff83e85793
-EBUILD xfce4-diskperf-plugin-2.3.0.ebuild 828 RMD160 90b5fa096f772d954aa59501f45b1404b08ce56a SHA1 ddca8e9accbd7efb20c6cd925d7bc7e518526592 SHA256 7032da11e2541c367fd3c2d5ae2a5f4b5be51fea9820c0f613b4975bc130bbdc
-MISC ChangeLog 1731 RMD160 ce713f5376ab0b430cf0f6a4be2eb2449c00b0e2 SHA1 189fb5df6e5d226161acff3b24adf32944f1da7c SHA256 aae3a6cc7418b5e0e606bca17bcc1bad9dfd7efd849130aab80f1baa6d6b6281
+EBUILD xfce4-diskperf-plugin-2.3.0.ebuild 858 RMD160 effa28d4888bdf39789bd578fa8d331e3eb324d8 SHA1 8a05bc2b6dd4882748e0695eec15fc4dcc24cba6 SHA256 dbd2bcc937dad6cf7e8fc1ef99b196aa8011c7240870464850b3ee22f41e33d4
+MISC ChangeLog 2067 RMD160 d825a4da54c35075fc14c13cc052f9780eb05a0b SHA1 362ba20a26a5fa9ab85324fd6744b3e5bc4abad3 SHA256 e8d33a3eb8fbbcbe36a088d156a6909ba4700f098c169a4bbabf2ccc0d19d279
 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)
 
-iF4EAREIAAYFAk3Vi7wACgkQXkR9YqOcLPGTnQD/UCIM6NWvI/n3EEr/kuvweabm
-STh8LzBuObzBieHU23EA/06aNRrRa4Yma3FJ/MzrfTaNZktRMU2Tim9ko3LUYtjo
-=8VNu
+iQEcBAEBAgAGBQJO34mlAAoJEEdUh39IaPFN4MQH/38KDvZJ+h9C8peiyUP9znOB
+CEnQe3Laaqd7DdcmPcVSee/4xpKwefvxrlKKd/WcB79cxOkN54xZMZKPd+0RCrwT
+iCC8v2b47yOCRlcHr2uu+L0AoQO1pscP9kkK26QoTnkpD4toUIGDEdyyciyYrEJ5
+e8EnXqKZSlB2J6jlvNafIxXydTd8YocEmPuN9HbAECUT2l0pMKxwy668Tng8TwOo
+bEeSvYiYzQ0AU6xa5j0v0lYk8rrT+fKdt1QB+TZX9HaRlI38SISkx6riztB8AXbT
+T6uc2vsYvADm7DiMsXtRBEq74XyX1TeHPIVZ9aB+mholxVpqJcEy3cpj7HSofW4=
+=DdxC
 -----END PGP SIGNATURE-----

diff --git a/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.3.0-underlinking.patch b/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.3.0-underlinking.patch
new file mode 100644 (file)
index 0000000..35a1209
--- /dev/null
+++ b/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.3.0-underlinking.patch
@@ -0,0 +1,21 @@
+http://bugzilla.xfce.org/show_bug.cgi?id=7982
+
+panel-plugin/main.c is using function round, so explicitely link against -lm.  see below.
+
+/path/to/ld: xfce4_diskperf_plugin-main.o: undefined reference to symbol 'round@@GLIBC_2.2.5'
+/path/to/ld: note: 'round@@GLIBC_2.2.5' is defined in DSO /lib64/libm.so.6 so try adding it to the linker command line
+/lib64/libm.so.6: could not read symbols: Invalid operation
+collect2: ld returned 1 exit status
+
+--- panel-plugin/Makefile.am
++++ panel-plugin/Makefile.am
+@@ -25,7 +25,8 @@
+ 
+ xfce4_diskperf_plugin_LDADD=                                  \
+       $(LIBXFCE4PANEL_LIBS)                                   \
+-      $(LIBXFCEGUI4_LIBS)
++      $(LIBXFCEGUI4_LIBS)                                     \
++      -lm
+ 
+ #
+ # Desktop file

diff --git a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.3.0.ebuild b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.3.0.ebuild
index 4bcc5e7d2d0d171d7e6dee6dd98732b8895d888d..5236e08bc79332ea5bc955a459195e87d66f4d08 100644 (file)
--- a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.3.0.ebuild
+++ b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.3.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-diskperf-plugin/xfce4-diskperf-plugin-2.3.0.ebuild,v 1.8 2011/05/19 21:30:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.3.0.ebuild,v 1.9 2011/12/07 15:43:53 ssuominen Exp $
 
 EAPI=4
+EAUTORECONF=yes
 inherit xfconf
 
 DESCRIPTION="Xfce's disk usage and performance panel plugin"
@@ -12,7 +13,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/2.3/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="debug"
+IUSE=""
 
 RDEPEND=">=xfce-base/libxfcegui4-4.8
        >=xfce-base/xfce4-panel-4.8"
@@ -21,6 +22,6 @@ DEPEND="${RDEPEND}
        dev-util/intltool"
 
 pkg_setup() {
-       XFCONF=( $(xfconf_use_debug) )
+       PATCHES=( "${FILESDIR}"/${P}-underlinking.patch )
        DOCS=( AUTHORS ChangeLog NEWS README )
 }