Your message dated Sat, 22 Dec 2012 12:36:41 +0100
with message-id <[email protected]>
and subject line Re: Bug#692874: liferea: diff for NMU version 1.8.6-1+nmu1
has caused the Debian Bug report #692874,
regarding RFS: liferea/1.8.6-1.1 [NMU]
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
692874: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=692874
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: liferea
Version: 1.8.6-1
Severity: normal
Tags: patch pending

Hello,

I've prepared an NMU for liferea (versioned as 1.8.6-1+nmu1) that needs
to be reviewed and signed for upload. My goal is to get these fixes 
into Wheezy if possible.

  * Non-maintainer upload.
  * Fixed crash when dragging Google Reader feeds to parent node. 
    (Closes: 692526)
  * Fixed crash when removing folders in Google Reader feeds. (Closes: 692525)
  * Fixed crash when opening empty links in feeds. (Closes: 692272)
  * Fixed crash when network online status changes. (Closes: 692270)
  * Fixed bug where web browser doesn't launch or the wrong web browser is 
    launched. (Closes: #668197)
  * Fixed bug where user's desktop was spammed with notifications about 
    GR feeds that have already been read. (Closes: #692007)
  * Replaced build-depends on transitional package libwebkit-dev with 
    libwebkitgtk-dev (Closes: #677749)

Regards.

David Smith

diff -Nru liferea-1.8.6/debian/changelog liferea-1.8.6/debian/changelog
--- liferea-1.8.6/debian/changelog	2012-07-01 05:45:40.000000000 +0800
+++ liferea-1.8.6/debian/changelog	2012-11-10 12:10:40.000000000 +0800
@@ -1,3 +1,20 @@
+liferea (1.8.6-1+nmu1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fixed crash when dragging Google Reader feeds to parent node. 
+    (Closes: 692526)
+  * Fixed crash when removing folders in Google Reader feeds. (Closes: 692525)
+  * Fixed crash when opening empty links in feeds. (Closes: 692272)
+  * Fixed crash when network online status changes. (Closes: 692270)
+  * Fixed bug where web browser doesn't launch or the wrong web browser is 
+    launched. (Closes: #668197)
+  * Fixed bug where user's desktop was spammed with notifications about 
+    GR feeds that have already been read. (Closes: #692007)
+  * Replaced build-depends on transitional package libwebkit-dev with 
+    libwebkitgtk-dev (Closes: #677749)
+
+ -- David Smith <[email protected]>  Sat, 10 Nov 2012 10:43:14 +0800
+
 liferea (1.8.6-1) unstable; urgency=low
 
   * Fixes ever growing temporary DB files. (patch by Sven Hartge)
diff -Nru liferea-1.8.6/debian/control liferea-1.8.6/debian/control
--- liferea-1.8.6/debian/control	2012-07-01 05:38:09.000000000 +0800
+++ liferea-1.8.6/debian/control	2012-11-07 16:53:38.000000000 +0800
@@ -15,7 +15,7 @@
                libglade2-dev,
                libgtk2.0-dev (>= 2.18.0),
                libglib2.0-dev (>= 2.24.0),
-               libwebkit-dev (>= 1.2.2),
+               libwebkitgtk-dev (>= 1.8.1),
                intltool,
                libicu-dev,
                libx11-dev,
diff -Nru liferea-1.8.6/debian/patches/0001-fix-crash-in-liferea_webkit_launch_url-.-for-empty-l.patch liferea-1.8.6/debian/patches/0001-fix-crash-in-liferea_webkit_launch_url-.-for-empty-l.patch
--- liferea-1.8.6/debian/patches/0001-fix-crash-in-liferea_webkit_launch_url-.-for-empty-l.patch	1970-01-01 08:00:00.000000000 +0800
+++ liferea-1.8.6/debian/patches/0001-fix-crash-in-liferea_webkit_launch_url-.-for-empty-l.patch	2012-11-06 14:14:13.000000000 +0800
@@ -0,0 +1,40 @@
+From 31fced473a8351749405fae99872556059b308ae Mon Sep 17 00:00:00 2001
+From: Matthias Maennich <[email protected]>
+Date: Wed, 15 Aug 2012 00:06:29 +0200
+Subject: [PATCH] fix crash in liferea_webkit_launch_url(...) for empty links
+ in feeds
+
+in case of empty links in feeds liferea crashed with the
+following backtrace:
+  #0 in __strstr_sse42 () from /lib/libc.so.6
+  #1 in liferea_webkit_launch_url (scrollpane=<>, url=0x0) at webkit.c:515
+  #2 in itemlist_selection_changed (item=item@entry=<>) at itemlist.c:599
+
+this patch fixes the crash with showing the default itemview content
+instead of trying to launch the browser with the non-existing URL
+
+Reported-by: Matthias Maennich <[email protected]>
+---
+ src/itemlist.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+--- a/src/itemlist.c
++++ b/src/itemlist.c
+@@ -599,8 +599,15 @@
+ 			if (node->loadItemLink) {
+ 				gchar* link = item_make_link (item);
+ 
+-				itemview_launch_URL (link, TRUE /* force internal */);
+-				g_free (link);
++				// in case of an empty link entry the above results in link==NULL
++				// so, only show the link if exists
++				if (link) {
++					itemview_launch_URL (link, TRUE /* force internal */);
++					g_free (link);
++				} else { // else show the normal itemview content
++					itemview_select_item(item);
++					itemview_update();
++				}
+ 			} else {
+ 				itemview_select_item (item);
+ 				itemview_update ();
diff -Nru liferea-1.8.6/debian/patches/0001-Fix-crash-when-network-online-status-changes.patch liferea-1.8.6/debian/patches/0001-Fix-crash-when-network-online-status-changes.patch
--- liferea-1.8.6/debian/patches/0001-Fix-crash-when-network-online-status-changes.patch	1970-01-01 08:00:00.000000000 +0800
+++ liferea-1.8.6/debian/patches/0001-Fix-crash-when-network-online-status-changes.patch	2012-11-06 14:14:27.000000000 +0800
@@ -0,0 +1,25 @@
+From 41d21ec9d844ddf62b8e71b0476ab4cffca32654 Mon Sep 17 00:00:00 2001
+From: Yanko Kaneti <[email protected]>
+Date: Fri, 14 Sep 2012 16:13:00 +0300
+Subject: [PATCH] Fix crash when network online status changes
+
+From Fedora bug https://bugzilla.redhat.com/show_bug.cgi?id=857348 :
+"liferea frequently crashes when manipulating htmlviews (opening/closing
+new tabs) while the network online status changes. This is caused
+because the signal notifying online status is not properly disconnected
+when the htmlview is removed."
+---
+ src/ui/liferea_htmlview.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/src/ui/liferea_htmlview.c
++++ b/src/ui/liferea_htmlview.c
+@@ -77,6 +77,8 @@
+ static void
+ liferea_htmlview_finalize (GObject *object)
+ {
++	g_signal_handlers_disconnect_by_data (network_monitor_get (), object);
++
+ 	G_OBJECT_CLASS (parent_class)->finalize (object);
+ }
+ 
diff -Nru liferea-1.8.6/debian/patches/fix_browser_selections liferea-1.8.6/debian/patches/fix_browser_selections
--- liferea-1.8.6/debian/patches/fix_browser_selections	1970-01-01 08:00:00.000000000 +0800
+++ liferea-1.8.6/debian/patches/fix_browser_selections	2012-11-10 10:16:35.000000000 +0800
@@ -0,0 +1,30 @@
+--- a/src/browser.c
++++ b/src/browser.c
+@@ -137,7 +137,7 @@
+ 		}
+ 
+ 		if (fallback && !cmd)	/* Last fallback: first browser default */
+-			cmd = browsers[0].defaultplace;
++			cmd = browsers[6].defaultplace;
+ 	}
+ 	g_free (libname);
+ 		
+@@ -244,6 +244,7 @@
+ 	struct browser	*browser;
+ 	gchar		*cmd = NULL;
+ 	gboolean	done = FALSE;	
++	gchar	*libname;
+ 	
+ 	g_assert (uri != NULL);
+ 	
+@@ -256,7 +257,9 @@
+ 			g_free (cmd);
+ 		} else {
+ 			/* the "default" browser has no command to use the GTK launch mechanism */
+-			done = gtk_show_uri (NULL, uri, 0, NULL);
++			conf_get_str_value (BROWSER_ID, &libname);
++			if (g_str_equal (libname, "default"))
++			      done = gtk_show_uri (NULL, uri, 0, NULL);
+ 		}
+ 	}
+ 	
diff -Nru liferea-1.8.6/debian/patches/fix-crash-when-dragging-feeds-outside-google-reader-2855990.patch liferea-1.8.6/debian/patches/fix-crash-when-dragging-feeds-outside-google-reader-2855990.patch
--- liferea-1.8.6/debian/patches/fix-crash-when-dragging-feeds-outside-google-reader-2855990.patch	1970-01-01 08:00:00.000000000 +0800
+++ liferea-1.8.6/debian/patches/fix-crash-when-dragging-feeds-outside-google-reader-2855990.patch	2012-11-07 11:34:59.000000000 +0800
@@ -0,0 +1,35 @@
+From 5f245fe87e8f32ff0e13c2e94addaf6032b806c4 Mon Sep 17 00:00:00 2001
+From: Lars Windolf <[email protected]>
+Date: Mon, 30 Jul 2012 23:26:01 +0200
+Subject: [PATCH] Fixes SF #2855990: Crash when dragging Google Reader feeds outside Google Reader. This is now prevented. (reported by algnod)
+
+---
+ ChangeLog       |    3 +++
+ src/ui/ui_dnd.c |    9 ++++++++-
+ 2 files changed, 11 insertions(+), 1 deletions(-)
+
+--- a/src/ui/ui_dnd.c
++++ b/src/ui/ui_dnd.c
+@@ -105,7 +105,7 @@
+ 	   iterator to insert after). In any case we have to check
+ 	   if it is a writeable node source. */
+ 
+-	/* never drop into read-only subscription node sources */
++	/* Never drop into read-only subscription node sources */
+ 	if (!(NODE_SOURCE_TYPE (targetNode)->capabilities & NODE_SOURCE_CAPABILITY_WRITABLE_FEEDLIST))
+ 		return FALSE;
+ 
+@@ -116,6 +116,13 @@
+ 	if (gtk_tree_model_get_iter (GTK_TREE_MODEL (model), &iter, src_path)) {
+ 		gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, FS_PTR, &sourceNode, -1);
+ 
++		g_assert (sourceNode);
++
++		/* Never drop into another node source as this arises to many problems
++		   (e.g. remote sync, different subscription type, e.g. SF #2855990) */
++		if (NODE_SOURCE_TYPE (targetNode) != NODE_SOURCE_TYPE (sourceNode))
++			return FALSE;
++
+ 		if (IS_FOLDER(sourceNode) && !(NODE_SOURCE_TYPE (targetNode)->capabilities & NODE_SOURCE_CAPABILITY_HIERARCHIC_FEEDLIST))
+ 			return FALSE;
+ 	}
diff -Nru liferea-1.8.6/debian/patches/google_reader_notification_fix liferea-1.8.6/debian/patches/google_reader_notification_fix
--- liferea-1.8.6/debian/patches/google_reader_notification_fix	1970-01-01 08:00:00.000000000 +0800
+++ liferea-1.8.6/debian/patches/google_reader_notification_fix	2012-11-06 14:14:32.000000000 +0800
@@ -0,0 +1,12 @@
+--- a/src/itemset.c
++++ b/src/itemset.c
+@@ -168,7 +168,8 @@
+ 				   which means online accounts we sync against, but not normal
+ 				   online feeds where items have no read status. */
+ 				if (allowStateChanges) {
+-					oldItem->readStatus = newItem->readStatus;
++					if ((!oldItem->readStatus) && (newItem->readStatus))
++					      oldItem->readStatus = newItem->readStatus;
+ 					oldItem->flagStatus = newItem->flagStatus;
+ 				}
+ 				
diff -Nru liferea-1.8.6/debian/patches/google_source_remove_node.patch liferea-1.8.6/debian/patches/google_source_remove_node.patch
--- liferea-1.8.6/debian/patches/google_source_remove_node.patch	1970-01-01 08:00:00.000000000 +0800
+++ liferea-1.8.6/debian/patches/google_source_remove_node.patch	2012-11-07 11:11:25.000000000 +0800
@@ -0,0 +1,226 @@
+From 739a294f7c045c37e9dbce97455a71cb2357e068 Mon Sep 17 00:00:00 2001
+From: Lars Windolf <[email protected]>
+Date: Fri, 5 Oct 2012 12:09:42 +0200
+Subject: [PATCH] Fixes SF #3572660: crash in google_source_remove_node (reported by Yanko Kaneti)
+
+---
+ ChangeLog                       |    8 ++++++++
+ src/fl_sources/default_source.c |    4 +++-
+ src/fl_sources/google_source.c  |    3 ++-
+ src/fl_sources/node_source.h    |   13 +++++++------
+ src/fl_sources/ttrss_source.c   |    4 ++--
+ src/node.c                      |   24 +++++++++++++++++++++++-
+ src/node.h                      |   20 +++++++++++++++++++-
+ src/ui/popup_menu.c             |   14 ++++++++------
+ 8 files changed, 72 insertions(+), 18 deletions(-)
+
+--- a/src/fl_sources/default_source.c
++++ b/src/fl_sources/default_source.c
+@@ -1,7 +1,7 @@
+ /**
+  * @file default_source.c  default static feed list source
+  * 
+- * Copyright (C) 2005-2010 Lars Lindner <[email protected]>
++ * Copyright (C) 2005-2012 Lars Lindner <[email protected]>
+  * Copyright (C) 2005-2006 Nathan J. Conrad <[email protected]>
+  *
+  * This program is free software; you can redistribute it and/or modify
+@@ -210,6 +210,8 @@
+ 	.description		= "The default feed list source. Should never be added manually. If you see this then something went wrong!",
+ 	.capabilities		= NODE_SOURCE_CAPABILITY_IS_ROOT |
+ 				  NODE_SOURCE_CAPABILITY_HIERARCHIC_FEEDLIST |
++	                          NODE_SOURCE_CAPABILITY_ADD_FEED |
++	                          NODE_SOURCE_CAPABILITY_ADD_FOLDER |
+ 				  NODE_SOURCE_CAPABILITY_WRITABLE_FEEDLIST,
+ 	.source_type_init	= default_source_init,
+ 	.source_type_deinit	= default_source_deinit,
+--- a/src/fl_sources/google_source.c
++++ b/src/fl_sources/google_source.c
+@@ -357,9 +357,10 @@
+ 	.id                  = "fl_google",
+ 	.name                = N_("Google Reader"),
+ 	.description         = N_("Integrate the feed list of your Google Reader account. Liferea will "
+-	   "present your Google Reader subscriptions, and will synchronize your feed list and reading lists."),
++	                          "present your Google Reader subscriptions, and will synchronize your feed list and reading lists."),
+ 	.capabilities        = NODE_SOURCE_CAPABILITY_DYNAMIC_CREATION | 
+ 	                       NODE_SOURCE_CAPABILITY_WRITABLE_FEEDLIST |
++	                       NODE_SOURCE_CAPABILITY_ADD_FEED |
+ 	                       NODE_SOURCE_CAPABILITY_ITEM_STATE_SYNC,
+ 	.source_type_init    = google_source_init,
+ 	.source_type_deinit  = google_source_deinit,
+--- a/src/fl_sources/node_source.h
++++ b/src/fl_sources/node_source.h
+@@ -1,7 +1,7 @@
+ /**
+  * @file node_source.h  generic node source interface
+  * 
+- * Copyright (C) 2005-2010 Lars Lindner <[email protected]>
++ * Copyright (C) 2005-2012 Lars Lindner <[email protected]>
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+@@ -50,11 +50,12 @@
+ 
+ enum {
+ 	NODE_SOURCE_CAPABILITY_IS_ROOT			= (1<<0),	/**< flag only for default feed list source */
+-	NODE_SOURCE_CAPABILITY_MULTI_INSTANCES		= (1<<1),	/**< allows multiple source instances */
+-	NODE_SOURCE_CAPABILITY_DYNAMIC_CREATION		= (1<<2),	/**< feed list source is user created */
+-	NODE_SOURCE_CAPABILITY_WRITABLE_FEEDLIST	= (1<<3),	/**< the feed list tree of the source can be changed */
+-	NODE_SOURCE_CAPABILITY_HIERARCHIC_FEEDLIST	= (1<<4),	/**< the feed list tree of the source can have hierarchic folders */
+-	NODE_SOURCE_CAPABILITY_ITEM_STATE_SYNC		= (1<<5)	/**< the item state can and should be sync'ed with remote */
++	NODE_SOURCE_CAPABILITY_DYNAMIC_CREATION		= (1<<1),	/**< feed list source is user created */
++	NODE_SOURCE_CAPABILITY_WRITABLE_FEEDLIST	= (1<<2),	/**< the feed list tree of the source can be changed */
++	NODE_SOURCE_CAPABILITY_ADD_FEED			= (1<<3),	/**< feeds can be added to the source */
++	NODE_SOURCE_CAPABILITY_ADD_FOLDER		= (1<<4),	/**< folders can be added to the source */
++	NODE_SOURCE_CAPABILITY_HIERARCHIC_FEEDLIST	= (1<<5),	/**< the feed list tree of the source can have hierarchic folders */
++	NODE_SOURCE_CAPABILITY_ITEM_STATE_SYNC		= (1<<6)	/**< the item state can and should be sync'ed with remote */
+ };
+ 
+ /** feed list node source type */
+--- a/src/fl_sources/ttrss_source.c
++++ b/src/fl_sources/ttrss_source.c
+@@ -1,7 +1,7 @@
+ /**
+  * @file ttrss_source.c  tt-rss feed list source support
+  * 
+- * Copyright (C) 2010-2011 Lars Lindner <[email protected]>
++ * Copyright (C) 2010-2012 Lars Lindner <[email protected]>
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+@@ -364,7 +364,7 @@
+ 	.name                = N_("Tiny Tiny RSS"),
+ 	.description         = N_("Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will "
+ 	   "present your tt-rss subscriptions, and will synchronize your feed list and reading lists."),
+-	.capabilities        = NODE_SOURCE_CAPABILITY_DYNAMIC_CREATION | 
++	.capabilities        = NODE_SOURCE_CAPABILITY_DYNAMIC_CREATION |
+ 	                       NODE_SOURCE_CAPABILITY_ITEM_STATE_SYNC,
+ 	.source_type_init    = ttrss_source_init,
+ 	.source_type_deinit  = ttrss_source_deinit,
+--- a/src/node.c
++++ b/src/node.c
+@@ -1,7 +1,7 @@
+ /**
+  * @file node.c  hierarchic feed list node handling
+  * 
+- * Copyright (C) 2003-2011 Lars Lindner <[email protected]>
++ * Copyright (C) 2003-2012 Lars Lindner <[email protected]>
+  * Copyright (C) 2004-2006 Nathan J. Conrad <[email protected]>
+  *
+  * This program is free software; you can redistribute it and/or modify
+@@ -494,6 +494,28 @@
+ 	return baseUrl;
+ }
+ 
++gboolean
++node_can_add_child_feed (nodePtr node)
++{
++	g_assert (node->source->root);
++
++	if (!(NODE_TYPE (node->source->root)->capabilities & NODE_CAPABILITY_ADD_CHILDS))
++		return FALSE;
++
++	return (NODE_SOURCE_TYPE (node)->capabilities & NODE_SOURCE_CAPABILITY_ADD_FEED);
++}
++
++gboolean
++node_can_add_child_folder (nodePtr node)
++{
++	g_assert (node->source->root);
++
++	if (!(NODE_TYPE (node->source->root)->capabilities & NODE_CAPABILITY_ADD_CHILDS))
++		return FALSE;
++
++	return (NODE_SOURCE_TYPE (node)->capabilities & NODE_SOURCE_CAPABILITY_ADD_FOLDER);
++}
++
+ /* node children iterating interface */
+ 
+ void
+--- a/src/node.h
++++ b/src/node.h
+@@ -1,7 +1,7 @@
+ /**
+  * @file node.h  hierarchic feed list node interface
+  * 
+- * Copyright (C) 2003-2010 Lars Lindner <[email protected]>
++ * Copyright (C) 2003-2012 Lars Lindner <[email protected]>
+  * Copyright (C) 2004-2006 Nathan J. Conrad <[email protected]>
+  *
+  * This program is free software; you can redistribute it and/or modify
+@@ -355,6 +355,24 @@
+  */
+ const gchar * node_get_base_url(nodePtr node);
+ 
++/**
++ * Query wether a feed be added to the given node.
++ *
++ * @param node	the node
++ *
++ * @returns TRUE if a feed can be added
++ */
++gboolean node_can_add_child_feed (nodePtr node);
++
++/**
++ * Query wether a folder be added to the given node.
++ *
++ * @param node	the node
++ *
++ * @returns TRUE if a folder can be added
++ */
++gboolean node_can_add_child_folder (nodePtr node);
++
+ /* child nodes iterating interface */
+ 
+ typedef void 	(*nodeActionFunc)	(nodePtr node);
+--- a/src/ui/popup_menu.c
++++ b/src/ui/popup_menu.c
+@@ -262,14 +262,15 @@
+ ui_popup_node_menu (nodePtr node, gboolean validSelection, guint button, guint32 activate_time)
+ {
+ 	GtkWidget	*menu;
+-	gboolean	writeableFeedlist, isRoot, isHierarchic;
++	gboolean	writeableFeedlist, isRoot, isHierarchic, addChildren;
+ 
+ 	menu = gtk_menu_new ();
+ 	
+ 	if (node->parent) {
+ 		writeableFeedlist = NODE_SOURCE_TYPE (node->parent->source->root)->capabilities & NODE_SOURCE_CAPABILITY_WRITABLE_FEEDLIST;
+-		isRoot = NODE_SOURCE_TYPE (node->parent->source->root)->capabilities & NODE_SOURCE_CAPABILITY_IS_ROOT;
++		isRoot = NODE_SOURCE_TYPE (node->source->root)->capabilities & NODE_SOURCE_CAPABILITY_IS_ROOT;
+ 		isHierarchic = NODE_SOURCE_TYPE (node->parent->source->root)->capabilities & NODE_SOURCE_CAPABILITY_HIERARCHIC_FEEDLIST;
++		addChildren = NODE_TYPE (node->source->root)->capabilities & NODE_CAPABILITY_ADD_CHILDS;
+ 	} else {
+ 		/* if we have no parent then we have the root node... */
+ 		writeableFeedlist = TRUE;
+@@ -287,7 +288,7 @@
+ 	}
+ 
+ 	if (writeableFeedlist) {
+-		if (NODE_TYPE (node->source->root)->capabilities & NODE_CAPABILITY_ADD_CHILDS) {
++		if (addChildren) {
+ 			GtkWidget	*item;
+ 			GtkWidget	*submenu;
+ 
+@@ -295,9 +296,10 @@
+ 
+ 			item = ui_popup_add_menuitem (menu, _("_New"), NULL, NULL, NULL, 0);
+ 
+-			ui_popup_add_menuitem (submenu, _("New _Subscription..."), ui_popup_add_feed, NULL, NULL, 0);
++			if (node_can_add_child_feed (node))
++				ui_popup_add_menuitem (submenu, _("New _Subscription..."), ui_popup_add_feed, NULL, NULL, 0);
+ 			
+-			if (isHierarchic)
++			if (node_can_add_child_folder (node))
+ 				ui_popup_add_menuitem (submenu, _("New _Folder..."), ui_popup_add_folder, NULL, NULL, 0);
+ 				
+ 			if (isRoot) {
+@@ -309,7 +311,7 @@
+ 			gtk_menu_item_set_submenu (GTK_MENU_ITEM(item), submenu);
+ 		}
+ 		
+-		if (node->children) {
++		if (isRoot && node->children) {
+ 			gtk_menu_shell_append (GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
+ 			ui_popup_add_menuitem (menu, _("Sort Feeds"), ui_popup_sort_feeds, node, GTK_STOCK_SORT_ASCENDING, 0);
+ 		}
diff -Nru liferea-1.8.6/debian/patches/libtool-dont-rearange-as-needed liferea-1.8.6/debian/patches/libtool-dont-rearange-as-needed
--- liferea-1.8.6/debian/patches/libtool-dont-rearange-as-needed	2012-07-01 05:38:09.000000000 +0800
+++ liferea-1.8.6/debian/patches/libtool-dont-rearange-as-needed	2012-11-06 14:13:28.000000000 +0800
@@ -3,8 +3,8 @@
 Posted by him to #347650-
 Last-Update: 2012-03-26
 
---- liferea-1.8.3.orig/ltmain.sh
-+++ liferea-1.8.3/ltmain.sh
+--- a/ltmain.sh
++++ b/ltmain.sh
 @@ -5800,6 +5800,11 @@
  	arg=$func_stripname_result
  	;;
diff -Nru liferea-1.8.6/debian/patches/series liferea-1.8.6/debian/patches/series
--- liferea-1.8.6/debian/patches/series	2012-02-27 09:54:47.000000000 +0800
+++ liferea-1.8.6/debian/patches/series	2012-11-10 10:16:35.000000000 +0800
@@ -1,3 +1,8 @@
 www-browser
 debian-example-feeds
 libtool-dont-rearange-as-needed
+0001-fix-crash-in-liferea_webkit_launch_url-.-for-empty-l.patch
+0001-Fix-crash-when-network-online-status-changes.patch
+google_reader_notification_fix
+fix-crash-when-dragging-feeds-outside-google-reader-2855990.patch
+fix_browser_selections

--- End Message ---
--- Begin Message ---
On 17-12-12 13:11, David Smith wrote:
> New NMU with upstream's patch for 692272 backported to liferea in Wheezy
> attached.
> 
> Thanks for your time and patience!
> 
> http://mentors.debian.net/package/liferea
> http://mentors.debian.net/debian/pool/main/l/liferea/liferea_1.8.6-1.1.dsc

Thanks for your work on improving Debian.

Build, signed and uploaded. Please request the unblock from the RT,
follow up on it and make sure that the BTS sends me a CC of that bug.

Please make sure you are subscribed to liferea in the PTS so you can
respond to bug reports if they appear.

====
On the future

If you are interested in helping the current maintainer with liferea, I
am willing to review and sponsor reasonable NMU's from you for the
lesser bugs if you target experimental during the freeze and if you
contact the current maintainer to ask if you can be a co-maintainer.

If you do, also look at the build log and investigate (at least) the
following lines and the lintian items:
configure: WARNING: unrecognized options: --enable-gnutls, --enable-lua,
--enable-nm
ttrss_source_feed.c:71:5: warning: format '%lld' expects argument of
type 'long long int', but argument 2 has type 'gint64' [-Wformat]
ttrss_source_feed_list.c:63:2: warning: format '%lld' expects argument
of type 'long long int', but argument 2 has type 'gint64' [-Wformat]

Paul

Attachment: signature.asc
Description: OpenPGP digital signature


--- End Message ---

Reply via email to