Date: Sunday, March 6, 2011 @ 20:01:17
Author: eric
Revision: 112828
Fixed svn mess up
Modified:
liferea/trunk/ChangeLog
liferea/trunk/PKGBUILD
liferea/trunk/libnotify-0.7.patch
---------------------+
ChangeLog | 5 +++++
PKGBUILD | 18 ++++++++++--------
libnotify-0.7.patch | 42 ++++++++++++++++++++++++++++++------------
3 files changed, 45 insertions(+), 20 deletions(-)
Modified: ChangeLog
===================================================================
--- ChangeLog 2011-03-07 01:00:47 UTC (rev 112827)
+++ ChangeLog 2011-03-07 01:01:17 UTC (rev 112828)
@@ -1,5 +1,10 @@
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
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-03-07 01:00:47 UTC (rev 112827)
+++ PKGBUILD 2011-03-07 01:01:17 UTC (rev 112828)
@@ -2,13 +2,14 @@
# Maintainer: Eric Belanger <e...@archlinux.org>
pkgname=liferea
-pkgver=1.6.5
-pkgrel=2
+pkgver=1.7.4
+pkgrel=1
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')
+depends=('gconf' 'libwebkit' 'libxslt' 'libglade' 'sqlite3'
'hicolor-icon-theme'
+ 'libunique')
makedepends=('pkg-config' 'intltool' 'lua' 'libnotify')
optdepends=('lua: for lua scripting support'
'libnotify: for notification support')
@@ -17,15 +18,16 @@
changelog=ChangeLog
source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz
libnotify-0.7.patch)
-md5sums=('b5a2c0803eec5d0aff0b9ca4114eaf16'
- 'fca97e3316c1c51e0179c4c7dcce47a2')
-sha1sums=('f24dbd0e81c5a8309f0d19853211fc02ff818477'
- '52e53dd11a0ffe62304c4f17e80bfe1412cfbf29')
+md5sums=('69ece60acc93a58cffb66e0e4f753704'
+ 'c6bb9248bdf99afe96d7fdb944d8d808')
+sha1sums=('2607aad81b2ada9a932eccd326ad8bbcf1c16986'
+ 'cfc0191161215d6181d936edcebf1142213b7074')
build() {
cd "${srcdir}/liferea-${pkgver}"
patch -Np1 -i "$srcdir/libnotify-0.7.patch"
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
--disable-schemas-install
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var\
+ --disable-schemas-install --disable-nm
make
}
Modified: libnotify-0.7.patch
===================================================================
--- libnotify-0.7.patch 2011-03-07 01:00:47 UTC (rev 112827)
+++ libnotify-0.7.patch 2011-03-07 01:01:17 UTC (rev 112828)
@@ -1,21 +1,39 @@
-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 @@
+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 @@
// 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_icon_from_pixbuf (n, node_get_icon
(node_p));
+ notify_notification_set_category (n, "feed");
+@@ -173,8 +173,6 @@
+ node_p->id, NULL);
+ }
-@@ -244,7 +244,7 @@
+- 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 @@
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);
- g_free(labelSummary_p);
+- n = notify_notification_new (_("Feed Update"), labelSummary_p,
"liferea", NULL);
++ n = notify_notification_new (_("Feed Update"), labelSummary_p,
"liferea");
+ g_free (labelSummary_p);
- notify_notification_set_icon_from_pixbuf (n, node_get_icon (node));
+ 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");
+ }
