Fix crash with multiple image attachments; bug #163372

(Portage version: 2.1.2-r5)

4 files changed, 248 insertions, 1 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index e020f87f70df..ce3e99199b67 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/evolution
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.159 2007/01/21 21:47:51 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.160 2007/01/30 19:05:05 dang Exp $
+
+*evolution-2.8.2.1-r1 (30 Jan 2007)
+
+  30 Jan 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/evolution-2.8.2.1-sig-handlers.patch, +evolution-2.8.2.1-r1.ebuild:
+  Fix crash with multiple image attachments; bug #163372
 
   21 Jan 2007; Bryan Østergaard <kloeri@gentoo.org>
   evolution-2.8.2.1.ebuild:
diff --git a/mail-client/evolution/evolution-2.8.2.1-r1.ebuild b/mail-client/evolution/evolution-2.8.2.1-r1.ebuild
new file mode 100644
index 000000000000..24a2edeebbed
--- /dev/null
+++ b/mail-client/evolution/evolution-2.8.2.1-r1.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.8.2.1-r1.ebuild,v 1.1 2007/01/30 19:05:05 dang Exp $
+
+inherit eutils flag-o-matic alternatives gnome2 autotools
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="http://www.gnome.org/projects/evolution/"
+SRC_URI="${SRC_URI}
+	bogofilter? ( mirror://gentoo/${PN}-2.5.5.1-bf-junk.tar.bz2 )"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+# gstreamer for audio-inline, when it uses 0.10
+IUSE="bogofilter crypt dbus debug doc hal ipv6 kerberos krb4 ldap mono nntp pda profile spell ssl"
+
+# Pango dependency required to avoid font rendering problems
+RDEPEND=">=x11-themes/gnome-icon-theme-1.2
+	dev-libs/atk
+	>=gnome-extra/gtkhtml-3.9.90
+	>=dev-libs/glib-2.10
+	>=gnome-base/orbit-2.9.8
+	>=gnome-base/libbonobo-2
+	>=gnome-extra/evolution-data-server-1.7.90
+	>=gnome-base/libbonoboui-2.4.2
+	>=gnome-base/gnome-vfs-2.4
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnomecanvas-2
+	>=dev-libs/libxml2-2
+	>=gnome-base/gconf-2
+	>=gnome-base/libgnomeprint-2.7
+	>=gnome-base/libgnomeprintui-2.2.1
+	>=x11-libs/gtk+-2
+	>=gnome-base/libgnome-2
+	>=net-libs/libsoup-2.2.96
+	>=x11-libs/pango-1.8.1
+	x11-libs/libnotify
+	hal? ( >=sys-apps/hal-0.5.4 )
+	pda? (
+		>=app-pda/gnome-pilot-2
+		>=app-pda/gnome-pilot-conduits-2 )
+	spell? ( >=app-text/gnome-spell-1.0.5 )
+	crypt? ( >=app-crypt/gnupg-1.2.2 )
+	ssl? (
+		>=dev-libs/nspr-4.6.1
+		>=dev-libs/nss-3.11 )
+	ldap? ( >=net-nds/openldap-2 )
+	kerberos? ( virtual/krb5 )
+	krb4? ( virtual/krb5 )
+	dbus? ( || (
+		dev-libs/dbus-glib
+		~sys-apps/dbus-0.62 ) )
+	mono? ( >=dev-lang/mono-1 )
+	bogofilter? ( mail-filter/bogofilter )
+	!bogofilter? ( mail-filter/spamassassin )"
+#	gstreamer? (
+#		>=media-libs/gstreamer-0.10
+#		>=media-libs/gst-plugins-base-0.10 )
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	sys-devel/bison
+	app-text/scrollkeeper
+	>=gnome-base/gnome-common-2.12.0
+	doc? ( >=dev-util/gtk-doc-0.6 )"
+
+DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
+ELTCONF="--reverse-deps"
+
+
+pkg_setup() {
+	G2CONF="--disable-default-binary \
+		--without-kde-applnk-path        \
+		$(use_enable ssl nss)            \
+		$(use_enable ssl smime)          \
+		$(use_enable ipv6)               \
+		$(use_enable mono)               \
+		$(use_enable nntp)               \
+		$(use_enable pda pilot-conduits) \
+		$(use_enable profile profiling)  \
+		$(use_with ldap openldap)        \
+		$(use_with kerberos krb5 /usr)"
+
+	if use krb4 && ! built_with_use virtual/krb5 krb4; then
+		ewarn
+		ewarn "In order to add kerberos 4 support, you have to emerge"
+		ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well."
+		ewarn
+		ewarn "Skipping for now."
+		ewarn
+		G2CONF="${G2CONF} --without-krb4"
+	else
+		G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)"
+	fi
+
+	# Plug-ins to install. Normally we would want something similar to
+	# --enable-plugins=all (plugins_base + plugins_standard), except for some
+	# special cases.
+	local plugins="calendar-file calendar-http calendar-weather \
+		itip-formatter plugin-manager default-source addressbook-file \
+		startup-wizard print-message mark-all-read groupwise-features \
+		groupwise-account-setup hula-account-setup mail-account-disable \
+		publish-calendar caldav \
+		bbdb subject-thread save-calendar select-one-source copy-tool \
+		mail-to-task mark-calendar-offline mailing-list-actions \
+		new-mail-notify default-mailer import-ics-attachments"
+
+	# For dev releases, add experimental plugins
+	plugins="${plugins} backup-restore folder-unsubscribe mail-to-meeting \
+		prefer-plain save-attachments"
+
+	if use bogofilter; then
+		plugins="${plugins} bf-junk-plugin"
+	else
+		plugins="${plugins} sa-junk-plugin"
+	fi
+
+	# The special cases
+
+	# remove this due to bug #128035 re-enable later if it doesn't dep on
+	# gstreamer-0.8
+	# use gstreamer && plugins="${plugins} audio-inline"
+	use dbus && plugins="${plugins} new-mail-notify"
+	use mono && plugins="${plugins} mono"
+
+	if built_with_use gnome-extra/evolution-data-server ldap; then
+		plugins="${plugins} exchange-operations"
+	fi
+
+	local pluginlist=""
+	for p in $plugins; do
+		[ "x$pluginlist" != "x" ] && pluginlist="${pluginlist},"
+		pluginlist="${pluginlist}${p}"
+	done
+
+	G2CONF="${G2CONF} --enable-plugins=${pluginlist}"
+}
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	cd "${S}"
+
+	gnome2_omf_fix help/omf.make
+
+	# Accept the list of plugins separated by commas instead of spaces.
+	epatch ${FILESDIR}/${PN}-2.3.7-configure_plugins.patch
+
+	# Move evo to URI-based saving
+	epatch ${FILESDIR}/${PN}-2.8.0-uri.patch.gz
+
+	# Fix 64-bit warnings
+	epatch ${FILESDIR}/${PN}-2.8.1.1-64-bit.patch
+
+	# Fix two images in preview crash; bug #163372
+	epatch "${FILESDIR}"/${P}-sig-handlers.patch
+
+	# Add bogofilter junk plugin source
+	use bogofilter && epatch ${FILESDIR}/${PN}-2.8.2.1-bf-junk.patch.gz
+
+
+	eaclocal || die
+	_elibtoolize --copy --force || die
+	eautoheader || die
+	eautomake || die
+	intltoolize --force || die
+	eautoconf || die
+}
+
+src_compile() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	if use ssl ; then
+		sed -i -e "s|mozilla-nss|nss|
+			s|mozilla-nspr|nspr|" ${S}/configure
+		G2CONF="${G2CONF} --enable-nss=yes"
+	else
+		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
+			--without-nss-libs --without-nss-includes"
+	fi
+
+	# problems with -O3 on gcc-3.3.1
+	replace-flags -O3 -O2
+
+	if [ "${ARCH}" = "hppa" ]; then
+		append-flags "-fPIC -ffunction-sections"
+		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
+	fi
+
+	gnome2_src_compile
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	alternatives_auto_makesym "/usr/bin/evolution" "/usr/bin/evolution-[0-9].[0-9]"
+	einfo "To change the default browser if you are not using GNOME, do:"
+	einfo "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
+	einfo "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
+	einfo ""
+	einfo "Replace 'mozilla %s' with which ever browser you use."
+}
diff --git a/mail-client/evolution/files/digest-evolution-2.8.2.1-r1 b/mail-client/evolution/files/digest-evolution-2.8.2.1-r1
new file mode 100644
index 000000000000..645792cdb704
--- /dev/null
+++ b/mail-client/evolution/files/digest-evolution-2.8.2.1-r1
@@ -0,0 +1,6 @@
+MD5 31456188591167083628df719adc8f22 evolution-2.5.5.1-bf-junk.tar.bz2 10771
+RMD160 7ae764761607d50024fbec32680bc57e04ac7879 evolution-2.5.5.1-bf-junk.tar.bz2 10771
+SHA256 b8988b28836a201606d8fa651f48722ebac8c984dcc171f7f7a3b860d0f7a045 evolution-2.5.5.1-bf-junk.tar.bz2 10771
+MD5 3c860b732d4087843da4bbf5fc8f03b6 evolution-2.8.2.1.tar.bz2 12921518
+RMD160 9198236aded4c8b905eb990b725d01d399308491 evolution-2.8.2.1.tar.bz2 12921518
+SHA256 4fb4b7b987a8e0677b270b44d567e7821007f2b1c4af236c66d81f35a5b4c144 evolution-2.8.2.1.tar.bz2 12921518
diff --git a/mail-client/evolution/files/evolution-2.8.2.1-sig-handlers.patch b/mail-client/evolution/files/evolution-2.8.2.1-sig-handlers.patch
new file mode 100644
index 000000000000..5945f92506f0
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.8.2.1-sig-handlers.patch
@@ -0,0 +1,31 @@
+diff --exclude-from=/home/dang/.diffrc -up -ruN evolution-2.8.2.1.orig/mail/em-format-html-display.c evolution-2.8.2.1/mail/em-format-html-display.c
+--- evolution-2.8.2.1.orig/mail/em-format-html-display.c	2006-10-16 08:38:58.000000000 -0400
++++ evolution-2.8.2.1/mail/em-format-html-display.c	2007-01-29 12:48:30.000000000 -0500
+@@ -181,6 +181,7 @@ struct _attach_puri {
+ 	int fit_width;
+ 	int fit_height;
+ 	GtkImage *image;
++	GtkWidget *event_box;
+ 
+ 	/* Signed / Encrypted */
+         camel_cipher_validity_sign_t sign;
+@@ -1689,6 +1690,11 @@ efhd_image_unallocate (struct _EMFormatP
+ {
+ 	struct _attach_puri *info = (struct _attach_puri *) puri;
+ 	g_signal_handlers_disconnect_by_func(info->html, efhd_image_resized, info);
++
++	g_signal_handlers_disconnect_by_func(info->event_box, efhd_image_popup, info);
++	g_signal_handlers_disconnect_by_func(info->event_box, efhd_change_cursor, info);
++	g_signal_handlers_disconnect_by_func(info->event_box, efhd_attachment_popup_menu, info);
++	g_signal_handlers_disconnect_by_func(info->event_box, efhd_image_fit_width, info);
+ }
+ 
+ static gboolean
+@@ -1721,6 +1727,7 @@ efhd_attachment_image(EMFormatHTML *efh,
+ 	}
+ 
+ 	box = gtk_event_box_new();
++	info->event_box = box;
+ 	gtk_container_add((GtkContainer *)box, (GtkWidget *)info->image);
+ 	gtk_widget_show_all(box);
+ 	gtk_container_add((GtkContainer *)eb, box);