diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-02-08 18:52:21 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-02-08 18:52:21 +0000 |
| commit | c2efeba2086d88465b75bab6cc64306417a5b5e1 (patch) | |
| tree | af77ddceaa628ac071debaad0f3d2898755c804d /net-wireless | |
| parent | x86 stable per bug 353411 (diff) | |
| download | gentoo-2-c2efeba2086d88465b75bab6cc64306417a5b5e1.tar.gz gentoo-2-c2efeba2086d88465b75bab6cc64306417a5b5e1.tar.bz2 gentoo-2-c2efeba2086d88465b75bab6cc64306417a5b5e1.zip | |
Fix building with x11-libs/libnotify >= 0.7 wrt #354119 by Diego Elio Pettenò.
(Portage version: 2.2.0_alpha20/cvs/Linux x86_64)
Diffstat (limited to 'net-wireless')
3 files changed, 40 insertions, 5 deletions
diff --git a/net-wireless/gnome-bluetooth/ChangeLog b/net-wireless/gnome-bluetooth/ChangeLog index 26e7efe43fd6..6065f00f80fc 100644 --- a/net-wireless/gnome-bluetooth/ChangeLog +++ b/net-wireless/gnome-bluetooth/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-wireless/gnome-bluetooth # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.88 2011/01/17 18:02:37 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.89 2011/02/08 18:52:21 ssuominen Exp $ + + 08 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> + gnome-bluetooth-2.32.0.ebuild, + +files/gnome-bluetooth-2.32.0-libnotify-0.7.patch: + Fix building with x11-libs/libnotify >= 0.7 wrt #354119 by Diego Elio + Pettenò. 17 Jan 2011; Pacho Ramos <pacho@gentoo.org> +files/gnome-bluetooth-2.32.0-nsd-automagic.patch: diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-libnotify-0.7.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-libnotify-0.7.patch new file mode 100644 index 000000000000..72a72652186e --- /dev/null +++ b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-libnotify-0.7.patch @@ -0,0 +1,27 @@ +--- applet/notify.c ++++ applet/notify.c +@@ -31,6 +31,10 @@ + #include <libnotify/notify.h> + #include "notify.h" + ++#ifndef NOTIFY_CHECK_VERSION ++#define NOTIFY_CHECK_VERSION(x,y,z) 0 ++#endif ++ + static GtkStatusIcon *statusicon = NULL; + static char *icon_name = NULL; + static char *tooltip = NULL; +@@ -71,7 +75,12 @@ + notify_notification_close(notify, NULL); + } + +- notify = notify_notification_new(summary, message, icon_name, NULL); ++ notify = notify_notification_new(summary, message, icon_name ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ ); ++#else ++ , NULL); ++#endif + + notify_notification_set_timeout(notify, timeout); + diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0.ebuild index a64c8c311e94..02552b513f1f 100644 --- a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0.ebuild +++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0.ebuild,v 1.7 2011/01/17 18:01:20 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0.ebuild,v 1.8 2011/02/08 18:52:21 ssuominen Exp $ EAPI="3" GCONF_DEBUG="yes" @@ -59,17 +59,19 @@ pkg_setup() { } src_prepare() { - gnome2_src_prepare + epatch "${FILESDIR}"/${P}-libnotify-0.7.patch # Fix build with gobject-introspection 0.9, bug #344227 - epatch "${FILESDIR}/${P}-introspection-build.patch" + epatch "${FILESDIR}"/${P}-introspection-build.patch # Fix nautilus-sendto automagic support, upstream bug #639130 - epatch "${FILESDIR}/${P}-nsd-automagic.patch" + epatch "${FILESDIR}"/${P}-nsd-automagic.patch cp "${WORKDIR}"/introspection.m4 . || die intltoolize --force --copy --automake || die "intltoolize failed" AT_M4DIR="." eautoreconf + + gnome2_src_prepare } src_install() { |