rpms/beagle/devel beagle-0.3.8-gmime-2.4.patch, NONE, 1.1 beagle.spec, 1.156, 1.157
Adel Gadllah
drago01 at fedoraproject.org
Fri Dec 5 16:39:45 UTC 2008
- Previous message (by thread): rpms/virt-df/devel virt-df-2.1.4-camlp4-parse.patch, NONE, 1.1 virt-df.spec, 1.7, 1.8
- Next message (by thread): rpms/gmp-ecm/devel gmp-ecm.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: drago01
Update of /cvs/pkgs/rpms/beagle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14634
Modified Files:
beagle.spec
Added Files:
beagle-0.3.8-gmime-2.4.patch
Log Message:
update for gmime-2.4
beagle-0.3.8-gmime-2.4.patch:
--- NEW FILE beagle-0.3.8-gmime-2.4.patch ---
diff -upNr beagle-0.3.8.orign/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs beagle-0.3.8/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs
--- beagle-0.3.8.orign/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs 2008-04-25 20:17:04.000000000 +0200
+++ beagle-0.3.8/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs 2008-12-05 17:33:50.000000000 +0100
@@ -333,28 +333,46 @@ namespace Beagle.Daemon.EvolutionMailQue
indexable.AddProperty (Property.NewUnsearched ("fixme:folder", this.folder_name));
GMime.InternetAddressList addrs;
-
- addrs = message.GetRecipients (GMime.Message.RecipientType.To);
- foreach (GMime.InternetAddress ia in addrs) {
- if (this.folder_name == "Sent" && ia.AddressType != GMime.InternetAddressType.Group)
- indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", ia.Addr));
+
+ if (this.folder_name == "Sent") {
+ addrs = message.GetRecipients (GMime.RecipientType.To);
+ foreach (GMime.InternetAddress ia in addrs) {
+ if (ia is GMime.InternetAddressMailbox) {
+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
+
+ indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", mailbox.Address));
+ }
+ }
+
+ addrs.Dispose ();
}
- addrs.Dispose ();
-
- addrs = message.GetRecipients (GMime.Message.RecipientType.Cc);
- foreach (GMime.InternetAddress ia in addrs) {
- if (this.folder_name == "Sent" && ia.AddressType != GMime.InternetAddressType.Group)
- indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", ia.Addr));
+
+ if (this.folder_name == "Sent") {
+ addrs = message.GetRecipients (GMime.RecipientType.Cc);
+ foreach (GMime.InternetAddress ia in addrs) {
+ if (ia is GMime.InternetAddressMailbox) {
+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
+
+ indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", mailbox.Address));
+ }
+ }
+
+ addrs.Dispose ();
}
- addrs.Dispose ();
-
- addrs = GMime.InternetAddressList.ParseString (GMime.Utils.HeaderDecodePhrase (message.Sender));
- foreach (GMime.InternetAddress ia in addrs) {
- if (this.folder_name != "Sent" && ia.AddressType != GMime.InternetAddressType.Group)
- indexable.AddProperty (Property.NewUnsearched ("fixme:gotFrom", ia.Addr));
+
+ if (this.folder_name != "Sent") {
+ addrs = GMime.InternetAddressList.Parse (message.Sender);
+ foreach (GMime.InternetAddress ia in addrs) {
+ if (ia is GMime.InternetAddressMailbox) {
+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
+
+ indexable.AddProperty (Property.NewUnsearched ("fixme:gotFrom", mailbox.Address));
+ }
+ }
+
+ addrs.Dispose ();
}
- addrs.Dispose ();
-
+
if (this.folder_name == "Sent")
indexable.AddProperty (Property.NewFlag ("fixme:isSent"));
@@ -750,48 +768,54 @@ namespace Beagle.Daemon.EvolutionMailQue
}
GMime.InternetAddressList addrs;
- addrs = GMime.InternetAddressList.ParseString (messageInfo.to);
+ addrs = GMime.InternetAddressList.Parse (messageInfo.to);
foreach (GMime.InternetAddress ia in addrs) {
+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
+
if (!have_content) {
indexable.AddProperty (Property.NewUnsearched ("fixme:to", ia.ToString (false)));
- if (ia.AddressType != GMime.InternetAddressType.Group)
- indexable.AddProperty (Property.New ("fixme:to_address", ia.Addr));
-
+ if (ia is GMime.InternetAddressMailbox)
+ indexable.AddProperty (Property.New ("fixme:to_address", mailbox.Address));
+
indexable.AddProperty (Property.New ("fixme:to_name", ia.Name));
}
-
- if (this.folder_name == "Sent" && ia.AddressType != GMime.InternetAddressType.Group)
- indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", ia.Addr));
+
+ if (this.folder_name == "Sent" && ia is GMime.InternetAddressMailbox)
+ indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", mailbox.Address));
}
addrs.Dispose ();
- addrs = GMime.InternetAddressList.ParseString (messageInfo.cc);
+ addrs = GMime.InternetAddressList.Parse (messageInfo.cc);
foreach (GMime.InternetAddress ia in addrs) {
+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
+
if (!have_content) {
indexable.AddProperty (Property.NewUnsearched ("fixme:cc", ia.ToString (false)));
- if (ia.AddressType != GMime.InternetAddressType.Group)
- indexable.AddProperty (Property.New ("fixme:cc_address", ia.Addr));
-
+ if (ia is GMime.InternetAddressMailbox)
+ indexable.AddProperty (Property.New ("fixme:cc_address", mailbox.Address));
+
indexable.AddProperty (Property.New ("fixme:cc_name", ia.Name));
}
-
- if (this.folder_name == "Sent" && ia.AddressType != GMime.InternetAddressType.Group)
- indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", ia.Addr));
+
+ if (this.folder_name == "Sent" && ia is GMime.InternetAddressMailbox)
+ indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", mailbox.Address));
}
addrs.Dispose ();
- addrs = GMime.InternetAddressList.ParseString (messageInfo.from);
+ addrs = GMime.InternetAddressList.Parse (messageInfo.from);
foreach (GMime.InternetAddress ia in addrs) {
+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
+
if (!have_content) {
indexable.AddProperty (Property.NewUnsearched ("fixme:from", ia.ToString (false)));
- if (ia.AddressType != GMime.InternetAddressType.Group)
- indexable.AddProperty (Property.New ("fixme:from_address", ia.Addr));
-
+ if (ia is GMime.InternetAddressMailbox)
+ indexable.AddProperty (Property.New ("fixme:from_address", mailbox.Address));
+
indexable.AddProperty (Property.New ("fixme:from_name", ia.Name));
}
- if (this.folder_name != "Sent" && ia.AddressType != GMime.InternetAddressType.Group)
- indexable.AddProperty (Property.NewUnsearched ("fixme:gotFrom", ia.Addr));
+ if (this.folder_name != "Sent" && ia is GMime.InternetAddressMailbox)
+ indexable.AddProperty (Property.NewUnsearched ("fixme:gotFrom", mailbox.Address));
}
addrs.Dispose ();
diff -upNr beagle-0.3.8.orign/beagled/GoogleBackends/GMailSearchDriver.cs beagle-0.3.8/beagled/GoogleBackends/GMailSearchDriver.cs
--- beagle-0.3.8.orign/beagled/GoogleBackends/GMailSearchDriver.cs 2008-04-25 21:26:19.000000000 +0200
+++ beagle-0.3.8/beagled/GoogleBackends/GMailSearchDriver.cs 2008-12-05 17:33:50.000000000 +0100
@@ -322,38 +322,47 @@ namespace Beagle.Daemon.GoogleBackend {
hit.AddProperty (Property.NewDate ("fixme:date", message.Date.ToUniversalTime ()));
GMime.InternetAddressList addrs;
- addrs = message.GetRecipients (GMime.Message.RecipientType.To);
+ addrs = message.GetRecipients (GMime.RecipientType.To);
foreach (GMime.InternetAddress ia in addrs) {
hit.AddProperty (Property.NewUnsearched ("fixme:to", ia.ToString (false)));
- if (ia.AddressType != GMime.InternetAddressType.Group)
- hit.AddProperty (Property.New ("fixme:to_address", ia.Addr));
-
+ if (ia is GMime.InternetAddressMailbox) {
+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
+
+ hit.AddProperty (Property.New ("fixme:to_address", mailbox.Address));
+ }
+
hit.AddProperty (Property.New ("fixme:to_name", ia.Name));
}
addrs.Dispose ();
- addrs = message.GetRecipients (GMime.Message.RecipientType.Cc);
+ addrs = message.GetRecipients (GMime.RecipientType.Cc);
foreach (GMime.InternetAddress ia in addrs) {
hit.AddProperty (Property.NewUnsearched ("fixme:cc", ia.ToString (false)));
- if (ia.AddressType != GMime.InternetAddressType.Group)
- hit.AddProperty (Property.New ("fixme:cc_address", ia.Addr));
-
+ if (ia is GMime.InternetAddressMailbox) {
+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
+
+ hit.AddProperty (Property.New ("fixme:cc_address", mailbox.Address));
+ }
+
hit.AddProperty (Property.New ("fixme:cc_name", ia.Name));
}
addrs.Dispose ();
- addrs = GMime.InternetAddressList.ParseString (GMime.Utils.HeaderDecodePhrase (message.Sender));
+ addrs = GMime.InternetAddressList.Parse (message.Sender);
foreach (GMime.InternetAddress ia in addrs) {
hit.AddProperty (Property.NewUnsearched ("fixme:from", ia.ToString (false)));
- if (ia.AddressType != GMime.InternetAddressType.Group)
- hit.AddProperty (Property.New ("fixme:from_address", ia.Addr));
-
+ if (ia is GMime.InternetAddressMailbox) {
+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
+
+ hit.AddProperty (Property.New ("fixme:from_address", mailbox.Address));
+ }
+
hit.AddProperty (Property.New ("fixme:from_name", ia.Name));
[...16549 lines suppressed...]
+fi
+
+AM_CONDITIONAL(ENABLE_RDF_ADAPTER, test "x$enable_rdf_adapter" = "xyes")
+
+dnl ----------------------------------------------
+
+dnl Conditional for debugging XML messages.
+
+AC_ARG_ENABLE([xml-dump],
+ AC_HELP_STRING([--enable-xml-dump], [Enables printing of the XML messages sent between components (default no)]),
+ enable_xml_dump=$enableval,
+ enable_xml_dump=no)
+
+if test "x$enable_xml_dump" = "xyes"; then
+ AC_DEFINE_UNQUOTED(ENABLE_XML_DUMP, 1, [Dump XML messages for debugging])
+ BEAGLE_DEFINES="$BEAGLE_DEFINES -define:ENABLE_XML_DUMP"
+fi
+
+AC_SUBST(BEAGLE_DEFINES)
+
+dnl ----------------------------------------------
+
+AC_OUTPUT([
+Makefile
+Util/Makefile
+glue/Makefile
+BeagleClient/Makefile
+beagled/Makefile
+Filters/Makefile
+tools/Makefile
+tools/beagle-settings.desktop.in
+search/icons/Makefile
+search/beagle-search.desktop.in
+search/Makefile
+ImLogViewer/Makefile
+epiphany-extension/Makefile
+firefox-extension/Makefile
+thunderbird-extension/Makefile
+doc/Makefile
+doc/api/Makefile
+RDFAdapter/Makefile
+conf-data/Makefile
+beagle-0.0.pc
+beagle-daemon.pc
+beagle-ui-0.0.pc
+beagle.spec
+po/Makefile.in
+])
+
+echo "
+ Beagle version: ${VERSION}
+ Target OS: ${os}
+ Inotify: ${enable_inotify}
+
+ Prefix: ${prefix}
+ KDE prefix: ${kde_prefix_print}
+
+ evolution-sharp? ${enable_evo}
+ gsf-sharp? ${enable_gsf_sharp}
+ galago-sharp? ${enable_galago}
+ avahi-sharp ${enable_avahi}
+ wv1? ${enable_wv1}
+ libchm? ${has_libchm}
+
+ Firefox Extension? yes
+ Epiphany Extension? ${enable_epiphany_extension}
+ Thunderbird Extension? ${enable_tbird}
+ Google Backends? ${enable_google}
+
+ Monitor screensaver ${have_xss}
+ beagle-search GUI ${enable_gui}
+ Qt beagle-settings GUI ${enable_qt}
+
+ Build RDF Adapter ${enable_rdf_adapter} (purely experimental)
+ Build docs? ${with_docs}
+"
diff -upNr beagle-0.3.8.orign/Filters/FilterMail.cs beagle-0.3.8/Filters/FilterMail.cs
--- beagle-0.3.8.orign/Filters/FilterMail.cs 2008-06-12 02:20:07.000000000 +0200
+++ beagle-0.3.8/Filters/FilterMail.cs 2008-12-05 17:33:50.000000000 +0100
@@ -126,7 +126,7 @@ namespace Beagle.Filters {
// Messages that are multipart/alternative shouldn't be considered as having
// attachments. Unless of course they do.
- if (mime_part is GMime.Multipart && mime_part.ContentType.Subtype.ToLower () != "alternative")
+ if (mime_part is GMime.Multipart && mime_part.ContentType.MediaSubtype.ToLower () != "alternative")
return true;
return false;
@@ -140,34 +140,43 @@ namespace Beagle.Filters {
AddProperty (Property.NewDate ("fixme:date", message.Date.ToUniversalTime ()));
GMime.InternetAddressList addrs;
- addrs = this.message.GetRecipients (GMime.Message.RecipientType.To);
+ addrs = this.message.GetRecipients (GMime.RecipientType.To);
foreach (GMime.InternetAddress ia in addrs) {
AddProperty (Property.NewUnsearched ("fixme:to", ia.ToString (false)));
- if (ia.AddressType != GMime.InternetAddressType.Group)
- AddProperty (Property.New ("fixme:to_address", ia.Addr));
-
+ if (ia is GMime.InternetAddressMailbox) {
+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
+
+ AddProperty (Property.New ("fixme:to_address", mailbox.Address));
+ }
+
AddProperty (Property.New ("fixme:to_name", ia.Name));
AddEmailLink (ia);
}
addrs.Dispose ();
- addrs = this.message.GetRecipients (GMime.Message.RecipientType.Cc);
+ addrs = this.message.GetRecipients (GMime.RecipientType.Cc);
foreach (GMime.InternetAddress ia in addrs) {
AddProperty (Property.NewUnsearched ("fixme:cc", ia.ToString (false)));
- if (ia.AddressType != GMime.InternetAddressType.Group)
- AddProperty (Property.New ("fixme:cc_address", ia.Addr));
-
+ if (ia is GMime.InternetAddressMailbox) {
+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
+
+ AddProperty (Property.New ("fixme:cc_address", mailbox.Address));
+ }
+
AddProperty (Property.New ("fixme:cc_name", ia.Name));
AddEmailLink (ia);
}
addrs.Dispose ();
- addrs = GMime.InternetAddressList.ParseString (GMime.Utils.HeaderDecodePhrase (this.message.Sender));
+ addrs = GMime.InternetAddressList.Parse (this.message.Sender);
foreach (GMime.InternetAddress ia in addrs) {
AddProperty (Property.NewUnsearched ("fixme:from", ia.ToString (false)));
- if (ia.AddressType != GMime.InternetAddressType.Group)
- AddProperty (Property.New ("fixme:from_address", ia.Addr));
-
+ if (ia is GMime.InternetAddressMailbox) {
+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
+
+ AddProperty (Property.New ("fixme:from_address", mailbox.Address));
+ }
+
AddProperty (Property.New ("fixme:from_name", ia.Name));
AddEmailLink (ia);
}
@@ -184,7 +193,7 @@ namespace Beagle.Filters {
AddProperty (Property.NewUnsearched ("fixme:msgid", GMime.Utils.DecodeMessageId (msgid)));
foreach (GMime.References refs in this.message.References)
- AddProperty (Property.NewUnsearched ("fixme:reference", refs.Msgid));
+ AddProperty (Property.NewUnsearched ("fixme:reference", refs.MessageId));
string list_id = this.message.GetHeader ("List-Id");
if (list_id != null)
@@ -345,16 +354,15 @@ namespace Beagle.Filters {
}
} else if (mime_part is GMime.Multipart) {
GMime.Multipart multipart = (GMime.Multipart) mime_part;
-
- int num_parts = multipart.Number;
+ int num_parts = multipart.Count;
// If the mimetype is multipart/alternative, we only want to index
// one part -- the richest one we can filter.
- if (mime_part.ContentType.Subtype.ToLower () == "alternative") {
+ if (mime_part.ContentType.MediaSubtype.ToLower () == "alternative") {
// The richest formats are at the end, so work from there
// backward.
for (int i = num_parts - 1; i >= 0; i--) {
- GMime.Object subpart = multipart.GetPart (i);
+ GMime.Object subpart = multipart[i];
if (IsMimeTypeHandled (subpart.ContentType.ToString ())) {
part = subpart;
@@ -370,7 +378,7 @@ namespace Beagle.Filters {
// the parts, treat them like a bunch of attachments.
if (part == null) {
for (int i = 0; i < num_parts; i++) {
- using (GMime.Object subpart = multipart.GetPart (i))
+ using (GMime.Object subpart = multipart[i])
this.OnEachPart (subpart);
}
}
@@ -400,7 +408,7 @@ namespace Beagle.Filters {
} else if (mime_type == "text/html") {
no_child_needed = true;
html_part = true;
- string enc = part.GetContentTypeParameter ("charset");
+ string enc = part.ContentType.GetParameter ("charset");
// DataWrapper.Stream is a very limited stream
// and does not allow Seek or Tell
// HtmlFilter requires Stream.Position=0.
@@ -473,7 +481,7 @@ namespace Beagle.Filters {
if (length != -1)
child.AddProperty (Property.NewUnsearched ("fixme:filesize", length));
- if (part.ContentType.Type.ToLower () == "text")
+ if (part.ContentType.MediaType.ToLower () == "text")
child.SetTextReader (new StreamReader (stream));
else
child.SetBinaryStream (stream);
Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- beagle.spec 1 Dec 2008 15:00:17 -0000 1.156
+++ beagle.spec 5 Dec 2008 16:39:14 -0000 1.157
@@ -1,6 +1,6 @@
Name: beagle
Version: 0.3.8
-Release: 15%{?dist}
+Release: 16%{?dist}
Summary: The Beagle Search Infrastructure
Group: User Interface/Desktops
# see COPYING for details
@@ -61,6 +61,8 @@
Patch10: beagle-0.3.8-libgnome-desktop-soname.patch
#svn commit r4855
Patch11: beagle-0.3.8-category-crash.patch
+#gmime-2.4
+Patch12: beagle-0.3.8-gmime-2.4.patch
# Mono is not available on these arches
ExcludeArch: s390 s390x sparc64 ppc64
@@ -153,6 +155,7 @@
%patch9 -p1 -b .desktop-parser
%patch10 -p1 -b .gnome-desktop
%patch11 -p1 -b .category-crash
+%patch12 -p1 -b .gmime-2.4
%build
autoconf
@@ -344,6 +347,9 @@
%{_libdir}/pkgconfig/beagle*.pc
%changelog
+* Fri Dec 05 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.8-17
+- Update for gmime-2.4
+
* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.3.8-15
- Rebuild for Python 2.6
- Previous message (by thread): rpms/virt-df/devel virt-df-2.1.4-camlp4-parse.patch, NONE, 1.1 virt-df.spec, 1.7, 1.8
- Next message (by thread): rpms/gmp-ecm/devel gmp-ecm.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list