From 41d66c8b3813356ae3c967c774b324a8922582be7c3baefc86ba94dab639fe60 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 28 May 2010 15:18:48 +0000 Subject: [PATCH] Accepting request 40779 from GNOME:Factory checked in (request 40779) OBS-URL: https://build.opensuse.org/request/show/40779 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=84 --- evolution-bnc576165-mono-plugin-crash.patch | 34 --------------------- evolution.changes | 13 -------- evolution.spec | 6 +--- 3 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 evolution-bnc576165-mono-plugin-crash.patch diff --git a/evolution-bnc576165-mono-plugin-crash.patch b/evolution-bnc576165-mono-plugin-crash.patch deleted file mode 100644 index fe55f90..0000000 --- a/evolution-bnc576165-mono-plugin-crash.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 87a71a63d78207cb17b1fb0f1ac98e8e57289469 Mon Sep 17 00:00:00 2001 -From: Chenthill Palanisamy -Date: Wed, 26 May 2010 10:20:09 +0000 -Subject: Bug 576165 - SIGSEGV in e_plugin_mono_register_type (bnc) - ---- -diff --git a/modules/plugin-mono/e-plugin-mono.c b/modules/plugin-mono/e-plugin-mono.c -index f1fe76f..eb4b60c 100644 ---- a/modules/plugin-mono/e-plugin-mono.c -+++ b/modules/plugin-mono/e-plugin-mono.c -@@ -121,6 +121,11 @@ plugin_mono_invoke (EPlugin *plugin, - plugin_mono = E_PLUGIN_MONO (plugin); - priv = plugin_mono->priv; - -+ if (!domain) { -+ mono_config_parse (NULL); -+ domain = mono_jit_init (plugin_mono->location); -+ } -+ - /* We need to do this every time since we may - * be called from any thread for some uses. */ - mono_thread_attach (domain); -@@ -258,7 +263,4 @@ e_plugin_mono_register_type (GTypeModule *type_module) - plugin_mono_type = g_type_module_register_type ( - type_module, E_TYPE_PLUGIN, - "EPluginMono", &type_info, 0); -- -- domain = mono_jit_init ("Evolution"); -- mono_thread_attach (domain); - } --- -cgit v0.8.3.1 - - diff --git a/evolution.changes b/evolution.changes index 874e2cf..558f9c7 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,16 +1,3 @@ -------------------------------------------------------------------- -Fri May 28 07:30:49 UTC 2010 - lnussel@suse.de - -- remove build dependency on libytnef as it's not used anyways. The - tnef plugin is experimental and has security issues so we don't - want to enable it (bnc#609013) - -------------------------------------------------------------------- -Wed May 26 13:06:24 UTC 2010 - dimstar@opensuse.org - -- Add evolution-bnc576165-mono-plugin-crash.patch: fix sigsegv in - mono plugin registration (bnc#576165). - ------------------------------------------------------------------- Sun May 23 16:29:27 CEST 2010 - vuntz@opensuse.org diff --git a/evolution.spec b/evolution.spec index 85d44e3..1ae3913 100644 --- a/evolution.spec +++ b/evolution.spec @@ -46,8 +46,7 @@ BuildRequires: libpisock-devel BuildRequires: libpisync-devel BuildRequires: libpst-devel BuildRequires: libunique-devel -# don't you ever enable this! It's experimental and insecure (bnc#609013) -#BuildRequires: libytnef-devel +BuildRequires: libytnef-devel BuildRequires: mozilla-nss-devel BuildRequires: nss-shared-helper-devel BuildRequires: pilot-link @@ -93,8 +92,6 @@ Patch53: bnc-440634-forwarded-hide-accept-decline.patch Patch54: bnc-445996-address-conflict.patch # PATCH-NEEDS-REBASE: sp-process-meetings.diff pchenthill@suse.de -- Fix for bug 449899 (bnc) (WAS: PATCH-FIX-SLED) Patch101: sp-process-meetings.diff -# PATCH-FIX-UPSTREAM evolution-bnc576165-mono-plugin-crash.patch bnc#576165 pchenthill@novell.com -- Fix crash in mono plugin handler -Patch102: evolution-bnc576165-mono-plugin-crash.patch Url: http://gnome.org/projects/evolution/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: bogofilter @@ -201,7 +198,6 @@ gnome-patch-translation-prepare #%patch54 # NEEDS-REBASE #%patch101 -p1 -%patch102 -p1 gnome-patch-translation-update %build