Fix imap messages reappearing after moving/deleting them, bug #392665 by Wayne and Gilles Dartiguelongue.

Package-Manager: portage-2.1.10.46/cvs/Linux x86_64

4 files changed, 247 insertions, 2 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 2d96199f9d81..4f3e9885ef03 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.324 2012/02/01 02:57:25 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.325 2012/02/12 17:25:02 pacho Exp $
+
+*evolution-data-server-2.32.3-r2 (12 Feb 2012)
+
+  12 Feb 2012; Pacho Ramos <pacho@gentoo.org>
+  +evolution-data-server-2.32.3-r2.ebuild,
+  +files/evolution-data-server-2.32.3-imap-move.patch:
+  Fix imap messages reappearing after moving/deleting them, bug #392665 by Wayne
+  and Gilles Dartiguelongue.
 
   01 Feb 2012; Mart Raudsepp <leio@gentoo.org>
   -files/evolution-data-server-2.32.1-libgdata07.patch,
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 39d7098cb60c..21e79f2a7f6b 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX calentry.schema 3661 RMD160 68dfc3a8bbf08a1cf2713727c6617b2de613cb7c SHA1 06ddcc64c3b2b3230fbbef21a7e2a682bd95788c SHA256 107d60463833d5ceb5f752335dd07fef303093c58a51fb03405fed5837999431
 AUX e-d-s-camel-skip-failing-test.patch 660 RMD160 0907bb916a124d689f1880016eb8013971944016 SHA1 7ef6fd67bddbba16b3c6dd24a9b50ea9f8f5aa86 SHA256 f89f7635e9a5ddc2aa2f713a6d7eb9322f3416f8f9ad1cba1a113f65a1eaacb5
 AUX evolution-data-server-2.31-gentoo_etc_services.patch 1350 RMD160 a2fe65e31e3dad58fd5aef1e9bf7cdd02b540f8c SHA1 aef1a5fc05262c1049306c50a5c91ad9111f9b22 SHA256 1dae07ed5cb124c2da6e0d28f4e64555b6fb2bc012ceee3506f0af6e3e41102a
+AUX evolution-data-server-2.32.3-imap-move.patch 2647 RMD160 4d337e7ffad413ed8c3357e45fca18009cd0a60a SHA1 6cd6f0499ae9f8eb002ce7e68799a0b801ea87d2 SHA256 8effa465fc2913f22f030d66f9726a6e9dcf327f7abbf1774b1bfb9f4cc1c40f
 AUX evolution-data-server-3.2.2-g_thread_init.patch 5340 RMD160 e817ddd6680eff219efa08e9960461c9a213ac7b SHA1 fdeb1f6ab96e9e94ae4301666353eeddaf644a01 SHA256 9587183cc7ca99a50ffd26236dee333e82954c07047fc1738f0f895963476328
 AUX evolution-data-server-3.2.2-gmodule-explicit.patch 2035 RMD160 22b11fd2e4888d791aee754f7af358bb63433c05 SHA1 bed3401a4cd6084d235bdd37cde6624da117763f SHA256 2930f89bb6b0863150844fa827fbaff9d189d33d48f618f13cc7d92d10e0690e
 AUX fix_relink_command.pl 4074 RMD160 517048bd503d3c0cd5a37db6fb50d37f67f66ac5 SHA1 efc9936fb8a0a67711c7e9949df87a6bb3fe0344 SHA256 f6da0e687f7e64eab82671def4b7445602d1bf64e9b56c3c188d43fadc7dabc2
