new upstream release (development branch). fixes bug #81375.

(Portage version: 2.0.51.16)

5 files changed, 324 insertions, 20 deletions

diff --git a/mail-client/sylpheed/ChangeLog b/mail-client/sylpheed/ChangeLog
index 873726cc16a6..0e787c64b15f 100644
--- a/mail-client/sylpheed/ChangeLog
+++ b/mail-client/sylpheed/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/sylpheed
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.71 2005/02/07 21:07:09 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.72 2005/02/18 09:58:28 hattya Exp $
+
+*sylpheed-1.9.2 (18 Feb 2005)
+
+  18 Feb 2005; Akinori Hattori <hattya@gentoo.org>
+  +files/sylpheed-1.9.2-references.diff, +sylpheed-1.9.2.ebuild:
+  new upstream release (development branch). fixes bug #81375.
 
   07 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> sylpheed-1.0.0.ebuild:
   Stable on alpha.
diff --git a/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest
index 7fbe0bad90d6..432ab6a23b55 100644
--- a/mail-client/sylpheed/Manifest
+++ b/mail-client/sylpheed/Manifest
@@ -1,26 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 218682fdf3c96e0312c79cde11317c37 sylpheed-1.9.1.ebuild 1485
-MD5 3db6f13b344f39f67f90cd1bb4ef7bf1 ChangeLog 18407
+MD5 d20e9dbc2d3f2d48ba447f44fce0d6c7 ChangeLog 18618
 MD5 126ca8f672f0296d2f1e6830e6729a91 metadata.xml 231
-MD5 7c55aa20c9e62cfdbef9a0f65a64a6db sylpheed-0.9.99.ebuild 1679
-MD5 1a3ae19da98478c2f2b156f45e333404 sylpheed-1.0.1.ebuild 1611
 MD5 3a6dcf54aaa913be4107d770d112f172 sylpheed-0.9.12-r3.ebuild 1686
+MD5 7c55aa20c9e62cfdbef9a0f65a64a6db sylpheed-0.9.99.ebuild 1679
 MD5 263018ffe58c91e9e1d5a61d922f51a7 sylpheed-1.0.0.ebuild 1677
-MD5 f847bb1651a5b85decf13e2d8d01afe2 files/shared-mime.patch 649
+MD5 1a3ae19da98478c2f2b156f45e333404 sylpheed-1.0.1.ebuild 1611
+MD5 218682fdf3c96e0312c79cde11317c37 sylpheed-1.9.1.ebuild 1485
+MD5 d90444f476f4216ffe44f62bd9c79daf sylpheed-1.9.2.ebuild 1422
+MD5 54b7f8281a74665ddcd19c166763dda2 files/digest-sylpheed-0.9.12-r3 69
 MD5 a7aca32080e6fc10d7b2510e10e00912 files/digest-sylpheed-0.9.99 69
-MD5 be1f2c5362b7381526f481787259ce54 files/digest-sylpheed-1.0.1 68
-MD5 4cbec71671b7349c904f860a12fee5d9 files/sylpheed-namespace.diff 550
 MD5 70e31bfd2cf86fe96c8d2a7154a47863 files/digest-sylpheed-1.0.0 68
-MD5 f4242298cfab21456442bfe52505d2b8 files/sylpheed-procmime.diff 1119
+MD5 be1f2c5362b7381526f481787259ce54 files/digest-sylpheed-1.0.1 68
 MD5 219134007596e48593213b08bccfd652 files/digest-sylpheed-1.9.1 68
+MD5 ecfb17a01f93131ee28813066186582a files/digest-sylpheed-1.9.2 68
+MD5 f847bb1651a5b85decf13e2d8d01afe2 files/shared-mime.patch 649
 MD5 675221f844926806e120435f82df5fad files/sylpheed-0.9.12-64bit.patch 401
