pool/evolution
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 40779 from GNOME:Factory

Browse Source 
Copy from GNOME:Factory/evolution based on submit request 40779 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/40779
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=86
This commit is contained in:
OBS User autobuild 2010-05-28 15:18:49 +00:00 committed by Git OBS Bridge
parent d67f5c0ac8
commit 09d5037364
3 changed files with 53 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
evolution-bnc576165-mono-plugin-crash.patch Normal file
View File

@ -0,0 +1,34 @@
From 87a71a63d78207cb17b1fb0f1ac98e8e57289469 Mon Sep 17 00:00:00 2001
From: Chenthill Palanisamy <pchenthill@novell.com>
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

13
evolution.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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

8
evolution.spec
View File

@ -46,7 +46,8 @@ BuildRequires: libpisock-devel
BuildRequires: libpisync-devel
BuildRequires: libpst-devel
BuildRequires: libunique-devel
BuildRequires: libytnef-devel
# don't you ever enable this! It's experimental and insecure (bnc#609013)
#BuildRequires: libytnef-devel
BuildRequires: mozilla-nss-devel
BuildRequires: nss-shared-helper-devel
BuildRequires: pilot-link
@ -61,7 +62,7 @@ Group: Productivity/Networking/Email/Clients
# This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
%define evolution_base_version 2.30
Version: 2.30.1.2
Release: 2
Release: 3
Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite
Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.25/%{name}-%{version}.tar.bz2
# PATCH-NEEDS-REBASE calendar-sendbutton.patch -- It also needs a proper description and a bug number
@ -92,6 +93,8 @@ 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
@ -198,6 +201,7 @@ gnome-patch-translation-prepare
#%patch54
# NEEDS-REBASE
#%patch101 -p1
%patch102 -p1
gnome-patch-translation-update
%build