Date: Wednesday, March 16, 2011 @ 17:17:15
Author: eric
Revision: 115103
Reverting trunk to stable version, Removed ChangeLog
Modified:
liferea/trunk/PKGBUILD
liferea/trunk/libnotify-0.7.patch
Deleted:
liferea/trunk/ChangeLog
---------------------+
ChangeLog | 148 --------------------------------------------------
PKGBUILD | 19 ++----
libnotify-0.7.patch | 42 ++++----------
3 files changed, 19 insertions(+), 190 deletions(-)
Deleted: ChangeLog
===================================================================
--- ChangeLog 2011-03-16 20:16:10 UTC (rev 115102)
+++ ChangeLog 2011-03-16 21:17:15 UTC (rev 115103)
@@ -1,148 +0,0 @@
-2011-03-07 Jan Steffens <jan.steff...@gmail.com>
-
- * liferea 1.7.4-1
- * Upstream update
-
-2011-03-07 Jan Steffens <jan.steff...@gmail.com>
-
- * liferea 1.6.5-2
- * Add patch for libnotify-0.7
- * Add hicolor-icon-theme dependency
-
-2010-09-29 Eric Belanger <e...@archlinux.org>
-
- * liferea 1.6.5-1
- * Upstream update
-
-2010-06-30 Eric Belanger <e...@archlinux.org>
-
- * liferea 1.6.4-1
- * Upstream update
- * Changed libnotify depends to optdepends
- * Tidied up package description
-
-2010-02-22 Eric Belanger <e...@archlinux.org>
-
- * liferea 1.6.3-1
- * Upstream update
-
-2010-01-23 Eric Belanger <e...@archlinux.org>
-
- * liferea 1.6.2-1
- * Upstream update
-
-2009-11-20 Eric Belanger <e...@archlinux.org>
-
- * liferea 1.6.1-1
- * Upstream update
-
-2009-07-26 Eric Belanger <e...@archlinux.org>
-
- * liferea 1.6.0-1
- * Upstream update
- * Updated depends
- * Added lua support
-
-2009-07-01 Jan de Groot <j...@archlinux.org>
-
- * liferea 1.4.28-2
- * Rebuild for xulrunner 1.9.1
- * Remove networkmanager dependencies
-
-2009-04-13 Eric Belanger <e...@archlinux.org>
-
- * liferea 1.4.28-1
- * Upstream update
-
-2009-03-15 Eric Belanger <e...@archlinux.org>
-
- * liferea 1.4.27-1
- * Upstream update
-
-2009-02-21 Eric Belanger <e...@archlinux.org>
-
- * liferea 1.4.25-1
- * Upstream update
-
-2009-02-01 Eric Belanger <e...@archlinux.org>
-
- * liferea 1.4.24-1
- * Upstream update
-
-2008-12-29 Eric Belanger <e...@archlinux.org>
-
- * liferea 1.4.23-1
- * Upstream update
-
-2008-11-14 Eric Belanger <e...@archlinux.org>
-
- * liferea 1.4.22d-1
- * Upstream update
-
-2008-10-27 Eric Belanger <e...@archlinux.org>
-
- * liferea 1.4.20-1
- * Forced downgrade (close FS#11899)
-
-2008-10-26 Eric Belanger <e...@archlinux.org>
-
- * liferea 1.4.21b-1
- * Upstream update
-
-2008-10-01 Eric Belanger <e...@archlinux.org>
-
- * liferea 1.4.20-1
- * Upstream update
-
-2008-09-06 Eric Belanger <e...@archlinux.org>
-
- * liferea 1.4.19-1
- * Upstream update
-
-2008-08-03 Eric Belanger <e...@archlinux.org>
-
- * liferea 1.4.18-2
- * Rebuilt against gnutls 2.4.1
-
-2008-07-28 Eric Belanger <e...@archlinux.org>
-
- * liferea 1.4.18-1
- * Upstream update
- * Updated xulrunner 1.9 support patch
- * Added intltool makedepends
- * Removed force option
-
-2008-06-22 Jan de Groot <j...@archlinux.org>
-
- * liferea 1.4.16b-2
- * Build with xulrunner 1.9
- * Add patch from gentoo to fix xulrunner 1.9 support
- * Make versioned dependencies more strict
- * Drop dependencies covered by xulrunner 1.9
-
-2008-06-17 Eric Belanger <e...@archlinux.org>
-
- * liferea 1.4.16b-1
- * Upstream update
- * Added force option
-
-2008-06-13 Eric Belanger <e...@archlinux.org>
-
- * liferea 1.4.16-1
- * Upstream update
-
-2008-04-17 Eric Belanger <e...@archlinux.org>
-
- * liferea 1.4.15-1
- * Upstream update
-
-2008-03-12 Eric Belanger <e...@archlinux.org>
-
- * liferea 1.4.14-1
- * Upstream update
-
-2008-03-06 Eric Belanger <e...@archlinux.org>
-
- * liferea 1.4.13-1
- * Upstream update
- * Cleaned install scriptlet
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-03-16 20:16:10 UTC (rev 115102)
+++ PKGBUILD 2011-03-16 21:17:15 UTC (rev 115103)
@@ -1,33 +1,28 @@
# $Id$
-# Maintainer: Eric Belanger <e...@archlinux.org>
+# Maintainer: Eric Bélanger <e...@archlinux.org>
pkgname=liferea
-pkgver=1.7.4
-pkgrel=1
+pkgver=1.6.5
+pkgrel=2
pkgdesc="A desktop news aggregator for online news feeds and weblogs"
arch=('i686' 'x86_64')
url="http://liferea.sourceforge.net/";
license=('GPL')
-depends=('gconf' 'libwebkit' 'libxslt' 'libglade' 'sqlite3'
'hicolor-icon-theme'
- 'libunique')
+depends=('gconf' 'libwebkit' 'libxslt' 'libglade' 'sqlite3'
'hicolor-icon-theme')
makedepends=('pkg-config' 'intltool' 'lua' 'libnotify')
optdepends=('lua: for lua scripting support'
'libnotify: for notification support')
options=('!libtool' '!emptydirs')
install=liferea.install
-changelog=ChangeLog
source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz
libnotify-0.7.patch)
-md5sums=('69ece60acc93a58cffb66e0e4f753704'
- 'c6bb9248bdf99afe96d7fdb944d8d808')
-sha1sums=('2607aad81b2ada9a932eccd326ad8bbcf1c16986'
- 'cfc0191161215d6181d936edcebf1142213b7074')
+md5sums=('b5a2c0803eec5d0aff0b9ca4114eaf16' 'fca97e3316c1c51e0179c4c7dcce47a2')
+sha1sums=('f24dbd0e81c5a8309f0d19853211fc02ff818477'
'52e53dd11a0ffe62304c4f17e80bfe1412cfbf29')
build() {
cd "${srcdir}/liferea-${pkgver}"
patch -Np1 -i "$srcdir/libnotify-0.7.patch"
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var\
- --disable-schemas-install --disable-nm
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
--disable-schemas-install
make
}
Modified: libnotify-0.7.patch
===================================================================
--- libnotify-0.7.patch 2011-03-16 20:16:10 UTC (rev 115102)
+++ libnotify-0.7.patch 2011-03-16 21:17:15 UTC (rev 115103)
@@ -1,39 +1,21 @@
-diff -u -Nr liferea-1.7.4/src/notification/libnotify.c
liferea-1.7.4-libnotify/src/notification/libnotify.c
---- liferea-1.7.4/src/notification/libnotify.c 2010-01-16 12:02:12.000000000
+0100
-+++ liferea-1.7.4-libnotify/src/notification/libnotify.c 2011-03-07
00:27:39.906668939 +0100
-@@ -158,7 +158,7 @@
+diff -u -Nr liferea-1.6.5/src/notification/libnotify.c
liferea-1.6.5-libnotify/src/notification/libnotify.c
+--- liferea-1.6.5/src/notification/libnotify.c 2009-06-20 20:33:19.000000000
+0200
++++ liferea-1.6.5-libnotify/src/notification/libnotify.c 2011-03-06
23:53:45.783336455 +0100
+@@ -150,7 +150,7 @@
// 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);
+- 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);
- notify_notification_set_icon_from_pixbuf (n, node_get_icon
(node_p));
- notify_notification_set_category (n, "feed");
-@@ -173,8 +173,6 @@
- node_p->id, NULL);
- }
+ notify_notification_set_icon_from_pixbuf
(n,node_get_icon(node_p));
-- notify_notification_attach_to_status_icon (n,
ui_tray_get_status_icon ());
--
- if (!notify_notification_show (n, NULL)) {
- g_warning ("libnotify.c - failed to update notification
via libnotify\n");
- }
-@@ -249,7 +247,7 @@
+@@ -244,7 +244,7 @@
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");
- g_free (labelSummary_p);
+- n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL,
NULL);
++ n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL);
+ g_free(labelSummary_p);
- if (supports_append) {
-@@ -272,8 +270,6 @@
- }
- notify_notification_set_category (n, "feed");
-
-- notify_notification_attach_to_status_icon (n, ui_tray_get_status_icon
());
--
- if (!notify_notification_show (n, NULL))
- g_warning ("notif_libnotify.c - failed to send notification via
libnotify");
- }
+ notify_notification_set_icon_from_pixbuf (n, node_get_icon (node));