-MD5 54b7f8281a74665ddcd19c166763dda2 files/digest-sylpheed-0.9.12-r3 69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCB9iDugEuf3OQ0akRAsi6AKCfOKTzMWT5zDHbaBqGnW9qC+bAIQCfYqG2
-YeKysP8OlMrhnir5dEWfJCg=
-=D67P
------END PGP SIGNATURE-----
+MD5 28f6e562e3c547daedea86c235dd15a3 files/sylpheed-1.9.2-references.diff 6489
+MD5 4cbec71671b7349c904f860a12fee5d9 files/sylpheed-namespace.diff 550
+MD5 f4242298cfab21456442bfe52505d2b8 files/sylpheed-procmime.diff 1119
diff --git a/mail-client/sylpheed/files/digest-sylpheed-1.9.2 b/mail-client/sylpheed/files/digest-sylpheed-1.9.2
new file mode 100644
index 000000000000..cce5c2beb4c4
--- /dev/null
+++ b/mail-client/sylpheed/files/digest-sylpheed-1.9.2
@@ -0,0 +1 @@
+MD5 56edc4f0845fcde6c5a74766d1f8ad5a sylpheed-1.9.2.tar.bz2 2221396
diff --git a/mail-client/sylpheed/files/sylpheed-1.9.2-references.diff b/mail-client/sylpheed/files/sylpheed-1.9.2-references.diff
new file mode 100644
index 000000000000..7805ff703c56
--- /dev/null
+++ b/mail-client/sylpheed/files/sylpheed-1.9.2-references.diff
@@ -0,0 +1,230 @@
+Index: trunk/src/procheader.c
+===================================================================
+--- trunk/src/procheader.c	(revision 107)
++++ trunk/src/procheader.c	(working copy)
+@@ -507,7 +507,7 @@
+ 	MsgInfo *msginfo;
+ 	gchar buf[BUFFSIZE], tmp[BUFFSIZE];
+ 	gchar *reference = NULL;
+-	gchar *p;
++	gchar *p, *q;
+ 	gchar *hp;
+ 	HeaderEntry *hentry;
+ 	gint hnum;
+@@ -573,6 +573,20 @@
+ 			msginfo->msgid = g_strdup(hp);
+ 			break;
+ 		case H_REFERENCES:
++			p = hp;
++			while ((p = strchr(p, '<')) != NULL && 
++			       (q = strchr(p + 1, '>')) != NULL) {
++				msginfo->references = g_slist_prepend
++					(msginfo->references, 
++					 g_strndup(p + 1, q - p - 1));
++				p = q + 1;						 
++			}
++			if (msginfo->references) { 
++				if (!reference) 
++					/* use last one as possible in-reply-to replacement*/
++					reference = g_strdup(msginfo->references->data);
++			}
++			break;
+ 		case H_IN_REPLY_TO:
+ 			if (!reference) {
+ 				eliminate_parenthesis(hp, '(', ')');
+Index: trunk/src/procmsg.c
+===================================================================
+--- trunk/src/procmsg.c	(revision 107)
++++ trunk/src/procmsg.c	(working copy)
+@@ -201,7 +201,9 @@
+ 	MsgFlags default_flags;
+ 	gchar file_buf[BUFFSIZE];
+ 	guint32 num;
++	gint refnum;
+ 	FolderType type;
++	gchar *ref;
+ 
+ 	g_return_val_if_fail(item != NULL, NULL);
+ 	g_return_val_if_fail(item->folder != NULL, NULL);
+@@ -257,6 +259,13 @@
+ 		READ_CACHE_DATA(msginfo->msgid, fp);
+ 		READ_CACHE_DATA(msginfo->inreplyto, fp);
+ 
++		READ_CACHE_DATA_INT(refnum, fp);
++		for (; refnum != 0; refnum--) {
++			READ_CACHE_DATA(ref, fp);
++			msginfo->references = g_slist_append
++				(msginfo->references, ref);
++		}
++
+ 		MSG_SET_PERM_FLAGS(msginfo->flags, default_flags.perm_flags);
+ 		MSG_SET_TMP_FLAGS(msginfo->flags, default_flags.tmp_flags);
+ 
+@@ -443,6 +452,7 @@
+ void procmsg_write_cache(MsgInfo *msginfo, FILE *fp)
+ {
+ 	MsgTmpFlags flags = msginfo->flags.tmp_flags & MSG_CACHED_FLAG_MASK;
++	GSList *refs;
+ 
+ 	WRITE_CACHE_DATA_INT(msginfo->msgnum, fp);
+ 	WRITE_CACHE_DATA_INT(msginfo->size, fp);
+@@ -459,6 +469,11 @@
+ 	WRITE_CACHE_DATA(msginfo->subject, fp);
+ 	WRITE_CACHE_DATA(msginfo->msgid, fp);
+ 	WRITE_CACHE_DATA(msginfo->inreplyto, fp);
++ 
++ 	WRITE_CACHE_DATA_INT(g_slist_length(msginfo->references), fp);
++ 	if (g_slist_length(msginfo->references))
++ 		for (refs = msginfo->references; refs; refs = refs->next) 
++ 			WRITE_CACHE_DATA(((gchar *)refs->data), fp);
+ }
+ 
+ void procmsg_write_flags(MsgInfo *msginfo, FILE *fp)
+@@ -752,6 +767,7 @@
+ 	GHashTable *table;
+ 	MsgInfo *msginfo;
+ 	const gchar *msgid;
++	GSList *reflist;
+ 
+ 	root = g_node_new(NULL);
+ 	table = g_hash_table_new(g_str_hash, g_str_equal);
+@@ -762,7 +778,16 @@
+ 
+ 		if (msginfo->inreplyto) {
+ 			parent = g_hash_table_lookup(table, msginfo->inreplyto);
+-			if (parent == NULL)
++			
++			/* check references */			
++			if (!parent && msginfo->references)
++				for (reflist = msginfo->references; 
++				     reflist != NULL; 
++				     reflist = reflist->next)
++					if ((parent = g_hash_table_lookup
++						(table, reflist->data))) 
++						break;
++			if (parent == NULL) 
+ 				parent = root;
+ 		}
+ 		node = g_node_insert_data_before
+@@ -777,16 +802,28 @@
+ 	for (node = root->children; node != NULL; ) {
+ 		next = node->next;
+ 		msginfo = (MsgInfo *)node->data;
+-		if (msginfo->inreplyto) {
++		parent = NULL;
++
++		/* check in reply to */
++		if (msginfo->inreplyto)
+ 			parent = g_hash_table_lookup(table, msginfo->inreplyto);
+-			/* node should not be the parent, and node should not
+-			   be an ancestor of parent (circular reference) */
+-			if (parent && parent != node &&
+-			    !g_node_is_ancestor(node, parent)) {
+-				g_node_unlink(node);
+-				g_node_insert_before
+-					(parent, parent->children, node);
+-			}
++
++		/* check references */			
++		if (!parent && msginfo->references)
++			for (reflist = msginfo->references; 
++			     reflist != NULL; 
++			     reflist = reflist->next)
++				if ((parent = g_hash_table_lookup
++					(table, reflist->data))) 
++					break;
++		
++		/* node should not be the parent, and node should not
++		   be an ancestor of parent (circular reference) */
++		if (parent && parent != node &&
++		    !g_node_is_ancestor(node, parent)) {
++			g_node_unlink(node);
++			g_node_insert_before
++				(parent, parent->children, node);
+ 		}
+ 		node = next;
+ 	}
+@@ -1419,10 +1456,19 @@
+ 	return full_msginfo;
+ }
+ 
++static void free_references(gpointer data, gpointer user)
++{
++	g_free(data);
++}
++
+ void procmsg_msginfo_free(MsgInfo *msginfo)
+ {
+ 	if (msginfo == NULL) return;
+ 
++	g_slist_foreach(msginfo->references, 
++		       free_references, NULL);
++	g_slist_free(msginfo->references);
++
+ 	g_free(msginfo->xface);
+ 
+ 	g_free(msginfo->fromname);
+Index: trunk/src/procmsg.h
+===================================================================
+--- trunk/src/procmsg.h	(revision 107)
++++ trunk/src/procmsg.h	(working copy)
+@@ -180,6 +180,7 @@
+ 	gchar *subject;
+ 	gchar *msgid;
+ 	gchar *inreplyto;
++	GSList *references;
+ 
+ 	FolderItem *folder;
+ 	FolderItem *to_folder;
+Index: trunk/src/summaryview.c
+===================================================================
+--- trunk/src/summaryview.c	(revision 107)
++++ trunk/src/summaryview.c	(working copy)
+@@ -3033,6 +3033,7 @@
+ 	GtkCTreeNode *next;
+ 	GtkCTreeNode *parent;
+ 	MsgInfo *msginfo;
++	GSList *reflist;
+ 
+ 	summary_lock(summaryview);
+ 
+@@ -3053,6 +3054,17 @@
+ 		if (msginfo && msginfo->inreplyto) {
+ 			parent = g_hash_table_lookup(summaryview->msgid_table,
+ 						     msginfo->inreplyto);
++						     
++			/* check references */			
++			if (!parent && msginfo->references)
++				for (reflist = msginfo->references; 
++				     reflist != NULL; 
++				     reflist = reflist->next)
++					if ((parent = g_hash_table_lookup
++						(summaryview->msgid_table, 
++						 reflist->data))) 
++						break;
++						
+ 			if (parent && parent != node) {
+ 				gtk_ctree_move(ctree, node, parent, NULL);
+ 				gtk_ctree_expand(ctree, node);
+Index: trunk/src/defs.h
+===================================================================
+--- trunk/src/defs.h	(revision 107)
++++ trunk/src/defs.h	(working copy)
+@@ -63,7 +63,7 @@
+ #define FOLDER_LIST		"folderlist.xml"
+ #define CACHE_FILE		".sylpheed_cache"
+ #define MARK_FILE		".sylpheed_mark"
+-#define CACHE_VERSION		0x20
++#define CACHE_VERSION		0x1024
+ #define MARK_VERSION		2
+ 
+ #define DEFAULT_SIGNATURE	".signature"
+@@ -105,4 +105,7 @@
+ 
+ #define DEFAULT_MESSAGE_FONT	"Sans 14"
+ 
++#undef CACHE_VERSION
++#define CACHE_VERSION			0x1024
++
+ #endif /* __DEFS_H__ */
+
diff --git a/mail-client/sylpheed/sylpheed-1.9.2.ebuild b/mail-client/sylpheed/sylpheed-1.9.2.ebuild
new file mode 100644
index 000000000000..fa2b7fcfdb0d
--- /dev/null
+++ b/mail-client/sylpheed/sylpheed-1.9.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-1.9.2.ebuild,v 1.1 2005/02/18 09:58:28 hattya Exp $
+
+inherit eutils
+
+IUSE="crypt gnome ipv6 ldap nls pda ssl xface"
+
+DESCRIPTION="A lightweight email client and newsreader"
+HOMEPAGE="http://sylpheed.good-day.net/"
+SRC_URI="http://sylpheed.good-day.net/${PN}/v${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+SLOT="0"
+
+PROVIDE="virtual/sylpheed"
+
+DEPEND=">=x11-libs/gtk+-2.2
+	!amd64? ( nls? ( >=sys-devel/gettext-0.12.1 ) )
+	crypt? ( >=app-crypt/gpgme-0.4.5 )
+	ldap? ( >=net-nds/openldap-2.0.11 )
+	pda? ( app-pda/jpilot )
+	ssl? ( dev-libs/openssl )
+	xface? ( >=media-libs/compface-1.4 )"
+RDEPEND="${DEPEND}
+	app-misc/mime-types
+	x11-misc/shared-mime-info"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-namespace.diff
+	epatch ${FILESDIR}/${PN}-procmime.diff
+	epatch ${FILESDIR}/${P}-references.diff
+
+}
+
+src_compile() {
+
+	econf \
+		`use_enable nls` \
+		`use_enable ssl` \
+		`use_enable crypt gpgme` \
+		`use_enable pda jpilot` \
+		`use_enable ldap` \
+		`use_enable ipv6` \
+		`use_enable xface compface` \
+		|| die
+
+	emake || die
+
+}
+
+src_install() {
+
+	einstall
+
+	dodir /usr/share/pixmaps
+	insinto /usr/share/pixmaps
+	doins *.png
+
+	if use gnome
+	then
+		dodir /usr/share/gnome/apps/Internet
+		insinto /usr/share/gnome/apps/Internet
+		doins sylpheed.desktop
+	fi
+
+	dodoc [A-Z][A-Z]* ChangeLog*
+
+}