From d18f3c187414a361fc2d0a2648059118bba67fcc Mon Sep 17 00:00:00 2001 From: Victor Ostorga Date: Mon, 8 Aug 2011 15:52:54 +0000 Subject: Version bump upstream stable liferea (Portage version: 2.1.9.42/cvs/Linux i686) --- net-news/liferea/ChangeLog | 8 ++- .../files/liferea-1.6.6b-libnotify-0.7.patch | 70 ++++++++++++++++++++++ net-news/liferea/liferea-1.6.6b.ebuild | 56 +++++++++++++++++ 3 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 net-news/liferea/files/liferea-1.6.6b-libnotify-0.7.patch create mode 100644 net-news/liferea/liferea-1.6.6b.ebuild (limited to 'net-news') diff --git a/net-news/liferea/ChangeLog b/net-news/liferea/ChangeLog index 593a6e4ee6a3..0cd60cd5bc53 100644 --- a/net-news/liferea/ChangeLog +++ b/net-news/liferea/ChangeLog @@ -1,6 +1,12 @@ # 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.206 2011/03/29 10:41:40 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.207 2011/08/08 15:52:53 vostorga Exp $ + +*liferea-1.6.6b (08 Aug 2011) + + 08 Aug 2011; Víctor Ostorga +liferea-1.6.6b.ebuild, + +files/liferea-1.6.6b-libnotify-0.7.patch: + Version bump upstream stable liferea 29 Mar 2011; Samuli Suominen liferea-1.6.5.ebuild, +files/liferea-1.6.5-libnotify-0.7.patch: diff --git a/net-news/liferea/files/liferea-1.6.6b-libnotify-0.7.patch b/net-news/liferea/files/liferea-1.6.6b-libnotify-0.7.patch new file mode 100644 index 000000000000..5d08f07f5b85 --- /dev/null +++ b/net-news/liferea/files/liferea-1.6.6b-libnotify-0.7.patch @@ -0,0 +1,70 @@ +diff -NrU5 liferea-1.6.6b.original/configure.ac liferea-1.6.6b/configure.ac +--- liferea-1.6.6b.original/configure.ac 2011-06-22 09:16:24.000000000 -0600 ++++ liferea-1.6.6b/configure.ac 2011-08-08 09:21:49.000000000 -0600 +@@ -75,11 +75,11 @@ + dnl ********* + dnl libnotify + dnl ********* + + if test "x$enable_libnotify" = "xyes"; then +- PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= 0.3.2, libnotify <= 0.5],enable_libnotify=yes,enable_libnotify=no) ++ PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= 0.3.2, libnotify <= 0.7.3],enable_libnotify=yes,enable_libnotify=no) + AC_SUBST(LIBNOTIFY_CFLAGS) + AC_SUBST(LIBNOTIFY_LIBS) + else + enable_libnotify=no + fi +diff -NrU5 liferea-1.6.6b.original/src/notification/libnotify.c liferea-1.6.6b/src/notification/libnotify.c +--- liferea-1.6.6b.original/src/notification/libnotify.c 2011-06-22 07:25:40.000000000 -0600 ++++ liferea-1.6.6b/src/notification/libnotify.c 2011-08-08 09:21:11.000000000 -0600 +@@ -26,10 +26,14 @@ + #include + #include + + #include + ++#ifndef NOTIFY_CHECK_VERSION ++#define NOTIFY_CHECK_VERSION(x,y,z) 0 ++#endif ++ + #include "common.h" + #include "conf.h" + #include "debug.h" + #include "node.h" + #include "item.h" +@@ -148,11 +152,16 @@ + + if(node_p) { + // 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)); + + notify_notification_set_category (n, "feed"); + +@@ -242,11 +251,16 @@ + if (item_count == 0) + return; + + 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)); + notify_notification_set_timeout (n, NOTIFY_EXPIRES_DEFAULT); + if (supports_actions) { diff --git a/net-news/liferea/liferea-1.6.6b.ebuild b/net-news/liferea/liferea-1.6.6b.ebuild new file mode 100644 index 000000000000..a18fe396eaac --- /dev/null +++ b/net-news/liferea/liferea-1.6.6b.ebuild @@ -0,0 +1,56 @@ +# 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.6b.ebuild,v 1.1 2011/08/08 15:52:54 vostorga Exp $ + +EAPI=2 +GCONF_DEBUG=no +inherit autotools eutils gnome2 + +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" +IUSE="dbus libnotify lua networkmanager" + +RDEPEND=">=x11-libs/gtk+-2.16.0:2 + >=dev-libs/glib-2.16.0:2 + >=x11-libs/pango-1.4.0 + gnome-base/gconf:2 + >=dev-libs/libxml2-2.6.27:2 + >=dev-libs/libxslt-1.1.19 + >=dev-db/sqlite-3.6.10:3 + >=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 + dev-util/intltool" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + G2CONF="${G2CONF} + --enable-sm + --disable-schemas-install + $(use_enable dbus) + $(use_enable networkmanager nm) + $(use_enable libnotify) + $(use_enable lua)" + + DOCS="AUTHORS ChangeLog NEWS README" +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-libnotify-0.7.patch + eautoreconf + gnome2_src_prepare +} -- cgit v1.2.3-65-gdbad