@@ -8,6 +12,14 @@ DIST evolution-data-server-2.32.3-patches.tar.xz 24072 RMD160 2508b5b101f59bb383
 DIST evolution-data-server-2.32.3.tar.bz2 4322281 RMD160 adc8b07aef41a89d16fc426541c12190a3688b8f SHA1 cbf32c3438c4f1650b35b87007a337ebc1c56cec SHA256 744026a745b711b3e393b61fed21c4926d1b10a3aa7da64f4b33a3e3bf5b085c
 DIST evolution-data-server-3.2.3.tar.xz 3729592 RMD160 9c352af61ff65592dd40928bbdb9ce0cf262046c SHA1 b96936bbeae52eb35113003f7d4e96f09a4fef25 SHA256 8760814491fa1ecf8806b31231b30c5f20169790abdc6b78a2faa194fde3987c
 EBUILD evolution-data-server-2.32.3-r1.ebuild 4679 RMD160 98d6e8724787c5ce4a4bcc5a5f460d8207fc7659 SHA1 d220e447812971ef2250432bb28c4289232f4caa SHA256 26ae4496ffac82ce37101706a9cfc588500d812cc7fa9f03914f4b8b40c7ba11
+EBUILD evolution-data-server-2.32.3-r2.ebuild 4793 RMD160 589f9bce3e44ec6bd6bf42ffc055b2bd9438c879 SHA1 349060e8bd60f4a3bc0fc189701ad0f8fd34cad0 SHA256 05a9883c9782658e24f8913e460e2010af0ea7170de12a9676612c86844eb3a5
 EBUILD evolution-data-server-3.2.3.ebuild 4222 RMD160 e0a496168623b3b72bc1efa74e813630e4d53835 SHA1 7820829731971e1d7205731c00cf3762de4fd2db SHA256 3a8f14dc83fe445965d39e7266976b3a57cb94b01e287d445a5b7ff8f78cc285
-MISC ChangeLog 63430 RMD160 6977b37af20e3f5b254260a18c16d8911f9b58c6 SHA1 dfe0da1db3dfd85204d7684990a61d96726834d9 SHA256 4ff1d0771b219c4bf8d2bc5a2464e1a56b213b51f78e699325a173bb6671173b
+MISC ChangeLog 63734 RMD160 24dddeafa0f4bea46f3307c2f28f93f39078f3bf SHA1 c49f5d76834065607944c43cbc0e589146fb7269 SHA256 0dcbaddde8d0da6ca41495ce0561cfbc3c9c985b153a583984a104c0947a8a60
 MISC metadata.xml 535 RMD160 206f4b4067eab119530224247177d5f8ca6c97e2 SHA1 21a9ce92639d7c5aed6b189eca4f40b00b97778b SHA256 f458f1517ae769596f0dab7860b2789867e773eb32ad7cc00279dc7e2e82d64c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk839fUACgkQCaWpQKGI+9SeMQCfZ9dmAvtFDqN9YuljBwwPqMlu
