diff options
| -rw-r--r-- | net-news/liferea/ChangeLog | 6 | ||||
| -rw-r--r-- | net-news/liferea/Manifest | 5 | ||||
| -rw-r--r-- | net-news/liferea/files/liferea-1.7.4-libnotify-0.7.patch | 66 | ||||
| -rw-r--r-- | net-news/liferea/liferea-1.7.4.ebuild | 18 |
4 files changed, 86 insertions, 9 deletions
diff --git a/net-news/liferea/ChangeLog b/net-news/liferea/ChangeLog index 98cc638f3c08..5fecf85bcfc4 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.200 2011/02/26 10:26:52 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.201 2011/03/09 18:11:07 ssuominen Exp $ + + 09 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> liferea-1.7.4.ebuild, + +files/liferea-1.7.4-libnotify-0.7.patch: + Fix building with x11-libs/libnotify >= 0.7 wrt #357691 by Jouni Rinne. 26 Feb 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> liferea-1.6.5.ebuild: x86 stable wrt bug #355345 diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest index 35bf49f21fcc..a3e606757171 100644 --- a/net-news/liferea/Manifest +++ b/net-news/liferea/Manifest @@ -1,3 +1,4 @@ +AUX liferea-1.7.4-libnotify-0.7.patch 2111 RMD160 ec050f5139747862e30f72992a21121e8f9a889f SHA1 0e7e8b273d45ce76e9cb891d72a59ba6daf67516 SHA256 38e0c25f33dba1a41d71fc19af29b3c7e1ca7e9b429187a4e996e5aa6e70b270 DIST liferea-1.4.28.tar.gz 1697036 RMD160 044d0f771ea06c7d35fb70afc2ebe8d64bd96ef0 SHA1 5c40c9a20eb94d5e0bc5e9b41af51389bc364daf SHA256 d39abe7d9651783f4ecd59a0f6c5e2650f32df834e0e742a6b5d003795913fd6 DIST liferea-1.6.4.tar.gz 1743075 RMD160 b35d58b595a55a860828e17a387686f5a0147e0d SHA1 0d267c340880fe8409ebaaed5fecd07b95215556 SHA256 1549b379fcb446257d7312eb4b165655fbd32ba6243bfd35055479436c502f9e DIST liferea-1.6.5.tar.gz 1784724 RMD160 77b384595a757983ab9d3f8ed91d824628991670 SHA1 f24dbd0e81c5a8309f0d19853211fc02ff818477 SHA256 3a594bd8acbdcbc236f629f2bee63ffba0ddcc38fb406f8ba89629963a877ebd @@ -5,6 +6,6 @@ DIST liferea-1.7.4.tar.gz 1682434 RMD160 69103730b26a28e350c6acc65f22561527b45ae EBUILD liferea-1.4.28-r1.ebuild 2667 RMD160 1e31907b86bc0e81705630f77793fc987cbc6425 SHA1 9cd22f55eab11afe25db450a05a3c4c2854ca234 SHA256 ebe057a295313389be07dbed79efb2dc6f22717d34e93a159e7c2cd94d5c0916 EBUILD liferea-1.6.4.ebuild 1364 RMD160 80461ff5859d972fcd878569a409c7ae248701b5 SHA1 dbd21a34e2a12ac8e8f69cc500b4d6308b3ebc1b SHA256 7dff26e6f21adfd2aff21d82703f68a1eb2ba2a1328de8fe74105a7c1350ecde EBUILD liferea-1.6.5.ebuild 1359 RMD160 099229befb8b035a17320635fc0620138a4cd9e3 SHA1 18cf0f26b2d6d47161863205fb68a35e638e4303 SHA256 199254011b6b3faa8890270afb91524934d9b6ace159f1390176c8c2f4144815 -EBUILD liferea-1.7.4.ebuild 1478 RMD160 7ac74eacb28042257cd9cc1d0608c45a62c4e1b8 SHA1 4f49d24dcefdc894b9dbcfc53a51e71636576112 SHA256 4e5e1d4153a5dd1918acb5d97bc439be6ed0fa6e7ea0df880457c75b36625aef -MISC ChangeLog 54266 RMD160 bdeee497bd83d23e8dc90f7bd3bbc70f544b8620 SHA1 1e997fd4581baf7f558fe90e795ab0edd0997c6d SHA256 6e1ea0369fab7d2036977448bca8d6fedf34fb41ac5b7114a397c06720e09888 +EBUILD liferea-1.7.4.ebuild 1565 RMD160 3e2594d4aa32271ab8735382db5cb2f0a69aa3a2 SHA1 4ff29fc41718a3200a18c245febbb1787656f3bc SHA256 f25b67a214d79ed6680ebec330651872beebc492a68dd22da710b7839bc406c1 +MISC ChangeLog 54460 RMD160 3cdda6cedf8a90a53f2e84f3136e9989368ed523 SHA1 4c199db25d6a5cbeec76242969b1e23a34f0e93e SHA256 9b2c67a59f9aa2e2bf668b518b10d6a3082ee1514ac16256e185a00e05528216 MISC metadata.xml 1272 RMD160 35afb8fe241625e789d19ee694df0e99d476e3ea SHA1 a983d292c2cf34e647b001447237224cf636740f SHA256 a932a3b88d6f8a92771ad727a632f9520c4ee529b1cf2b63e456617cce77483e diff --git a/net-news/liferea/files/liferea-1.7.4-libnotify-0.7.patch b/net-news/liferea/files/liferea-1.7.4-libnotify-0.7.patch new file mode 100644 index 000000000000..0cc11769b64b --- /dev/null +++ b/net-news/liferea/files/liferea-1.7.4-libnotify-0.7.patch @@ -0,0 +1,66 @@ +--- src/notification/libnotify.c ++++ src/notification/libnotify.c +@@ -28,6 +28,10 @@ + + #include <libnotify/notify.h> + ++#ifndef NOTIFY_CHECK_VERSION ++#define NOTIFY_CHECK_VERSION(x,y,z) 0 ++#endif ++ + #include "common.h" + #include "conf.h" + #include "debug.h" +@@ -158,7 +162,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)); + notify_notification_set_category (n, "feed"); +@@ -172,8 +181,11 @@ + (NotifyActionCallback)notif_libnotify_callback_mark_read, + node_p->id, NULL); + } +- ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ /* notify_notification_attach_to_status_icon was removed */ ++#else + notify_notification_attach_to_status_icon (n, ui_tray_get_status_icon ()); ++#endif + + if (!notify_notification_show (n, NULL)) { + g_warning ("libnotify.c - failed to update notification via libnotify\n"); +@@ -249,7 +261,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, "liferea", NULL); ++ n = notify_notification_new (_("Feed Update"), labelSummary_p, "liferea" ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ ); ++#else ++ , NULL); ++#endif + g_free (labelSummary_p); + + if (supports_append) { +@@ -272,7 +289,11 @@ + } + notify_notification_set_category (n, "feed"); + ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ /* notify_notification_attach_to_status_icon was removed */ ++#else + notify_notification_attach_to_status_icon (n, ui_tray_get_status_icon ()); ++#endif + + if (!notify_notification_show (n, NULL)) + g_warning ("notif_libnotify.c - failed to send notification via libnotify"); diff --git a/net-news/liferea/liferea-1.7.4.ebuild b/net-news/liferea/liferea-1.7.4.ebuild index 5aad45c0d76c..552c1847bb06 100644 --- a/net-news/liferea/liferea-1.7.4.ebuild +++ b/net-news/liferea/liferea-1.7.4.ebuild @@ -1,13 +1,14 @@ # 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.7.4.ebuild,v 1.2 2011/01/04 17:35:35 vostorga Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.7.4.ebuild,v 1.3 2011/03/09 18:11:07 ssuominen Exp $ -EAPI="2" +EAPI=2 -inherit gnome2 pax-utils -GCONF_DEBUG="no" +GCONF_DEBUG=no -MY_P="${P/_/-}" +inherit eutils gnome2 pax-utils + +MY_P=${P/_/-} DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo/etc feeds" HOMEPAGE="http://liferea.sourceforge.net/" @@ -36,7 +37,7 @@ DEPEND="${RDEPEND} DOCS="AUTHORS ChangeLog README" -S="${WORKDIR}/${MY_P}" +S=${WORKDIR}/${MY_P} pkg_setup() { G2CONF="${G2CONF} @@ -47,6 +48,11 @@ pkg_setup() { $(use_enable libnotify)" } +src_prepare() { + epatch "${FILESDIR}"/${P}-libnotify-0.7.patch + gnome2_src_prepare +} + src_install() { gnome2_src_install # bug #338213 |