- obsoleted

Changed files:
    liferea-libnotify-0.7.patch -> 1.2
    liferea-lua51.patch -> 1.3
    liferea-nm09.patch -> 1.2

diff --git a/liferea-libnotify-0.7.patch b/liferea-libnotify-0.7.patch
deleted file mode 100644 (file)
index 31b3af1..0000000
--- a/liferea-libnotify-0.7.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up liferea-1.6.5/src/notification/libnotify.c.bak liferea-1.6.5/src/notification/libnotify.c
---- liferea-1.6.5/src/notification/libnotify.c.bak     2009-06-20 20:33:19.000000000 +0200
-+++ liferea-1.6.5/src/notification/libnotify.c 2010-11-16 15:53:17.000000000 +0100
-@@ -150,7 +150,7 @@ static void notif_libnotify_callback_sho
- //            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 @@ 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);
--      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 --git a/liferea-lua51.patch b/liferea-lua51.patch
deleted file mode 100644 (file)
index de2e5a7..0000000
--- a/liferea-lua51.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN liferea-1.6.0-rc6/configure.ac liferea-1.6.0-rc6.new/configure.ac
---- liferea-1.6.0-rc6/configure.ac     2009-06-22 19:31:47.000000000 +0200
-+++ liferea-1.6.0-rc6.new/configure.ac 2009-06-30 10:25:41.631646126 +0200
-@@ -92,7 +92,7 @@
- 
- if test "x$enable_lua" = "xyes"; then
-    PKG_CHECK_MODULES([LUA], [lua >= 5.1],, [AC_MSG_NOTICE([No lua.pc >= 5.1 present, is there a lua5.1.pc?])
--     PKG_CHECK_MODULES([LUA], [lua5.1],,[enable_lua=no])])
-+     PKG_CHECK_MODULES([LUA], [lua51],,[enable_lua=no])])
-    
-    AC_SUBST(LUA_CFLAGS)
-    AC_SUBST(LUA_LIBS)

diff --git a/liferea-nm09.patch b/liferea-nm09.patch
deleted file mode 100644 (file)
index 15933c1..0000000
--- a/liferea-nm09.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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);
-       }