+eBYAniMdY6es5Zhek9tUCe6SMwTQqx5Z
+=GJKQ
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild
new file mode 100644
index 000000000000..5ce31b8fb045
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild,v 1.1 2012/02/12 17:25:02 pacho Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit autotools db-use eutils flag-o-matic gnome2 versionator virtualx
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="http://projects.gnome.org/evolution/"
+
+SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.xz"
+
+LICENSE="LGPL-2 BSD DB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
+
+IUSE="doc ipv6 kerberos gnome-keyring ldap +weather"
+
+RDEPEND=">=dev-libs/glib-2.25.12:2
+	>=x11-libs/gtk+-2.24:2
+	>=gnome-base/gconf-2
+	>=dev-db/sqlite-3.5
+	>=dev-libs/libgdata-0.6.3
+	>=dev-libs/libical-0.43
+	>=net-libs/libsoup-2.4:2.4
+	>=dev-libs/libxml2-2
+	>=sys-libs/db-4
+	sys-libs/zlib
+	virtual/libiconv
+	>=dev-libs/nspr-4.4
+	>=dev-libs/nss-3.9
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-2 )
+	weather? (
+		>=dev-libs/libgweather-2.25.4:2
+		<dev-libs/libgweather-2.91:2 )
+"
+DEPEND="${RDEPEND}
+	dev-util/gperf
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35.5
+	sys-devel/bison
+	>=gnome-base/gnome-common-2
+	>=dev-util/gtk-doc-am-1.9
+	doc? ( >=dev-util/gtk-doc-1.9 )"
+# eautoreconf needs:
+#	>=gnome-base/gnome-common-2
+#	>=dev-util/gtk-doc-am-1.9
+
+pkg_setup() {
+	DOCS="ChangeLog MAINTAINERS NEWS TODO"
+
+	# ssl stuff always enabled as recommended in upstream bug #642984
+	G2CONF="${G2CONF}
+		$(use_enable gnome-keyring)
+		$(use_enable ipv6)
+		$(use_with kerberos krb5 /usr)
+		$(use_with ldap openldap)
+		$(use_with weather)
+		--disable-gtk3
+		--enable-largefile
+		--with-libdb=/usr
+		--enable-ssl
+		--enable-smime"
+
+}
+
+src_prepare() {
+	# Adjust to gentoo's /etc/service
+	epatch "${FILESDIR}/${PN}-2.31-gentoo_etc_services.patch"
+
+	# GNOME bug 611353 (skips failing test atm)
+	epatch "${FILESDIR}/e-d-s-camel-skip-failing-test.patch"
+
+	# GNOME bug 621763 (skip failing test-ebook-stress-factory--fifo)
+	sed -e 's/\(SUBDIRS =.*\)ebook/\1/' \
+		-i addressbook/tests/Makefile.{am,in} \
+		|| die "failing test sed 1 failed"
+
+	# Apply multiple backports and fixed from master and 2.32 branches
+	#
+	# 009 and 010 patches are broken, bug #372651
+	rm "${WORKDIR}/${P}-patches"/009*.patch || die
+	rm "${WORKDIR}/${P}-patches"/010*.patch || die
+	epatch "${WORKDIR}/${P}-patches"/*.patch
+
+	# Upstream bug #655167 - Messages moved from IMAP Inbox reappear
+	epatch "${FILESDIR}/${P}-imap-move.patch"
+
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	append-cppflags "-I$(db_includedir)"
+
+	# FIXME: Fix compilation flags crazyness
+	sed 's/^\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
+		-i configure.ac configure || die "sed 3 failed"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_install() {
+	# Prevent this evolution-data-server from linking to libs in the installed
+	# evolution-data-server libraries by adding -L arguments for build dirs to
+	# every .la file's relink_command field, forcing libtool to look there
+	# first during relinking. This will mangle the .la files installed by
+	# make install, but we don't care because we will be punting them anyway.
+	perl "${FILESDIR}/fix_relink_command.pl" . \
+		|| die "fix_relink_command.pl failed"
+
+	gnome2_src_install
+
+	if use ldap; then
+		MY_MAJORV=$(get_version_component_range 1-2)
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/calentry.schema || die "doins failed"
+		dosym /usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+	fi
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	unset ORBIT_SOCKETDIR
+	unset SESSION_MANAGER
+	export XDG_DATA_HOME="${T}"
+	unset DISPLAY
+	Xemake check || die "Tests failed."
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	for lib in libcamel-provider-1.2.so.14 libedata-cal-1.2.so.7 \
+		libgdata-1.2.so libgdata-google-1.2.so libcamel-1.2.so.14 \
+		libedata-book-1.2.so.2 libebook-1.2.so.9 \
+		libedataserver-1.2.so.13 libecal-1.2.so.7 libedataserverui-1.2.so.8
+	do
+		preserve_old_lib /usr/$(get_libdir)/$lib
+	done
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	for lib in libcamel-provider-1.2.so.14 libedata-cal-1.2.so.7 \
+		libgdata-1.2.so libgdata-google-1.2.so libcamel-1.2.so.14 \
+		libedata-book-1.2.so.2 libebook-1.2.so.9 \
+		libedataserver-1.2.so.13 libecal-1.2.so.7 libedataserverui-1.2.so.8
+	do
+		preserve_old_lib_notify /usr/$(get_libdir)/$lib
+	done
+
+	if use ldap; then
+		elog ""
+		elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema"
+	fi
+}
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-imap-move.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-imap-move.patch
new file mode 100644
index 000000000000..1fd7830dd720
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-imap-move.patch
@@ -0,0 +1,62 @@
+From 3ac86d14dc1ea89424de3c83e4d4b21eb1d1020e Mon Sep 17 00:00:00 2001
+From: Michel Dänzer <daenzer@debian.org>
+Date: Wed, 02 Nov 2011 07:35:56 +0000
+Subject: Bug #655167 - Messages moved from IMAP Inbox reappear
+
+---
+diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
+index 77faa64..751e6cd 100644
+--- a/camel/providers/imap/camel-imap-folder.c
++++ b/camel/providers/imap/camel-imap-folder.c
+@@ -68,11 +68,6 @@ enum {
+ 	PROP_CHECK_FOLDER = 0x2500
+ };
+ 
+-enum {
+-	/* used when moving messages and has real trash folder set with a google account */
+-	CAMEL_MESSAGE_IMAP_MOVED = CAMEL_MESSAGE_FOLDER_FLAGGED << 1
+-};
+-
+ extern gint camel_application_is_exiting;
+ 
+ static gboolean imap_rescan (CamelFolder *folder, gint exists, GCancellable *cancellable, GError **error);
+@@ -1417,7 +1412,7 @@ get_matching (CamelFolder *folder,
+ 			}
+ 		}
+ 
+-		if (deleted_uids && (info->info.flags & (CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_IMAP_MOVED)) == CAMEL_MESSAGE_DELETED) {
++		if (deleted_uids && (info->info.flags & (CAMEL_MESSAGE_DELETED | CAMEL_IMAP_MESSAGE_MOVED)) == CAMEL_MESSAGE_DELETED) {
+ 			g_ptr_array_add (deleted_uids, (gpointer) camel_pstring_strdup (camel_message_info_uid (info)));
+ 			info->info.flags &= ~CAMEL_MESSAGE_DELETED;
+ 		} else if (junked_uids && (info->info.flags & CAMEL_MESSAGE_JUNK) != 0) {
+@@ -1747,7 +1742,7 @@ imap_synchronize_sync (CamelFolder *folder,
+ 					info->info.flags &= ~CAMEL_MESSAGE_DELETED;
+ 				}
+ 
+-				info->info.flags &= ~(CAMEL_MESSAGE_FOLDER_FLAGGED | CAMEL_MESSAGE_IMAP_MOVED);
++				info->info.flags &= ~(CAMEL_MESSAGE_FOLDER_FLAGGED | CAMEL_IMAP_MESSAGE_MOVED);
+ 				((CamelImapMessageInfo *) info)->server_flags =	info->info.flags & CAMEL_IMAP_SERVER_FLAGS;
+ 				info->info.dirty = TRUE; /* Sync it back to the DB */
+ 				if (((CamelMessageInfo *) info)->summary)
+@@ -2841,7 +2836,7 @@ do_copy (CamelFolder *source,
+ 					CamelMessageInfoBase *info = (CamelMessageInfoBase *) camel_folder_summary_get (source->summary, uids->pdata[i]);
+ 
+ 					if (info)
+-						info->flags |= CAMEL_MESSAGE_IMAP_MOVED;
++						info->flags |= CAMEL_IMAP_MESSAGE_MOVED;
+ 				}
+ 			}
+ 			last = uid;
+--- a/camel/providers/imap/camel-imap-summary.h~	2011-04-21 21:35:36.000000000 +0200
++++ b/camel/providers/imap/camel-imap-summary.h	2012-02-12 18:15:16.419609530 +0100
+@@ -53,7 +53,9 @@
+ G_BEGIN_DECLS
+ 
+ enum {
+-	CAMEL_IMAP_MESSAGE_RECENT = 1<<17
++	CAMEL_IMAP_MESSAGE_RECENT = 1 << 17,
++	/* used when moving messages and has real trash folder set with a google account */
++        CAMEL_IMAP_MESSAGE_MOVED = 1 << 18
+ };
+ 
+ typedef struct _CamelImapSummary CamelImapSummary;