Revision bump fixing compilation with --disable-smime (bug #356471 by mymybib), work with new mime handler from glib-2.28, apply multiple patches from master fixing many bugs.

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

5 files changed, 420 insertions, 2 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index fa48433b48e9..54ca9be2a611 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.333 2011/03/22 19:34:47 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.334 2011/03/27 20:36:45 pacho Exp $
+
+*evolution-2.32.2-r2 (27 Mar 2011)
+
+  27 Mar 2011; Pacho Ramos <pacho@gentoo.org> +evolution-2.32.2-r2.ebuild,
+  +files/evolution-2.32.2-mime-handler.patch,
+  +files/evolution-2.32.2-smime-fix.patch:
+  Revision bump fixing compilation with --disable-smime (bug #356471 by
+  mymybib), work with new mime handler from glib-2.28, apply multiple patches
+  from master fixing many bugs.
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> evolution-2.32.2.ebuild:
   Marking evolution-2.32.2 ppc stable for bug 353436
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 9f74a30731b0..b6d36ae309f0 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,12 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX evolution-2.30.1.2-configure.patch 1243 RMD160 f7cefb76592fff6e2fba441993b546b8c9a30ca6 SHA1 6ca2073ce735bf40c4ca403d695a16976a6c3360 SHA256 c757dd941f9b4798ed6c0b5c6d23517700c9c232c60aca3b6f09f2c4278885a2
 AUX evolution-2.30.3-fix-linking-issues-in-libeshell.patch 870 RMD160 12d6fe68f2c91f5be97057a2324946eb4ce90a08 SHA1 f0e4310ca1124481373fb5760b15ccbada67cc41 SHA256 4ee4ca24cd3ff8bb27b03d262b0bb4ff8953a3973f04044984beaf2804c3d07c
 AUX evolution-2.32.0-wrong-lafile-usage.patch 634 RMD160 e14b9b17faacc3590419f7f1de78cd0f76323d58 SHA1 221fbd2112d206e52e741018c7ff2a3434819d18 SHA256 79e169a86b658bbd339fe79585f908f0eee4cfeef972be0731faa742a769deb8
 AUX evolution-2.32.1-libnotify-0.7.patch 2239 RMD160 b0d8f2e830e32d9bc227978074f7e9975ae1307a SHA1 64c1f4ed1311cead4071e7543704ee8eeca4e418 SHA256 73746e65a3ba190ace8bd1e5fc9d52f6a67556fac0ba8727d7705ffe74e3ce0d
+AUX evolution-2.32.2-mime-handler.patch 4169 RMD160 8ec9bd24fcaa9cff0b2e865a85a430a3ea0856ca SHA1 e974601ec51a8e79db14520d18282af893cf89c9 SHA256 ba6db000b4c38b53462c0281146e504b7212b84a6d7f5f482b375674042ff846
+AUX evolution-2.32.2-smime-fix.patch 2444 RMD160 e3f5c36d800bd7d0578f1696efe2582eb55db123 SHA1 e4ad555a982a5cd334df95d3420404dddb334d4d SHA256 3e5fae0d34cec92f01c1e66d5fdac858f39619bfcb00f8f74231c04571892362
 DIST evolution-2.30.2-patches.tar.bz2 12728 RMD160 d8058da75675a1990aad84348a40cd3f7be21aa3 SHA1 4bbb89f10ba893ef992af5fc32aad84b2ad46d2f SHA256 f3d6dcfba9ee7c21b415d04a545902cb5a28d1bcc00e579c6cc78aeac7650a45
 DIST evolution-2.30.2.tar.bz2 32570501 RMD160 c1b5703bc241a2dee20f94e60e7c9995c8cce841 SHA1 14ddccbf33eb86c976899eccea6ae1fb565ea9ca SHA256 470d12c0de9cae2dc0275152a356150c7a57339e6feca77f43508bd7d1f04d83
+DIST evolution-2.32.2-patches.tar.bz2 11380 RMD160 af368025fe76823282e12de5c555052be33f2573 SHA1 3d7f0b153c0f9f3931ad8120b2a067ea0a72dd58 SHA256 8df00b351fe3abcebffc86efa3ebcb9ad90afaeef27d01c5e89cf5b645d620fb
 DIST evolution-2.32.2.tar.bz2 31929154 RMD160 1d68825111309600093c8d4718e1cc001635e61d SHA1 48f25fffda1ac9c209fd02162ca298df5c03b05f SHA256 1831c7f5f00b4755869cf84ef3e3f79c4705a33e0659e72b6c1ffa4a59d4a4bb
 EBUILD evolution-2.30.2-r1.ebuild 4699 RMD160 f754b3d1252458873eccaa8378dd03ba1b511d12 SHA1 722cf33b3b3248cc26d7f2556fc3ed5cf529ed47 SHA256 0698a02d00e0fe1f17443fe707e88f30cfb024a5df388bf715c2c138c409803b
 EBUILD evolution-2.32.2-r1.ebuild 5473 RMD160 9bd2bf3dad02b47f18621f7d856ad3e2e0dd7090 SHA1 17a194d2a02529a36be076a938805dfe2b2f02ba SHA256 e9f77b46d6c4b704b2934662242f8e5d2aa21ce3c5e90f95db728305e4cafb00
+EBUILD evolution-2.32.2-r2.ebuild 5858 RMD160 91aeed687900d6e8152180ec10db4b3d2edc8c5d SHA1 0cd614426409df0956a32bd5aec3ad8d408107e1 SHA256 0804b4ca30227e1a37413e5023b0a622a7dfe20d1e1e3da0e1c81b34122ebb92
 EBUILD evolution-2.32.2.ebuild 5514 RMD160 aa1f7b1ef07fe38a5cbd8b712f05abf14da2fd0c SHA1 3cca56e1cc421157cca43b0d6e2589c76dfaae33 SHA256 9ca4d7dccfb6a5033e134fa302e51b20dc398d12e9786686e5cfc26373f121c3
-MISC ChangeLog 76599 RMD160 75c3ae21d55acf02febec0e6f644368b3a3bd010 SHA1 26e6e92e903763b8350e3d9bb1b94aa74c045c23 SHA256 19cce3747b2806aee7c79132506409d521eaf8ec0e6762e2f33aa484355761a7
+MISC ChangeLog 76981 RMD160 0b81558fad81f9985cee8022b1d0489645d694e4 SHA1 6278d2d39570f895a3126541ce896c4b3f3f4fd8 SHA256 95a1460c82419afc4dc2c482767cd0c3573c4587d5ab640327b224d0fb3826af
 MISC metadata.xml 1123 RMD160 abcc4bc1f7bbc92df0e35db1b59056fe5a4d05d2 SHA1 ecc4a4f56aeb9b5d0d9ec612308d9cb1ef9f9f3d SHA256 b188965e8c8ce0823c081f8b86653e3848665eb4b0d59fee4176589b549c6911
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2Pn+MACgkQCaWpQKGI+9SuAQCdF+WZCPdBR3P/+tuDk6yB/nwm
+OfUAnAxzXIxdrIjn4SU9ChdkGqsjJj/U
+=nNPy
+-----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-2.32.2-r2.ebuild b/mail-client/evolution/evolution-2.32.2-r2.ebuild
new file mode 100644
index 000000000000..ad1a60e28fa5
--- /dev/null
+++ b/mail-client/evolution/evolution-2.32.2-r2.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.2-r2.ebuild,v 1.1 2011/03/27 20:36:45 pacho Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+PYTHON_DEPEND="python? 2:2.4"
+
+inherit autotools flag-o-matic gnome2 python versionator
+
+MY_MAJORV=$(get_version_component_range 1-2)
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="http://www.gnome.org/projects/evolution/"
+
+SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2 OPENLDAP"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="clutter connman crypt doc gstreamer kerberos ldap networkmanager python ssl"
+
+# We need a graphical pinentry frontend to be able to ask for the GPG
+# password from inside evolution, bug 160302
+PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] )"
+
+# contacts-map plugin requires libchaimplain and geoclue
+# glade-3 support is for maintainers only per configure.ac
+# mono plugin disabled as it's incompatible with 2.8 and lacks maintainance (see bgo#634571)
+# pst is not mature enough and changes API/ABI frequently
+RDEPEND=">=dev-libs/glib-2.25.12:2
+	>=x11-libs/gtk+-2.20.0:2
+	>=dev-libs/libunique-1.1.2:1
+	>=gnome-base/gnome-desktop-2.26:2
+	>=dev-libs/libgweather-2.25.3:2
+	media-libs/libcanberra[gtk]
+	>=x11-libs/libnotify-0.3
+	>=gnome-extra/evolution-data-server-${PV}[weather]
+	>=gnome-extra/gtkhtml-3.31.90:3.14
+	>=gnome-base/gconf-2:2
+	dev-libs/atk
+	>=dev-libs/libxml2-2.7.3:2
+	>=net-libs/libsoup-2.4:2.4
+	>=media-gfx/gtkimageview-1.6
+	>=x11-misc/shared-mime-info-0.22
+	>=x11-themes/gnome-icon-theme-2.30.2.1
+	>=dev-libs/libgdata-0.4
+
+	clutter? ( media-libs/clutter:1.0[gtk] )
+	connman? ( net-misc/connman )
+	crypt? ( || (
+				  ( >=app-crypt/gnupg-2.0.1-r2
+					${PINENTRY_DEPEND} )
+				  =app-crypt/gnupg-1.4* ) )
+	gstreamer? (
+		>=media-libs/gstreamer-0.10:0.10
+		>=media-libs/gst-plugins-base-0.10:0.10 )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-2 )
+	networkmanager? ( >=net-misc/networkmanager-0.7 )
+	ssl? (
+		>=dev-libs/nspr-4.6.1
+		>=dev-libs/nss-3.11 )
+
+	!<gnome-extra/evolution-exchange-2.32"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.16
+	>=dev-util/intltool-0.35.5
+	sys-devel/gettext
+	sys-devel/bison
+	app-text/scrollkeeper
+	>=app-text/gnome-doc-utils-0.9.1
+	app-text/docbook-xml-dtd:4.1.2
+	>=gnome-base/gnome-common-2.12
+	>=dev-util/gtk-doc-am-1.9
+	doc? ( >=dev-util/gtk-doc-1.9 )"
+# eautoreconf needs:
+#	>=gnome-base/gnome-common-2.12
+#	>=dev-util/gtk-doc-am-1.9
+
+pkg_setup() {
+	ELTCONF="--reverse-deps"
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
+	G2CONF="${G2CONF}
+		--without-kde-applnk-path
+		--enable-plugins=experimental
+		--enable-image-inline
+		--enable-canberra
+		--enable-weather
+		$(use_enable ssl nss)
+		$(use_enable ssl smime)
+		$(use_enable networkmanager nm)
+		$(use_enable connman)
+		$(use_enable gstreamer audio-inline)
+		--disable-profiling
+		--disable-pst-import
+		$(use_enable python)
+		$(use_with clutter)
+		$(use_with ldap openldap)
+		$(use_with kerberos krb5 /usr)
+		--disable-contacts-map
+		--without-glade-catalog
+		--disable-mono
+		--disable-gtk3"
+
+	# dang - I've changed this to do --enable-plugins=experimental.  This will
+	# autodetect new-mail-notify and exchange, but that cannot be helped for the
+	# moment.  They should be changed to depend on a --enable-<foo> like mono
+	# is.  This cleans up a ton of crap from this ebuild.
+
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	if use ssl ; then
+		G2CONF="${G2CONF} --enable-nss=yes"
+	else
+		G2CONF="${G2CONF}
+			--without-nspr-libs
+			--without-nspr-includes
+			--without-nss-libs
+			--without-nss-includes"
+	fi
+
+	# NM and connman support cannot coexist
+	if use networkmanager && use connman ; then
+		ewarn "It is not possible to enable both ConnMan and NetworkManager, disabling connman..."
+		G2CONF="${G2CONF} --disable-connman"
+	fi
+
+	python_set_active_version 2
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	epatch "${FILESDIR}"/${PN}-2.32.1-libnotify-0.7.patch
+
+	# Fix invalid use of la file in contact-editor, upstream bug #635002
+	epatch "${FILESDIR}/${PN}-2.32.0-wrong-lafile-usage.patch"
+
+	# Fix compilation with --disable-smime, bug #356471
+	epatch "${FILESDIR}/${PN}-2.32.2-smime-fix.patch"
+
+	# Fix desktop file to work with latest glib
+	epatch "${FILESDIR}/${PN}-2.32.2-mime-handler.patch"
+
+	# Apply multiple backports from master fixing important bugs
+	epatch "${WORKDIR}/${P}-patches"/*.patch
+
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	if use ssl ; then
+		sed -e 's|mozilla-nss|nss|' \
+			-e 's|mozilla-nspr|nspr|' \
+			-i configure.ac configure || die "sed 2 failed"
+	fi
+
+	# Fix compilation flags crazyness
+	sed -e 's/-D.*_DISABLE_DEPRECATED//' \
+		-i configure.ac configure || die "sed 1 failed"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+
+	find "${ED}"/usr/$(get_libdir)/evolution/${MY_MAJORV}/plugins \
+		-name "*.la" -delete || die "la files removal failed 1"
+	find "${ED}"/usr/$(get_libdir)/evolution/${MY_MAJORV}/modules \
+		-name "*.la" -delete || die "la files removal failed 2"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog "To change the default browser if you are not using GNOME, do:"
+	elog "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'firefox %s'"
+	elog "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'firefox %s'"
+	elog ""
+	elog "Replace 'firefox %s' with which ever browser you use."
+	elog ""
+	elog "Junk filters are now a run-time choice. You will get a choice of"
+	elog "bogofilter or spamassassin based on which you have installed"
+	elog ""
+	elog "You have to install one of these for the spam filtering to actually work"
+}
diff --git a/mail-client/evolution/files/evolution-2.32.2-mime-handler.patch b/mail-client/evolution/files/evolution-2.32.2-mime-handler.patch
new file mode 100644
index 000000000000..fdbda5ce3d5a
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.32.2-mime-handler.patch
@@ -0,0 +1,133 @@
+commit 61999b493fc4266300eab2907909867e73e4cc1e
+Author: Milan Crha <mcrha@redhat.com>
+Date:   Wed Oct 20 15:24:29 2010 +0200
+
+    Bug #631451 - Add handlers for x-scheme-handler/mailto
+
+diff --git a/data/evolution.desktop.in.in b/data/evolution.desktop.in.in
+index d69738e..5fdad27 100644
+--- a/data/evolution.desktop.in.in
++++ b/data/evolution.desktop.in.in
+@@ -14,4 +14,4 @@ X-GNOME-Bugzilla-Product=Evolution
+ X-GNOME-Bugzilla-Component=BugBuddyBugs
+ X-GNOME-Bugzilla-Version=@BASE_VERSION@.x
+ X-GNOME-Bugzilla-OtherBinaries=e-addressbook-factory;e-calendar-factory
+-MimeType=text/calendar;text/x-vcard;text/directory;application/mbox;message/rfc822;
++MimeType=text/calendar;text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;
+diff --git a/modules/mailto-handler/evolution-mailto-handler.c b/modules/mailto-handler/evolution-mailto-handler.c
+index 367d9166..01d1bd2 100644
+--- a/modules/mailto-handler/evolution-mailto-handler.c
++++ b/modules/mailto-handler/evolution-mailto-handler.c
+@@ -30,7 +30,9 @@
+ 	((obj), E_TYPE_MAILTO_HANDLER, EMailtoHandler))
+ 
+ #define MAILTO_COMMAND \
+-	"evolution --component=mail %s"
++	"evolution --component=mail"
++
++#define MAILTO_HANDLER "x-scheme-handler/mailto"
+ 
+ typedef struct _EMailtoHandler EMailtoHandler;
+ typedef struct _EMailtoHandlerClass EMailtoHandlerClass;
+@@ -63,13 +65,18 @@ mailto_handler_get_shell (EMailtoHandler *extension)
+ }
+ 
+ static gboolean
+-mailto_handler_is_evolution (const gchar *mailto_command)
++mailto_handler_is_evolution (/*const*/ GAppInfo *app_info)
+ {
+ 	gint argc;
+ 	gchar **argv;
+ 	gchar *basename;
+ 	gboolean is_evolution;
++	const gchar *mailto_command;
++
++	if (app_info == NULL)
++		return FALSE;
+ 
++	mailto_command = g_app_info_get_commandline (app_info);
+ 	if (mailto_command == NULL)
+ 		return FALSE;
+ 
+@@ -174,14 +181,14 @@ mailto_handler_check (EMailtoHandler *extension)
+ 	EShell *shell;
+ 	EShellSettings *shell_settings;
+ 	gboolean check_mailto_handler = TRUE;
+-	gchar *mailto_command = NULL;
++	GAppInfo *app_info = NULL;
++	GError *error = NULL;
+ 
+ 	shell = mailto_handler_get_shell (extension);
+ 	shell_settings = e_shell_get_shell_settings (shell);
+ 
+ 	g_object_get (
+ 		shell_settings,
+-		"mailto-handler-command", &mailto_command,
+ 		"mailto-handler-check", &check_mailto_handler,
+ 		NULL);
+ 
+@@ -189,25 +196,37 @@ mailto_handler_check (EMailtoHandler *extension)
+ 	if (!check_mailto_handler)
+ 		goto exit;
+ 
++	app_info = g_app_info_get_default_for_type (MAILTO_HANDLER, FALSE);
++
+ 	/* Is Evolution already handling "mailto" URIs? */
+-	if (mailto_handler_is_evolution (mailto_command))
++	if (mailto_handler_is_evolution (app_info))
+ 		goto exit;
+ 
+ 	/* Does the user want Evolution to handle them? */
+ 	if (!mailto_handler_prompt (extension))
+ 		goto exit;
+ 
++	if (app_info)
++		g_object_unref (app_info);
++
+ 	/* Configure Evolution to be the "mailto" URI handler. */
++	app_info = g_app_info_create_from_commandline (
++		MAILTO_COMMAND,
++		_("Evolution"),
++		G_APP_INFO_CREATE_SUPPORTS_URIS,
++		&error);
+ 
+-	g_object_set (
+-		shell_settings,
+-		"mailto-handler-command", MAILTO_COMMAND,
+-		"mailto-handler-enabled", TRUE,
+-		"mailto-handler-needs-terminal", FALSE,
+-		NULL);
++	if (app_info && !error)
++		g_app_info_set_as_default_for_type (app_info, MAILTO_HANDLER, &error);
+ 
+ exit:
+-	g_free (mailto_command);
++	if (app_info)
++		g_object_unref (app_info);
++
++	if (error) {
++		g_warning ("Failed to register as default handler: %s", error->message);
++		g_error_free (error);
++	}
+ }
+ 
+ static void
+@@ -226,18 +245,6 @@ mailto_handler_constructed (GObject *object)
+ 		"mailto-handler-check",
+ 		"/apps/evolution/mail/prompts/checkdefault");
+ 
+-	e_shell_settings_install_property_for_key (
+-		"mailto-handler-command",
+-		"/desktop/gnome/url-handlers/mailto/command");
+-
+-	e_shell_settings_install_property_for_key (
+-		"mailto-handler-enabled",
+-		"/desktop/gnome/url-handlers/mailto/enabled");
+-
+-	e_shell_settings_install_property_for_key (
+-		"mailto-handler-needs-terminal",
+-		"/desktop/gnome/url-handlers/mailto/needs_terminal");
+-
+ 	g_signal_connect_swapped (
+ 		shell, "event::ready-to-start",
+ 		G_CALLBACK (mailto_handler_check), extension);
diff --git a/mail-client/evolution/files/evolution-2.32.2-smime-fix.patch b/mail-client/evolution/files/evolution-2.32.2-smime-fix.patch
new file mode 100644
index 000000000000..d42f6a3a9f7a
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.32.2-smime-fix.patch
@@ -0,0 +1,76 @@
+--- mail/em-account-editor.c~	2010-12-27 15:57:03.000000000 +0100
++++ mail/em-account-editor.c	2011-03-27 17:57:40.000000000 +0200
+@@ -68,7 +68,7 @@
+ #include "mail-ops.h"
+ #include "mail-mt.h"
+ 
+-#if defined (HAVE_NSS)
++#if defined (HAVE_NSS) && defined (ENABLE_SMIME)
+ #include "smime/gui/e-cert-selector.h"
+ #endif
+ 
+@@ -1202,7 +1202,7 @@
+ 	return folder;
+ }
+ 
+-#if defined (HAVE_NSS)
++#if defined (HAVE_NSS) && defined (ENABLE_SMIME)
+ static void
+ smime_changed (EMAccountEditor *emae)
+ {
+@@ -3072,7 +3072,7 @@
+ emae_security_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
+ {
+ 	EMAccountEditor *emae = data;
+-#if defined (HAVE_NSS)
++#if defined (HAVE_NSS) && defined (ENABLE_SMIME)
+ 	EMAccountEditorPrivate *priv = emae->priv;
+ #endif
+ 	GtkWidget *w;
+@@ -3092,7 +3092,7 @@
+ 	emae_account_toggle (emae, "pgp_no_imip_sign", E_ACCOUNT_PGP_NO_IMIP_SIGN, builder);
+ 	emae_account_toggle (emae, "pgp_always_trust", E_ACCOUNT_PGP_ALWAYS_TRUST, builder);
+ 
+-#if defined (HAVE_NSS)
++#if defined (HAVE_NSS) && defined (ENABLE_SMIME)
+ 	/* TODO: this should handle its entry separately? */
+ 	priv->smime_sign_key = emae_account_entry (emae, "smime_sign_key", E_ACCOUNT_SMIME_SIGN_KEY, builder);
+ 	priv->smime_sign_key_select = (GtkButton *)e_builder_get_widget (builder, "smime_sign_key_select");
+--- mail/em-format-html-display.c~	2010-10-14 23:18:47.000000000 +0200
++++ mail/em-format-html-display.c	2011-03-27 17:58:58.000000000 +0200
+@@ -50,7 +50,7 @@
+ #include <e-util/e-dialog-utils.h>
+ #include <e-util/e-icon-factory.h>
+ 
+-#ifdef HAVE_NSS
++#if defined (HAVE_NSS) && defined (ENABLE_SMIME)
+ #include "certificate-viewer.h"
+ #include "e-cert-db.h"
+ #endif
+@@ -171,7 +171,7 @@
+ 	po->widget = NULL;
+ }
+ 
+-#ifdef HAVE_NSS
++#if defined (HAVE_NSS) && defined (ENABLE_SMIME)
+ static void
+ efhd_xpkcs7mime_viewcert_clicked (GtkWidget *button,
+                                   struct _smime_pobject *po)
+--- modules/addressbook/e-book-shell-backend.c~	2010-11-10 19:55:36.000000000 +0100
++++ modules/addressbook/e-book-shell-backend.c	2011-03-27 17:59:56.000000000 +0200
+@@ -317,6 +317,7 @@
+ 		autocompletion_config_new,
+ 		200);
+ 
++#ifdef ENABLE_SMIME
+ 	preferences_window = e_shell_get_preferences_window (shell);
+ 	e_preferences_window_add_page (
+ 		E_PREFERENCES_WINDOW (preferences_window),
+@@ -325,6 +326,7 @@
+ 		_("Certificates"),
+ 		certificate_manager_config_new,
+ 		700);
++#endif
+ 
+ 	return FALSE;
+ }