From 9d776d4e9fab4ef982721b80c697fc9015c4fe77 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Tue, 29 Mar 2011 10:41:40 +0000 Subject: Backport x11-libs/libnotify >= 0.7 patch to current stable. (Portage version: 2.2.0_alpha29/cvs/Linux x86_64) --- net-news/liferea/ChangeLog | 6 +++- .../files/liferea-1.6.5-libnotify-0.7.patch | 41 ++++++++++++++++++++++ net-news/liferea/liferea-1.6.5.ebuild | 28 +++++++-------- 3 files changed, 60 insertions(+), 15 deletions(-) create mode 100644 net-news/liferea/files/liferea-1.6.5-libnotify-0.7.patch (limited to 'net-news') diff --git a/net-news/liferea/ChangeLog b/net-news/liferea/ChangeLog index bf20f48ada86..593a6e4ee6a3 100644 --- a/net-news/liferea/ChangeLog +++ b/net-news/liferea/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-news/liferea # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.205 2011/03/21 22:19:52 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.206 2011/03/29 10:41:40 ssuominen Exp $ + + 29 Mar 2011; Samuli Suominen liferea-1.6.5.ebuild, + +files/liferea-1.6.5-libnotify-0.7.patch: + Backport x11-libs/libnotify >= 0.7 patch to current stable. 21 Mar 2011; Nirbheek Chauhan liferea-1.6.5.ebuild, liferea-1.7.4.ebuild: diff --git a/net-news/liferea/files/liferea-1.6.5-libnotify-0.7.patch b/net-news/liferea/files/liferea-1.6.5-libnotify-0.7.patch new file mode 100644 index 000000000000..ba9c0c10a3d0 --- /dev/null +++ b/net-news/liferea/files/liferea-1.6.5-libnotify-0.7.patch @@ -0,0 +1,41 @@ +--- src/notification/libnotify.c ++++ src/notification/libnotify.c +@@ -28,6 +28,10 @@ + + #include + ++#ifndef NOTIFY_CHECK_VERSION ++#define NOTIFY_CHECK_VERSION(x,y,z) 0 ++#endif ++ + #include "common.h" + #include "conf.h" + #include "debug.h" +@@ -150,7 +154,12 @@ + // notify_notification_update ( n, node_get_title(node_p), labelText_now_p, NULL); + // notify_notification_clear_actions(n); + +- n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL, NULL); ++ n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ ); ++#else ++ , NULL); ++#endif + + notify_notification_set_icon_from_pixbuf (n,node_get_icon(node_p)); + +@@ -244,7 +253,12 @@ + + labelSummary_p = g_strdup_printf (ngettext ("%s has %d new / updated headline\n", "%s has %d new / updated headlines\n", item_count), + node_get_title (node), item_count); +- n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL, NULL); ++ n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ ); ++#else ++ , NULL); ++#endif + g_free(labelSummary_p); + + notify_notification_set_icon_from_pixbuf (n, node_get_icon (node)); diff --git a/net-news/liferea/liferea-1.6.5.ebuild b/net-news/liferea/liferea-1.6.5.ebuild index 164b14ffa686..344d31da572c 100644 --- a/net-news/liferea/liferea-1.6.5.ebuild +++ b/net-news/liferea/liferea-1.6.5.ebuild @@ -1,17 +1,17 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.6.5.ebuild,v 1.7 2011/03/21 22:19:53 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.6.5.ebuild,v 1.8 2011/03/29 10:41:40 ssuominen Exp $ -EAPI="2" -GCONF_DEBUG="no" +EAPI=2 +GCONF_DEBUG=no +inherit autotools eutils gnome2 -inherit gnome2 autotools - -MY_P="${P/_/-}" +MY_P=${P/_/-} DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo/etc feeds" HOMEPAGE="http://liferea.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" + LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc ppc64 x86" @@ -27,16 +27,14 @@ RDEPEND=">=x11-libs/gtk+-2.16.0:2 >=gnome-base/libglade-2:2.0 >=net-libs/libsoup-2.26.1:2.4 >=net-libs/webkit-gtk-1.1.15:2 - libnotify? ( =x11-libs/libnotify-0.4.5 ) lua? ( >=dev-lang/lua-5.1 ) dbus? ( >=dev-libs/dbus-glib-0.71 ) networkmanager? ( net-misc/networkmanager dev-libs/dbus-glib )" DEPEND="${RDEPEND} dev-util/pkgconfig" -DOCS="AUTHORS ChangeLog NEWS README" - -S="${WORKDIR}/${MY_P}" +S=${WORKDIR}/${MY_P} pkg_setup() { G2CONF="${G2CONF} @@ -46,10 +44,12 @@ pkg_setup() { $(use_enable networkmanager nm) $(use_enable libnotify) $(use_enable lua)" -} -src_unpack() { - gnome2_src_unpack + DOCS="AUTHORS ChangeLog NEWS README" +} - eautoreconf || die "Autoreconf failed" +src_prepare() { + epatch "${FILESDIR}"/${P}-libnotify-0.7.patch + eautoreconf + gnome2_src_prepare } -- cgit v1.2.3-65-gdbad