Reverting upstream commit 640eff3e418b786468208643d2f93718f7fa9da0 to avoid always unread feeds, bug #381117

(Portage version: 2.1.10.3/cvs/Linux i686)

3 files changed, 82 insertions, 2 deletions

diff --git a/net-news/liferea/ChangeLog b/net-news/liferea/ChangeLog
index 5a7c8ddceb9f..c2158c53989a 100644
--- a/net-news/liferea/ChangeLog
+++ b/net-news/liferea/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-news/liferea
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.210 2011/09/09 20:29:27 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.211 2011/09/11 13:36:08 vostorga Exp $
+
+*liferea-1.7.6-r1 (11 Sep 2011)
+
+  11 Sep 2011; <vostorga@gentoo.org> -liferea-1.7.6.ebuild,
+  +liferea-1.7.6-r1.ebuild, +files/liferea-1.7.6-unread-feeds.patch:
+  Reverting upstream commit 640eff3e418b786468208643d2f93718f7fa9da0 to avoid
+  always unread feeds, bug #381117
 
   09 Sep 2011; Víctor Ostorga <vostorga@gentoo.org>
   files/liferea-1.6.6b-libnotify-0.7.patch:
diff --git a/net-news/liferea/files/liferea-1.7.6-unread-feeds.patch b/net-news/liferea/files/liferea-1.7.6-unread-feeds.patch
new file mode 100644
index 000000000000..d4618dde0996
--- /dev/null
+++ b/net-news/liferea/files/liferea-1.7.6-unread-feeds.patch
@@ -0,0 +1,68 @@
+diff -NrU5 liferea-1.7.6.original/src/fl_sources/ttrss_source_feed.c liferea-1.7.6/src/fl_sources/ttrss_source_feed.c
+--- liferea-1.7.6.original/src/fl_sources/ttrss_source_feed.c	2011-06-07 15:25:28.000000000 -0600
++++ liferea-1.7.6/src/fl_sources/ttrss_source_feed.c	2011-09-11 07:02:30.000000000 -0600
+@@ -72,16 +72,12 @@
+ 				item_set_title (item, json_get_string (node, "title"));
+ 				item_set_source (item, json_get_string (node, "link"));
+ 				item_set_description (item, json_get_string (node, "content"));
+ 				item->time = json_get_int (node, "updated");
+ 				
+-				if (json_get_bool (node, "unread")) {
++				if (json_get_bool (node, "unread"))
+ 					item->readStatus = FALSE;
+-				}
+-				else {
+-					item->readStatus = TRUE;
+-				}
+ 				if (json_get_bool (node, "marked"))
+ 					item->flagStatus = TRUE;
+ 					
+ 				items = g_list_append (items, (gpointer)item);
+ 				
+diff -NrU5 liferea-1.7.6.original/src/itemset.c liferea-1.7.6/src/itemset.c
+--- liferea-1.7.6.original/src/itemset.c	2011-06-07 15:25:28.000000000 -0600
++++ liferea-1.7.6/src/itemset.c	2011-09-11 07:02:30.000000000 -0600
+@@ -77,11 +77,11 @@
+ 	GList		*oldItemIdIter = items;
+ 	itemPtr		oldItem = NULL;
+ 	gboolean	found, equal = FALSE;
+ 
+ 	/* determine if we should add it... */
+-	debug2 (DEBUG_CACHE, "check new item for merging: \"%s\", %i", item_get_title (newItem), allowUpdates);
++	debug1 (DEBUG_CACHE, "check new item for merging: \"%s\"", item_get_title (newItem));
+ 		
+ 	/* compare to every existing item in this feed */
+ 	found = FALSE;
+ 	while (oldItemIdIter) {
+ 		oldItem = (itemPtr)(oldItemIdIter->data);
+@@ -110,16 +110,10 @@
+ 
+ 		/* best case: they both have ids (position important: id check is useless without knowing if the items are different!) */
+ 		if (item_get_id (oldItem)) {			
+ 			if (0 == strcmp (item_get_id (oldItem), item_get_id (newItem))) {
+ 				found = TRUE;
+-
+-				/* found corresponding item, check if they are REALLY equal (eg, read status may have changed) */
+-				if(oldItem->readStatus != newItem->readStatus) 
+-					equal = FALSE;
+-				if(oldItem->flagStatus != newItem->flagStatus)
+-					equal = FALSE;
+ 				break;
+ 			} else {
+ 				/* different ids, but the content might be still equal (e.g. empty)
+ 				   so we need to explicitly unset the equal flag !!!  */
+ 				equal = FALSE;
+@@ -158,13 +152,10 @@
+ 				oldItem->updateStatus = TRUE;
+ 				// FIXME: this does not remove metadata from DB
+ 				metadata_list_free (oldItem->metadata);
+ 				oldItem->metadata = newItem->metadata;
+ 				newItem->metadata = NULL;
+-				oldItem->readStatus = newItem->readStatus;
+-				oldItem->flagStatus = newItem->flagStatus;
+-				
+ 				db_item_update (oldItem);
+ 				debug0 (DEBUG_CACHE, "-> item already existing and was updated");
+ 			} else {
+ 				debug0 (DEBUG_CACHE, "-> item updates not merged because of parser errors");
+ 			}
diff --git a/net-news/liferea/liferea-1.7.6.ebuild b/net-news/liferea/liferea-1.7.6-r1.ebuild
index ca78c4e49c25..09a33fda6f2a 100644
--- a/net-news/liferea/liferea-1.7.6.ebuild
+++ b/net-news/liferea/liferea-1.7.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.7.6.ebuild,v 1.2 2011/08/27 16:32:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.7.6-r1.ebuild,v 1.1 2011/09/11 13:36:08 vostorga Exp $
 
 EAPI=4
 
@@ -47,6 +47,11 @@ pkg_setup() {
 		$(use_enable libnotify)"
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-unread-feeds.patch
+	gnome2_src_prepare
+}
+
 src_install() {
 	gnome2_src_install
 	# bug #338213