[Pkg-cli-apps-commits] r5285 - in /packages/beagle/trunk/debian: changelog patches/00list patches/link_gmime2.4.dpatch
meebey at users.alioth.debian.org
meebey at users.alioth.debian.org
Sat Jan 30 20:00:27 UTC 2010
Author: meebey
Date: Sat Jan 30 20:00:20 2010
New Revision: 5285
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=5285
Log:
* debian/patches/link_gmime2.4.dpatch:
+ Ported Beagle to GMime 2.4
Added:
packages/beagle/trunk/debian/patches/link_gmime2.4.dpatch (with props)
Modified:
packages/beagle/trunk/debian/changelog
packages/beagle/trunk/debian/patches/00list
Modified: packages/beagle/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/changelog?rev=5285&op=diff
==============================================================================
--- packages/beagle/trunk/debian/changelog (original)
+++ packages/beagle/trunk/debian/changelog Sat Jan 30 20:00:20 2010
@@ -1,6 +1,6 @@
beagle (0.3.9-4) UNRELEASED; urgency=low
- NOT YET FINISHED (check gmime2.4)
+ [ Iain Lane ]
* debian/control:
+ Bump mono-devel build-dep to >= 2.4.3 and remove all build-depends on
packages now provided transitively by mono-devel.
@@ -14,7 +14,11 @@
* debian/rules: Make get-orig-source policy conformant (download to current
dir)
- -- Iain Lane <laney at ubuntu.com> Fri, 29 Jan 2010 14:53:50 +0000
+ [ Mirco Bauer ]
+ * debian/patches/link_gmime2.4.dpatch:
+ + Ported Beagle to GMime 2.4
+
+ -- Mirco Bauer <meebey at debian.org> Sat, 30 Jan 2010 20:59:29 +0100
beagle (0.3.9-3) unstable; urgency=low
Modified: packages/beagle/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/patches/00list?rev=5285&op=diff
==============================================================================
--- packages/beagle/trunk/debian/patches/00list (original)
+++ packages/beagle/trunk/debian/patches/00list Sat Jan 30 20:00:20 2010
@@ -1,4 +1,5 @@
fix_build_system
+link_gmime2.4
beagle_secure_scripts
crawl-rules
icedove
Added: packages/beagle/trunk/debian/patches/link_gmime2.4.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/patches/link_gmime2.4.dpatch?rev=5285&op=file
==============================================================================
--- packages/beagle/trunk/debian/patches/link_gmime2.4.dpatch (added)
+++ packages/beagle/trunk/debian/patches/link_gmime2.4.dpatch Sat Jan 30 20:00:20 2010
@@ -1,0 +1,270 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## link_gmime2.4.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad beagle-0.3.9~/Filters/FilterMail.cs beagle-0.3.9/Filters/FilterMail.cs
+--- beagle-0.3.9~/Filters/FilterMail.cs 2010-01-30 20:51:20.000000000 +0100
++++ beagle-0.3.9/Filters/FilterMail.cs 2010-01-30 20:52:15.000000000 +0100
+@@ -126,7 +126,7 @@
+
+ // 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,33 +140,33 @@
+ 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.InternetAddressGroup))
++ AddProperty (Property.New ("fixme:to_address", ia.ToString()));
+
+ 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.InternetAddressGroup))
++ AddProperty (Property.New ("fixme:cc_address", ia.ToString()));
+
+ 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 (GMime.Utils.HeaderDecodePhrase (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.InternetAddressGroup))
++ AddProperty (Property.New ("fixme:from_address", ia.ToString()));
+
+ AddProperty (Property.New ("fixme:from_name", ia.Name));
+ AddEmailLink (ia);
+@@ -184,7 +184,7 @@
+ 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)
+@@ -346,15 +346,15 @@
+ } 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 +370,7 @@
+ // 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 +400,7 @@
+ } 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 +473,7 @@
+ 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);
+diff -urNad beagle-0.3.9~/beagled/GoogleBackends/GMailSearchDriver.cs beagle-0.3.9/beagled/GoogleBackends/GMailSearchDriver.cs
+--- beagle-0.3.9~/beagled/GoogleBackends/GMailSearchDriver.cs 2010-01-30 20:51:20.000000000 +0100
++++ beagle-0.3.9/beagled/GoogleBackends/GMailSearchDriver.cs 2010-01-30 20:51:24.000000000 +0100
+@@ -322,38 +322,38 @@
+ 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.InternetAddressGroup))
++ hit.AddProperty (Property.New ("fixme:to_address", ia.ToString()));
+
+ 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.InternetAddressGroup))
++ hit.AddProperty (Property.New ("fixme:cc_address", ia.ToString()));
+
+ hit.AddProperty (Property.New ("fixme:cc_name", ia.Name));
+ }
+ addrs.Dispose ();
+
+- addrs = GMime.InternetAddressList.ParseString (GMime.Utils.HeaderDecodePhrase (message.Sender));
++ addrs = GMime.InternetAddressList.Parse (GMime.Utils.HeaderDecodePhrase (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.InternetAddressGroup))
++ hit.AddProperty (Property.New ("fixme:from_address", ia.ToString()));
+
+ hit.AddProperty (Property.New ("fixme:from_name", ia.Name));
+ }
+ addrs.Dispose ();
+
+ foreach (GMime.References refs in message.References)
+- hit.AddProperty (Property.NewUnsearched ("fixme:reference", refs.Msgid));
++ hit.AddProperty (Property.NewUnsearched ("fixme:reference", refs.MessageId));
+
+ string list_id = message.GetHeader ("List-Id");
+ if (list_id != null)
+diff -urNad beagle-0.3.9~/beagled/KMailQueryable/KMailIndexer.cs beagle-0.3.9/beagled/KMailQueryable/KMailIndexer.cs
+--- beagle-0.3.9~/beagled/KMailQueryable/KMailIndexer.cs 2010-01-30 20:51:20.000000000 +0100
++++ beagle-0.3.9/beagled/KMailQueryable/KMailIndexer.cs 2010-01-30 20:51:24.000000000 +0100
+@@ -408,24 +408,24 @@
+
+ GMime.InternetAddressList addrs;
+
+- addrs = message.GetRecipients (GMime.Message.RecipientType.To);
++ addrs = message.GetRecipients (GMime.RecipientType.To);
+ foreach (GMime.InternetAddress ia in addrs) {
+- if (folder_name == Queryable.SentMailFolderName && ia.AddressType != GMime.InternetAddressType.Group)
+- indexable.AddProperty (Property.NewKeyword ("fixme:sentTo", ia.Addr));
++ if (folder_name == Queryable.SentMailFolderName && !(ia is GMime.InternetAddressGroup))
++ indexable.AddProperty (Property.NewKeyword ("fixme:sentTo", ia.ToString()));
+ }
+ addrs.Dispose ();
+
+- addrs = message.GetRecipients (GMime.Message.RecipientType.Cc);
++ addrs = message.GetRecipients (GMime.RecipientType.Cc);
+ foreach (GMime.InternetAddress ia in addrs) {
+- if (folder_name == Queryable.SentMailFolderName && ia.AddressType != GMime.InternetAddressType.Group)
+- indexable.AddProperty (Property.NewKeyword ("fixme:sentTo", ia.Addr));
++ if (folder_name == Queryable.SentMailFolderName && !(ia is GMime.InternetAddressGroup))
++ indexable.AddProperty (Property.NewKeyword ("fixme:sentTo", ia.ToString()));
+ }
+ addrs.Dispose ();
+
+- addrs = GMime.InternetAddressList.ParseString (GMime.Utils.HeaderDecodePhrase (message.Sender));
++ addrs = GMime.InternetAddressList.Parse (GMime.Utils.HeaderDecodePhrase (message.Sender));
+ foreach (GMime.InternetAddress ia in addrs) {
+- if (folder_name != Queryable.SentMailFolderName && ia.AddressType != GMime.InternetAddressType.Group)
+- indexable.AddProperty (Property.NewKeyword ("fixme:gotFrom", ia.Addr));
++ if (folder_name != Queryable.SentMailFolderName && !(ia is GMime.InternetAddressGroup))
++ indexable.AddProperty (Property.NewKeyword ("fixme:gotFrom", ia.ToString()));
+ }
+ addrs.Dispose ();
+
+diff -urNad beagle-0.3.9~/beagled/ThunderbirdQueryable/ThunderbirdQueryable.cs beagle-0.3.9/beagled/ThunderbirdQueryable/ThunderbirdQueryable.cs
+--- beagle-0.3.9~/beagled/ThunderbirdQueryable/ThunderbirdQueryable.cs 2010-01-30 20:51:20.000000000 +0100
++++ beagle-0.3.9/beagled/ThunderbirdQueryable/ThunderbirdQueryable.cs 2010-01-30 20:51:24.000000000 +0100
+@@ -35,6 +35,7 @@
+ using Mono.Unix.Native;
+ using GMime;
+ using Mime = GMime.Utils;
++using Encoding = System.Text.Encoding;
+
+ [assembly: Beagle.Daemon.IQueryableTypes (typeof (Beagle.Daemon.ThunderbirdQueryable.ThunderbirdQueryable))]
+
+@@ -367,8 +368,12 @@
+ message.Subject = Mime.HeaderDecodeText (GetText (document, "Subject"));
+ message.Sender = Mime.HeaderDecodePhrase (GetText (document, "Author"));
+ message.MessageId = GetText (document, "MessageId");
+- message.SetDate (DateTimeUtil.UnixToDateTimeUtc (Convert.ToInt64 (GetText (document, "Date"))), 0);
+- message.AddRecipientsFromString ("To", Mime.HeaderDecodePhrase (GetText (document, "Recipients")));
++ message.Date = DateTimeUtil.UnixToDateTimeUtc (Convert.ToInt64 (GetText (document, "Date")));
++
++ string str = GetText (document, "Recipients");
++ GMime.InternetAddressList recipients = GMime.InternetAddressList.Parse (str);
++ foreach (GMime.InternetAddress ia in recipients)
++ message.To.Add (ia);
+
+ return message;
+ }
+diff -urNad beagle-0.3.9~/configure.in beagle-0.3.9/configure.in
+--- beagle-0.3.9~/configure.in 2010-01-30 20:51:24.000000000 +0100
++++ beagle-0.3.9/configure.in 2010-01-30 20:51:24.000000000 +0100
+@@ -223,7 +223,7 @@
+ glade-sharp-2.0 >= $GTK_SHARP_REQUIRED
+ gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED
+ gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED
+- gmime-sharp >= $GMIME_SHARP_REQUIRED
++ gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED
+ ])
+ AC_SUBST(BEAGLE_UI_LIBS)
+
+@@ -270,7 +270,7 @@
+ evolution-sharp >= $EVOLUTION_SHARP_REQUIRED \
+ gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED \
+ glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
+- gmime-sharp >= $GMIME_SHARP_REQUIRED,
++ gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED,
+ have_evo_dependencies=yes, have_evo_dependencies=no)
+ AC_SUBST(EVO_LIBS)
+
+@@ -377,14 +377,14 @@
+ PKG_CHECK_MODULES(BEAGLED,
+ [
+ shared-mime-info
+- gmime-sharp >= $GMIME_SHARP_REQUIRED
++ gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED
+ glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
+ ])
+ BEAGLED_LIBS="$BEAGLED_LIBS $GSF_SHARP_LIBS"
+ AC_SUBST(BEAGLED_LIBS)
+
+ GSF_SHARP_PREFIX=`$PKG_CONFIG --variable=prefix gsf-sharp`
+-GMIME_SHARP_PREFIX=`$PKG_CONFIG --variable=prefix gmime-sharp`
++GMIME_SHARP_PREFIX=`$PKG_CONFIG --variable=prefix gmime-sharp-2.4`
+
+ dnl ----------------------------------------------
+ dnl Epiphany Extension
Propchange: packages/beagle/trunk/debian/patches/link_gmime2.4.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-cli-apps-commits
mailing list