diff options
| author |   Hans de Graaff <graaff@gentoo.org> | 2010-05-01 08:27:51 +0000 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2010-05-01 08:27:51 +0000 |
| commit | 36817bd935ce2a9ceb5f3440188ef78674f1aebb (patch) | |
| tree | a40dc4d41854b14762d4f8713b2572285babf07b /mail-client/mail-notification | |
| parent | Add ~ppc64 keyword also to latest versions because it seems that this was the... (diff) | |
| download | gentoo-2-36817bd935ce2a9ceb5f3440188ef78674f1aebb.tar.gz gentoo-2-36817bd935ce2a9ceb5f3440188ef78674f1aebb.tar.bz2 gentoo-2-36817bd935ce2a9ceb5f3440188ef78674f1aebb.zip | |
Fix compilation with forced --as-needed, fixes bug 317905. Thanks to Kacper Kowalik for the patch.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'mail-client/mail-notification')
3 files changed, 50 insertions, 2 deletions
diff --git a/mail-client/mail-notification/ChangeLog b/mail-client/mail-notification/ChangeLog index 788359efd1e2..9d5c8eb8319e 100644 --- a/mail-client/mail-notification/ChangeLog +++ b/mail-client/mail-notification/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for mail-client/mail-notification # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.92 2010/04/29 20:57:25 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.93 2010/05/01 08:27:51 graaff Exp $ + + 01 May 2010; Hans de Graaff <graaff@gentoo.org> + mail-notification-5.4-r3.ebuild, + +files/mail-notification-5.4-asneeded.patch: + Fix compilation with forced --as-needed, fixes bug 317905. Thanks to + Kacper Kowalik for the patch. 29 Apr 2010; Pacho Ramos <pacho@gentoo.org> mail-notification-5.4-r3.ebuild, +files/mail-notification-5.4-e-d-s.patch: diff --git a/mail-client/mail-notification/files/mail-notification-5.4-asneeded.patch b/mail-client/mail-notification/files/mail-notification-5.4-asneeded.patch new file mode 100644 index 000000000000..30d53002b08a --- /dev/null +++ b/mail-client/mail-notification/files/mail-notification-5.4-asneeded.patch @@ -0,0 +1,39 @@ +Fixing as-needed issues + +http://bugs.gentoo.org/show_bug.cgi?id=317905 + +Patch written by Kacper Kowalik <xarthisius.kk@gmail.com> + +--- jb ++++ jb +@@ -89,10 +89,11 @@ + + mkdir -p build/jbsrc || exit 1 + +- if ! gobject_cflags_libs=`pkg-config --cflags --libs 'gobject-2.0 >= 2.8.0' 2>/dev/null`; then ++ if ! gobject_cflags=`pkg-config --cflags 'gobject-2.0 >= 2.8.0' 2>/dev/null`; then + echo "ERROR: the GLib library was not found" >&2 + exit 1 + fi ++ gobject_libs=`pkg-config --libs 'gobject-2.0 >= 2.8.0' 2>/dev/null` + + sed -e 's|^#jb_include ["<]\(.*\)[">]|#include "\1.h"|' \ + jbsrc/jb.c > build/jbsrc/jb.c || exit 1 +@@ -103,14 +104,15 @@ + -DG_LOG_DOMAIN="\"jb\"" \ + -DJB_SOURCES="\"$jb_c_sources $jb_h_sources\"" \ + -DJB_PACKAGE_SOURCES="\"$jb_c_package_sources $jb_h_package_sources\"" \ +- $gobject_cflags_libs \ ++ $gobject_cflags \ + $jb_cflags \ + $jb_cppflags \ + $jb_ldflags \ + build/jbsrc/jb.c \ + $jb_c_sources \ + $jb_c_package_sources \ +- $jb_libs; then ++ $jb_libs \ ++ $gobject_libs; then + echo "ERROR: cannot build jb" >&2 + exit 1 + fi diff --git a/mail-client/mail-notification/mail-notification-5.4-r3.ebuild b/mail-client/mail-notification/mail-notification-5.4-r3.ebuild index 4c560d7f074b..699b47ce5029 100644 --- a/mail-client/mail-notification/mail-notification-5.4-r3.ebuild +++ b/mail-client/mail-notification/mail-notification-5.4-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-5.4-r3.ebuild,v 1.2 2010/04/29 20:57:25 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-5.4-r3.ebuild,v 1.3 2010/05/01 08:27:51 graaff Exp $ EAPI=1 @@ -72,6 +72,9 @@ src_unpack() { # Fedora patch to build against dev-libs/gmime:2.4 epatch "${FILESDIR}/${P}-gmime.patch" + + # Fix forced --as-needed, bug 317905 + epatch "${FILESDIR}/${P}-asneeded.patch" } src_compile() { |