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

Package-Manager: portage-2.1.10.3/cvs/Linux i686

4 files changed, 85 insertions, 14 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/Manifest b/net-news/liferea/Manifest
index 051761910cd4..b04edd7196d0 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX liferea-1.6.5-libnotify-0.7.patch 1265 RMD160 dc112ecd4913a5f8af9b4cbaa752230c71109131 SHA1 d35f6e06adcbc656eed70b54643181ff597dcca2 SHA256 128b8d9147a87f0f6b4105182375b8f6af11669ef30038b6a17a605d6512857e
 AUX liferea-1.6.6b-libnotify-0.7.patch 2399 RMD160 4e60b2f5d9182a6e12d83408bc6f51e74bc09184 SHA1 7a82a72e56ca081b6e7fc7410bc36d1af8ff3205 SHA256 4f06994dff55154715ebf5500bb604ec4c8489cf166b6e4efd7cd2685f35d6fc
 AUX liferea-1.7.4-libnotify-0.7.patch 2111 RMD160 ec050f5139747862e30f72992a21121e8f9a889f SHA1 0e7e8b273d45ce76e9cb891d72a59ba6daf67516 SHA256 38e0c25f33dba1a41d71fc19af29b3c7e1ca7e9b429187a4e996e5aa6e70b270
+AUX liferea-1.7.6-unread-feeds.patch 2837 RMD160 218d706dba4063d6eeaa34cfac253f673d07c95f SHA1 fd097691839ea97a218f82576902eea173913234 SHA256 33545060f6043b67138e72783fce4dfec0f8a2ca7d0570aa1e65e3a0b8b04d87
 DIST liferea-1.6.5.tar.gz 1784724 RMD160 77b384595a757983ab9d3f8ed91d824628991670 SHA1 f24dbd0e81c5a8309f0d19853211fc02ff818477 SHA256 3a594bd8acbdcbc236f629f2bee63ffba0ddcc38fb406f8ba89629963a877ebd
 DIST liferea-1.6.6b.tar.gz 1866016 RMD160 1e5a0b44fb3ce0cb92a5904c9c98d94e11b60cfc SHA1 e483a1356cc7ff653a178dde520b21faa18a2ce5 SHA256 98474f0deff2143e1bb2fddecaf038c15bc9a21b0f32c570f395f03ad6b9c07b
 DIST liferea-1.7.4.tar.gz 1682434 RMD160 69103730b26a28e350c6acc65f22561527b45ae8 SHA1 2607aad81b2ada9a932eccd326ad8bbcf1c16986 SHA256 fc91c7453242358fd837da0df591bc7f5d7f3fc99809bf9bf662e8b03dc6f548
@@ -11,13 +9,6 @@ DIST liferea-1.7.6.tar.gz 1833906 RMD160 30d6ec6033184dccbfdfd49bf4c482bd3835790
 EBUILD liferea-1.6.5.ebuild 1385 RMD160 a3fbece0cfefbbb9a2f1d804b31d55cf1efeea20 SHA1 83431b980c5a30a69659fad6bf2e61167cc6d2a1 SHA256 46ef446179bee9970dee12085e682b3e53fe5c45bdc88c4f6cdf0ef7ec3516a0
 EBUILD liferea-1.6.6b.ebuild 1408 RMD160 b3cc7c53c5884deff87569e1f9270697682a929e SHA1 dfb8fa5256abf7b2132dcb618260eedd5655d9d7 SHA256 6043d96609747bbd3bfb76a043a8bdfcdc780ccbce2d745f160b092586bce5b0
 EBUILD liferea-1.7.4.ebuild 1570 RMD160 273062275ca2cc07b85cb8b6f2aef63f531c2e3a SHA1 b61011a631a113afae285ec5e934c2efd9dba444 SHA256 8a9e0e06f685a65b8741f752dfd539ca442dbba3895b38e3ab4410241ce2dd97
-EBUILD liferea-1.7.6.ebuild 1608 RMD160 3e50165070148feca2ad822c7d169c23d923626e SHA1 086dd7bdacc0321592327e07696157195e9055ad SHA256 ceb4ee19ecaa08d927ed07beb058157f9bca9dcffd85dcacc6ad36f0e04981bd
-MISC ChangeLog 55778 RMD160 993b37c6b2ff0b92e953cbc88fde4c0792b74652 SHA1 71c23907939784d9e469bd15c2ecaccd51911a9b SHA256 3e7cbb377b96c7c1d0104bbf7d31e985d80cf423c50b2b723e65bb05da26d4e2
+EBUILD liferea-1.7.6-r1.ebuild 1695 RMD160 ef8f6f2b263f70cd34cfffca2e54f131e1c94a4d SHA1 863960fecdc6fe08d162e0fcfd23ff41839be138 SHA256 9cb3463ccda6eba44c7e6c7738c1f3f5192a25ae8597ed0f52c2d26f47972f04
+MISC ChangeLog 56054 RMD160 8d424d084bca99feb2795c3d7c73e65ad447b379 SHA1 c52ba609b048714c5b84505a0bb92a64c13ab4b1 SHA256 09a67bc47556914ca70cd6ee7e15a62be7956f7ee447616250276c50a9de7a66
 MISC metadata.xml 744 RMD160 1b33515f2b2dad726c287a46fbfcaba27ca4fe40 SHA1 055d70d945872c7365a13442dff337e54edd860a SHA256 ca219b4773a6004e48ff95cdbf33376800aa4aad9ce5371e567ebec0da82ed61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk5qdzMACgkQKQaZ7OJe4zZfEwCfUau+XyiC9U9ykdmvvCCX+HSd
-eSQAn0oTY1I9+mcBAukrF+LjQJnmhT7W
-=G4bc
------END PGP SIGNATURE-----
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