Hello community, here is the log from the commit of package liferea for openSUSE:Factory checked in at Mon May 2 16:40:27 CEST 2011.
-------- --- GNOME/liferea/liferea.changes 2011-02-12 20:26:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/liferea/liferea.changes 2011-04-11 14:25:51.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 11 12:25:07 UTC 2011 - fcro...@novell.com + +- Add libnotify-0.7-api.patch: fix build with libnotify 0.7.x (git) +- Add liferea-1.6.5-nm09.patch: fix compatibility with NM 0.9 (git) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- libnotify-0.7-api.patch liferea-1.6.5-nm09.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ liferea.spec ++++++ --- /var/tmp/diff_new_pack.qOgMwB/_old 2011-05-02 16:39:45.000000000 +0200 +++ /var/tmp/diff_new_pack.qOgMwB/_new 2011-05-02 16:39:45.000000000 +0200 @@ -22,12 +22,17 @@ License: GPLv2+ Group: Productivity/Other Version: 1.6.5 -Release: 3 +Release: 9 Summary: Linux Feed Reader Url: http://liferea.sourceforge.net/ Source: %{name}-%{version}.tar.bz2 # PATCH-FEATURE-OPENSUSE liferea-opensuse-feeds.patch -- Add openSUSE feeds to default feeds Patch0: liferea-opensuse-feeds.patch +# PATCH-FIX-UPSTREAM libnotify-0.7-api.patch fcro...@novell.com -- fix build with libnotify 0.7.x (git) +Patch1: libnotify-0.7-api.patch +# PATCH-FIX-UPSTREAM liferea-1.6.5-nm09.patch fcro...@novell.com -- fix compatibility with NM 0.9 (git) +Patch2: liferea-1.6.5-nm09.patch + BuildRequires: NetworkManager-devel BuildRequires: dbus-1-glib-devel BuildRequires: fdupes @@ -60,6 +65,8 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build autoreconf -fi ++++++ libnotify-0.7-api.patch ++++++ >From 464e03aacbf530e2b190a444d8d4561e17c71819 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort <poch...@gmail.com> Date: Sat, 27 Nov 2010 17:36:08 +0100 Subject: [PATCH] Added support for the new libnotify API --- ChangeLog | 2 ++ configure.ac | 21 +++++++++++++-------- src/notification/libnotify.c | 16 ++++++++++++---- 3 files changed, 27 insertions(+), 12 deletions(-) Index: liferea-1.6.5/configure.ac =================================================================== --- liferea-1.6.5.orig/configure.ac +++ liferea-1.6.5/configure.ac @@ -77,9 +77,18 @@ dnl libnotify dnl ********* if test "x$enable_libnotify" = "xyes"; then - PKG_CHECK_MODULES([LIBNOTIFY], libnotify >= 0.3.2,enable_libnotify=yes,enable_libnotify=no) - AC_SUBST(LIBNOTIFY_CFLAGS) - AC_SUBST(LIBNOTIFY_LIBS) + PKG_CHECK_MODULES([LIBNOTIFY], libnotify >= 0.7,enable_libnotify=yes,enable_libnotify=no) + if test "x$enable_libnotify" = "xyes"; then + AC_DEFINE(HAVE_LIBNOTIFY, 4, [Define if libnotify.so.4 support is enabled]) + fi + if test "x$enable_libnotify" = "xno"; then + PKG_CHECK_MODULES([LIBNOTIFY], libnotify >= 0.3.2,enable_libnotify=yes,enable_libnotify=no) + if test "x$enable_libnotify" = "xyes"; then + AC_DEFINE(HAVE_LIBNOTIFY, 1, [Define if libnotify.so.1 support is enabled]) + fi + fi + AC_SUBST(LIBNOTIFY_CFLAGS) + AC_SUBST(LIBNOTIFY_LIBS) else enable_libnotify=no fi Index: liferea-1.6.5/src/notification/libnotify.c =================================================================== --- liferea-1.6.5.orig/src/notification/libnotify.c +++ liferea-1.6.5/src/notification/libnotify.c @@ -150,7 +150,11 @@ static void notif_libnotify_callback_sho // notify_notification_update ( n, node_get_title(node_p), labelText_now_p, NULL); // notify_notification_clear_actions(n); +#if HAVE_LIBNOTIFY == 4 + n = notify_notification_new (node_get_title (node_p), labelText_now_p, NULL); +#else n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL, NULL); +#endif notify_notification_set_icon_from_pixbuf (n,node_get_icon(node_p)); @@ -244,7 +248,11 @@ notif_libnotify_node_has_new_items (node 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); +#if HAVE_LIBNOTIFY == 4 + n = notify_notification_new (_("Feed Update"), labelSummary_p, "liferea"); +#else n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL, NULL); +#endif g_free(labelSummary_p); notify_notification_set_icon_from_pixbuf (n, node_get_icon (node)); ++++++ liferea-1.6.5-nm09.patch ++++++ Based on http://liferea.git.sourceforge.net/git/gitweb.cgi?p=liferea/liferea;a=commitdiff;h=fc49ae0c9c1add55754ff5731c586b22096fbb06 diff -up liferea-1.6.5/src/update.c.nm09 liferea-1.6.5/src/update.c --- liferea-1.6.5/src/update.c.nm09 2011-03-27 10:40:26.045331006 -0700 +++ liferea-1.6.5/src/update.c 2011-03-27 11:06:53.819481098 -0700 @@ -589,6 +589,17 @@ update_process_finished_job (updateJobPt } #ifdef USE_NM +static gboolean +is_nm_connected (guint state) +{ + if (state == 3 || /* NM_STATE_CONNECTED */ + state == 50 || /* NM_STATE_CONNECTED_LOCAL */ + state == 60 || /* NM_STATE_CONNECTED_SITE */ + state == 70) /* NM_STATE_CONNECTED_GLOBAL */ + return TRUE; + return FALSE; +} + static void update_network_monitor (libnm_glib_ctx *ctx, gpointer user_data) { @@ -600,10 +611,10 @@ update_network_monitor (libnm_glib_ctx * state = libnm_glib_get_network_state (ctx); online = network_is_online (); - if (online && state == LIBNM_NO_NETWORK_CONNECTION) { + if (online && !is_nm_connected (state)) { debug0 (DEBUG_UPDATE, "network manager: no network connection -> going offline"); network_set_online (FALSE); - } else if (!online && state == LIBNM_ACTIVE_NETWORK_CONNECTION) { + } else if (!online && is_nm_connected (state)) { debug0 (DEBUG_UPDATE, "network manager: active connection -> going online"); network_set_online (TRUE); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
