diff options
author | Cédric Krier <cedk@gentoo.org> | 2008-06-07 14:40:10 +0000 |
---|---|---|
committer | Cédric Krier <cedk@gentoo.org> | 2008-06-07 14:40:10 +0000 |
commit | d9ce2fba706985e9b9ed2342c2ffd6fa26e72406 (patch) | |
tree | 826e1c7447556cc49f5a9e5b465de8c5ecf231f6 /app-misc | |
parent | Add $DEPEND to $RDEPEND, bug 225217. (diff) | |
download | gentoo-2-d9ce2fba706985e9b9ed2342c2ffd6fa26e72406.tar.gz gentoo-2-d9ce2fba706985e9b9ed2342c2ffd6fa26e72406.tar.bz2 gentoo-2-d9ce2fba706985e9b9ed2342c2ffd6fa26e72406.zip |
Add evo-sharp patch from redhat for bug #224621
(Portage version: 2.1.4.4)
Diffstat (limited to 'app-misc')
-rw-r--r-- | app-misc/beagle/ChangeLog | 9 | ||||
-rw-r--r-- | app-misc/beagle/beagle-0.3.7-r1.ebuild (renamed from app-misc/beagle/beagle-0.3.7.ebuild) | 3 | ||||
-rw-r--r-- | app-misc/beagle/files/beagle-0.3.7-evo-sharp.patch | 116 |
3 files changed, 126 insertions, 2 deletions
diff --git a/app-misc/beagle/ChangeLog b/app-misc/beagle/ChangeLog index 4f2f978ae690..296fa1fd85f3 100644 --- a/app-misc/beagle/ChangeLog +++ b/app-misc/beagle/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-misc/beagle # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/ChangeLog,v 1.77 2008/05/30 20:01:33 cedk Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/ChangeLog,v 1.78 2008/06/07 14:40:09 cedk Exp $ + +*beagle-0.3.7-r1 (07 Jun 2008) + + 07 Jun 2008; Cédric Krier <cedk@gentoo.org> + +files/beagle-0.3.7-evo-sharp.patch, -beagle-0.3.7.ebuild, + +beagle-0.3.7-r1.ebuild: + Add evo-sharp patch from redhat for bug #224621 *beagle-0.3.7 (28 May 2008) diff --git a/app-misc/beagle/beagle-0.3.7.ebuild b/app-misc/beagle/beagle-0.3.7-r1.ebuild index c6d3c9536573..d374bdc6ba21 100644 --- a/app-misc/beagle/beagle-0.3.7.ebuild +++ b/app-misc/beagle/beagle-0.3.7-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.3.7.ebuild,v 1.1 2008/05/30 20:01:33 cedk Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.3.7-r1.ebuild,v 1.1 2008/06/07 14:40:09 cedk Exp $ EAPI=1 @@ -90,6 +90,7 @@ src_unpack() { unpack ${A} cd "${S}" + epatch "${FILESDIR}"/${P}-evo-sharp.patch # Multilib fix sed -i -e 's:prefix mono`/lib:libdir mono`:' \ configure.in || die "sed failed" diff --git a/app-misc/beagle/files/beagle-0.3.7-evo-sharp.patch b/app-misc/beagle/files/beagle-0.3.7-evo-sharp.patch new file mode 100644 index 000000000000..db5c87aada3e --- /dev/null +++ b/app-misc/beagle/files/beagle-0.3.7-evo-sharp.patch @@ -0,0 +1,116 @@ +diff -ru beagle-0.3.7~/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs beagle-0.3.7/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs +--- beagle-0.3.7~/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs 2008-06-07 16:23:11.000000000 +0200 ++++ beagle-0.3.7/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs 2008-06-07 16:28:57.000000000 +0200 +@@ -36,7 +36,7 @@ + using Beagle.Util; + using Beagle.Daemon; + +-using Camel = Beagle.Util.Camel; ++using B_U_Camel = Beagle.Util.Camel; + + namespace Beagle.Daemon.EvolutionMailQueryable { + +@@ -309,7 +309,7 @@ + } + } + +- private static bool CheckFlags (uint flags, Camel.CamelFlags test) ++ private static bool CheckFlags (uint flags, B_U_Camel.CamelFlags test) + { + return (flags & (uint) test) == (uint) test; + } +@@ -317,7 +317,7 @@ + private Indexable GMimeMessageToIndexable (string uid, GMime.Message message, uint flags) + { + // Don't index messages flagged as junk +- if (CheckFlags (flags, Camel.CamelFlags.Junk)) ++ if (CheckFlags (flags, B_U_Camel.CamelFlags.Junk)) + return null; + + System.Uri uri = EvolutionMailQueryable.EmailUri (this.account_name, this.folder_name, uid); +@@ -362,22 +362,22 @@ + flag_prop.IsMutable = true; + indexable.AddProperty (flag_prop); + +- if (CheckFlags (flags, Camel.CamelFlags.Answered)) ++ if (CheckFlags (flags, B_U_Camel.CamelFlags.Answered)) + indexable.AddProperty (Property.NewFlag ("fixme:isAnswered")); + +- if (CheckFlags (flags, Camel.CamelFlags.Deleted)) ++ if (CheckFlags (flags, B_U_Camel.CamelFlags.Deleted)) + indexable.AddProperty (Property.NewFlag ("fixme:isDeleted")); + +- if (CheckFlags (flags, Camel.CamelFlags.Draft)) ++ if (CheckFlags (flags, B_U_Camel.CamelFlags.Draft)) + indexable.AddProperty (Property.NewFlag ("fixme:isDraft")); + +- if (CheckFlags (flags, Camel.CamelFlags.Flagged)) ++ if (CheckFlags (flags, B_U_Camel.CamelFlags.Flagged)) + indexable.AddProperty (Property.NewFlag ("fixme:isFlagged")); + +- if (CheckFlags (flags, Camel.CamelFlags.Seen)) ++ if (CheckFlags (flags, B_U_Camel.CamelFlags.Seen)) + indexable.AddProperty (Property.NewFlag ("fixme:isSeen")); + +- if (CheckFlags (flags, Camel.CamelFlags.AnsweredAll)) ++ if (CheckFlags (flags, B_U_Camel.CamelFlags.AnsweredAll)) + indexable.AddProperty (Property.NewFlag ("fixme:isAnsweredAll")); + + indexable.SetBinaryStream (message.Stream); +@@ -427,7 +427,7 @@ + private FileInfo summary_info; + private string imap_name; + private ImapBackendType backend_type; +- private Camel.Summary summary; ++ private B_U_Camel.Summary summary; + private IEnumerator summary_enumerator; + private EvolutionSummaryTracker tracker; + private DateTime start_crawl_time; +@@ -593,9 +593,9 @@ + if (this.summary == null) { + try { + if (this.backend_type == ImapBackendType.Imap) +- this.summary = Camel.Summary.LoadImapSummary (this.summary_info.FullName); ++ this.summary = B_U_Camel.Summary.LoadImapSummary (this.summary_info.FullName); + else +- this.summary = Camel.Summary.LoadImap4Summary (this.summary_info.FullName); ++ this.summary = B_U_Camel.Summary.LoadImap4Summary (this.summary_info.FullName); + } catch (Exception e) { + Logger.Log.Warn (e, "Unable to index {0}:", this.folder_name); + this.queryable.RemoveGenerator (this); +@@ -660,7 +660,7 @@ + return indexable; + } + +- Camel.MessageInfo mi = (Camel.MessageInfo) this.summary_enumerator.Current; ++ B_U_Camel.MessageInfo mi = (B_U_Camel.MessageInfo) this.summary_enumerator.Current; + + ++this.count; + +@@ -717,12 +717,12 @@ + return indexable; + } + +- private Uri CamelMessageUri (Camel.MessageInfo message_info) ++ private Uri CamelMessageUri (B_U_Camel.MessageInfo message_info) + { + return EvolutionMailQueryable.EmailUri (this.account_name, this.folder_name, message_info.uid); + } + +- private Indexable CamelMessageToIndexable (Camel.MessageInfo messageInfo, string msg_file) ++ private Indexable CamelMessageToIndexable (B_U_Camel.MessageInfo messageInfo, string msg_file) + { + // Don't index messages flagged as junk + if (messageInfo.IsJunk) +Only in beagle-0.3.7/beagled/EvolutionMailQueryable: EvolutionMailIndexableGenerator.cs.orig +diff -ru beagle-0.3.7~/beagled/EvolutionMailQueryable/EvolutionMailQueryable.cs beagle-0.3.7/beagled/EvolutionMailQueryable/EvolutionMailQueryable.cs +--- beagle-0.3.7~/beagled/EvolutionMailQueryable/EvolutionMailQueryable.cs 2008-06-07 16:23:11.000000000 +0200 ++++ beagle-0.3.7/beagled/EvolutionMailQueryable/EvolutionMailQueryable.cs 2008-06-07 16:25:36.000000000 +0200 +@@ -31,7 +31,6 @@ + using System.Threading; + + using Beagle.Util; +-using Camel = Beagle.Util.Camel; + + namespace Beagle.Daemon.EvolutionMailQueryable { + |