[arch-commits] Commit in liferea/trunk (PKGBUILD libnotify-0.7.patch)
Eric Bélanger
eric at archlinux.org
Sun Dec 11 03:21:39 UTC 2011
Date: Saturday, December 10, 2011 @ 22:21:39
Author: eric
Revision: 144935
upgpkg: liferea 1.8.0-1
Upstream update, Add libnotify, libunique and json-glib depends, Remove libglade depends, Remove optdepends, Remove old patch
Modified:
liferea/trunk/PKGBUILD
Deleted:
liferea/trunk/libnotify-0.7.patch
---------------------+
PKGBUILD | 15 +++--------
libnotify-0.7.patch | 68 --------------------------------------------------
2 files changed, 5 insertions(+), 78 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-12-10 23:19:27 UTC (rev 144934)
+++ PKGBUILD 2011-12-11 03:21:39 UTC (rev 144935)
@@ -2,26 +2,21 @@
# Maintainer: Eric Bélanger <eric at archlinux.org>
pkgname=liferea
-pkgver=1.6.7
+pkgver=1.8.0
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' 'libglade' 'hicolor-icon-theme')
-makedepends=('pkg-config' 'intltool' 'lua' 'libnotify')
-optdepends=('lua: for lua scripting support'
- 'libnotify: for notification support')
+depends=('gconf' 'libwebkit' 'libnotify' 'libunique' 'json-glib' 'hicolor-icon-theme')
+makedepends=('intltool')
options=('!libtool' '!emptydirs')
install=liferea.install
-source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz
- libnotify-0.7.patch)
-sha1sums=('9ca2d640499dde32cd9fe83b8a6081f3628e5c0c'
- 'a88fd7682e040b7f09936b641967496dc35c67a3')
+source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz)
+sha1sums=('b731e70128130478207e9059fc9ec33ae7d95358')
build() {
cd "${srcdir}/liferea-${pkgver}"
- patch -Np1 -i "$srcdir/libnotify-0.7.patch"
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-install
make
}
Deleted: libnotify-0.7.patch
===================================================================
--- libnotify-0.7.patch 2011-12-10 23:19:27 UTC (rev 144934)
+++ libnotify-0.7.patch 2011-12-11 03:21:39 UTC (rev 144935)
@@ -1,68 +0,0 @@
-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);
-
- notify_notification_set_icon_from_pixbuf (n,node_get_icon(node_p));
-
-@@ -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, NULL, NULL);
-+ n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL);
- g_free(labelSummary_p);
-
- notify_notification_set_icon_from_pixbuf (n, node_get_icon (node));
-diff -Naur liferea-1.6.6b/configure liferea-1.6.6b-new/configure
---- liferea-1.6.6b/configure 2011-06-22 11:16:46.000000000 -0400
-+++ liferea-1.6.6b-new/configure 2011-06-22 19:41:18.000000000 -0400
-@@ -12567,12 +12567,12 @@
- pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.3.2, libnotify <= 0.5\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "libnotify >= 0.3.2, libnotify <= 0.5") 2>&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.3.2, libnotify <= 0.8\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "libnotify >= 0.3.2, libnotify <= 0.8") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= 0.3.2, libnotify <= 0.5" 2>/dev/null`
-+ pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= 0.3.2, libnotify <= 0.8" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -12583,12 +12583,12 @@
- pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.3.2, libnotify <= 0.5\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "libnotify >= 0.3.2, libnotify <= 0.5") 2>&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.3.2, libnotify <= 0.8\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "libnotify >= 0.3.2, libnotify <= 0.8") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= 0.3.2, libnotify <= 0.5" 2>/dev/null`
-+ pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= 0.3.2, libnotify <= 0.8" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -12608,9 +12608,9 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify >= 0.3.2, libnotify <= 0.5" 2>&1`
-+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify >= 0.3.2, libnotify <= 0.8" 2>&1`
- else
-- LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify >= 0.3.2, libnotify <= 0.5" 2>&1`
-+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify >= 0.3.2, libnotify <= 0.8" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBNOTIFY_PKG_ERRORS" >&5
More information about the arch-commits
mailing list