Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=18a6341bcc7518d0151b4b27de965bb1dc6b2f1f
commit 18a6341bcc7518d0151b4b27de965bb1dc6b2f1f Author: James Buren <[email protected]> Date: Tue Mar 18 17:23:28 2014 -0500 beagle-0.3.9-3-x86_64 * remove package (depended on evolution-sharp) diff --git a/source/gnome-extra/beagle/Fix_gmime.diff b/source/gnome-extra/beagle/Fix_gmime.diff deleted file mode 100644 index 5a65251..0000000 --- a/source/gnome-extra/beagle/Fix_gmime.diff +++ /dev/null @@ -1,503 +0,0 @@ -Index: beagle/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs -=================================================================== ---- beagle/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs (revision 4874) -+++ beagle/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs (working copy) -@@ -333,28 +333,46 @@ - 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 @@ - } - - 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 (); - -Index: beagle/beagled/KMailQueryable/KMailIndexer.cs -=================================================================== ---- beagle/beagled/KMailQueryable/KMailIndexer.cs (revision 4874) -+++ beagle/beagled/KMailQueryable/KMailIndexer.cs (working copy) -@@ -407,28 +407,46 @@ - indexable.AddProperty (Property.NewUnsearched ("fixme:folder", folder_name)); - - GMime.InternetAddressList addrs; -- -- addrs = message.GetRecipients (GMime.Message.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) { -+ 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.NewKeyword ("fixme:sentTo", mailbox.Address)); -+ } -+ } -+ -+ addrs.Dispose (); - } -- addrs.Dispose (); -- -- addrs = message.GetRecipients (GMime.Message.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) { -+ 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.NewKeyword ("fixme:sentTo", mailbox.Address)); -+ } -+ } -+ -+ addrs.Dispose (); - } -- addrs.Dispose (); -- -- addrs = GMime.InternetAddressList.ParseString (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) { -+ 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.NewKeyword ("fixme:gotFrom", mailbox.Address)); -+ } -+ } -+ -+ addrs.Dispose (); - } -- addrs.Dispose (); -- -+ - if (folder_name == Queryable.SentMailFolderName) - indexable.AddProperty (Property.NewFlag ("fixme:isSent")); - else { -Index: beagle/beagled/ThunderbirdQueryable/ThunderbirdQueryable.cs -=================================================================== ---- beagle/beagled/ThunderbirdQueryable/ThunderbirdQueryable.cs (revision 4874) -+++ beagle/beagled/ThunderbirdQueryable/ThunderbirdQueryable.cs (working copy) -@@ -363,9 +363,14 @@ - 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); -+ recipients.Dispose (); -+ - return message; - } - -@@ -430,7 +435,7 @@ - - // We _know_ that the stream comes from a StreamReader, which uses UTF8 by - // default. So we use that here when parsing our string. -- return (str != null ? Encoding.UTF8.GetString (str, 0, pos) : string.Empty); -+ return (str != null ? System.Text.Encoding.UTF8.GetString (str, 0, pos) : string.Empty); - } - - // This spell "charset=" -@@ -458,7 +463,7 @@ - // instead of UTF-8 in some cases and that will really mess things up. - byte[] buffer = null; - int c, header_length = 0, newlines = 0, charset_pos = 0; -- Encoding enc = Encoding.UTF8; -+ System.Text.Encoding enc = System.Text.Encoding.UTF8; - try { - do { - c = stream.BaseStream.ReadByte (); -@@ -487,7 +492,7 @@ - stream.BaseStream.Read (buffer, 0, buffer.Length); - - // We need to use correct encoding -- enc = Encoding.GetEncoding (encoding_str); -+ enc = System.Text.Encoding.GetEncoding (encoding_str); - } catch { - } finally { - stream.Close (); -Index: beagle/beagled/GoogleBackends/GMailSearchDriver.cs -=================================================================== ---- beagle/beagled/GoogleBackends/GMailSearchDriver.cs (revision 4874) -+++ beagle/beagled/GoogleBackends/GMailSearchDriver.cs (working copy) -@@ -322,38 +322,47 @@ - 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)); - } - 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) -Index: beagle/configure.in -=================================================================== ---- beagle/configure.in (revision 4874) -+++ beagle/configure.in (working copy) -@@ -17,7 +17,7 @@ - NDESK_DBUS_REQUIRED=0.5.2 - NDESK_DBUS_GLIB_REQUIRED=0.3.0 - GTK_SHARP_REQUIRED=2.10.0 --GMIME_SHARP_REQUIRED=2.2.0 -+GMIME_SHARP_REQUIRED=2.3.5 - EVOLUTION_SHARP_REQUIRED=0.13.3 - GSF_SHARP_REQUIRED=0.6 - GTK_REQUIRED=2.10.0 -@@ -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 -Index: beagle/Filters/FilterMail.cs -=================================================================== ---- beagle/Filters/FilterMail.cs (revision 4874) -+++ beagle/Filters/FilterMail.cs (working copy) -@@ -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,34 +140,43 @@ - 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 @@ - 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 @@ - } - } else if (mime_part is GMime.Multipart) { - GMime.Multipart multipart = (GMime.Multipart) mime_part; -+ int num_parts = multipart.Count; - -- int num_parts = multipart.Number; -- - // 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 @@ - // 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 @@ - } 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 @@ - 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 --git a/source/gnome-extra/beagle/FrugalBuild b/source/gnome-extra/beagle/FrugalBuild deleted file mode 100644 index fad62df..0000000 --- a/source/gnome-extra/beagle/FrugalBuild +++ /dev/null @@ -1,96 +0,0 @@ -# Compiling time: 0.17 SBU -# Maintainer: bouleetbil <[email protected]> -# Contributor: AlexExtreme <[email protected]> - -pkgname=beagle -pkgver=0.3.9 -pkgrel=3 -pkgdesc="Search tool that ransacks your personal information space" -depends=('gecko-sharp' 'gmime>=2.4.3' 'libexif' 'sqlite3' 'libxscrnsaver' 'perl-xml-parser' \ - 'wv' 'gnome-sharp>=2.24.1-5' 'gsf-sharp' 'galago-sharp' 'gmime-sharp' 'dbus-sharp-glib' \ - 'taglib-sharp') -makedepends=('intltool' 'evolution-sharp>=0.18.0' 'thunderbird' \ - 'scrnsaverproto' 'zip') -backup=('etc/beagle/crawl-rules/crawl-applications' 'etc/beagle/crawl-rules/crawl-documentation' \ - 'etc/beagle/crawl-rules/crawl-executables' 'etc/beagle/crawl-rules/crawl-monodoc' \ - 'etc/beagle/crawl-rules/crawl-windows') -groups=('gnome-extra') -archs=('i686' 'x86_64') -_F_gnome_devel="y" -_F_gnome_desktop="y" -Finclude gnome mono gnome-scriptlet -install=$pkgname.install -url="http://beagle-project.org"; -source=($source Fix_gmime.diff beagle-0.3.9-sqlite.patch mono28.diff) -sha1sums=('5fdba6ffd4a210076a954cc22f5b940705b71a6e' \ - 'e2c63baaefc1a00af666854e604ae9084bada0d8' \ - 'b7a6357b7635a7ef78fa9667c55fce106b081f9a' \ - '1a31ce377fd1ac7391cf4312f0a1c321d889760c') - -subpkgs=("$pkgname-evolution" "$pkgname-thunderbird" "$pkgname-mozilla" "$pkgname-gui") -subdescs=('Beagle evolution bindings.' 'Beagle backend for thunderbird' 'Beagle extension for Mozilla' 'Desktop Search Application.') -subdepends=("evolution-sharp>=0.18.0" "thunderbird" "" "") -subrodepends=("" "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver") -subgroups=('gnome-extra' 'gnome-extra' 'gnome-extra' 'gnome-extra') -suboptions=('scriptlet' 'scriptlet' 'scriptlet' 'scriptlet') -subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64') -subinstall=("" "" "" "$_F_gnome_scriptlet") -Fconfopts="${Fconfopts[@]} --enable-inotify --disable-schemas-install --enable-thunderbird" - -#TODO this version doesn't support epiphany-2.24 when we bump it verifiy if that work and split it - -build() -{ - Fmonoexport - - Fcd - Fpatchall - Fautoreconf - Fsed 'ndesk-dbus' 'dbus-sharp' configure - Fsed 'ndesk-dbus-glib' 'dbus-sharp-glib' configure - find ./ -exec sed -i "s/NDesk.DBus/DBus/g" {} \; - Fmake - Fmakeinstall - #Fbuild - - # OnlyShowIn values so we don't get the Gnome GUI's showing in KDE - echo 'OnlyShowIn=GNOME;' >> $Fdestdir/usr/share/applications/beagle-search.desktop - echo 'OnlyShowIn=GNOME;' >> $Fdestdir/usr/share/applications/beagle-settings.desktop - - # Move autostart files to the correct location - Fmv /etc/xdg /usr/share/gnome - - # This is for the system-wide indexing - Fmkdir /var/cache/beagle - - # "Install" the Mozilla extension - Fmkdir /usr/share/doc/$pkgname-$pkgver/mozilla-extension - cp firefox-extension/beagle.xpi $Fdestdir/usr/share/doc/$pkgname-$pkgver/mozilla-extension/ || Fdie - cp firefox-extension/README $Fdestdir/usr/share/doc/$pkgname-$pkgver/mozilla-extension/ || Fdie - # "Install" the Thunderbird extension - Fmkdir /usr/share/doc/$pkgname-$pkgver/thunderbird-extension - cp thunderbird-extension/beagle.xpi $Fdestdir/usr/share/doc/$pkgname-$pkgver/thunderbird-extension/ || Fdie - - # Split out the packages - Fsplit $pkgname-evolution usr/lib/beagle/Backends/EvolutionBackends.* - - Fsplit $pkgname-thunderbird usr/lib/beagle/Backends/ThunderbirdBackends.* - Fsplit $pkgname-thunderbird usr/share/doc/$pkgname-$pkgver/thunderbird-extension - - Fsplit $pkgname-mozilla usr/share/doc/$pkgname-$pkgver/mozilla-extension - - Fsplit $pkgname-gui usr/bin/beagle-imlogviewer - Fsplit $pkgname-gui usr/bin/beagle-settings - Fsplit $pkgname-gui usr/bin/beagle-search - Fsplit $pkgname-gui usr/lib/pkgconfig/beagle-ui-0.0.pc - Fsplit $pkgname-gui usr/lib/beagle/ImLogViewer* - Fsplit $pkgname-gui usr/lib/beagle/Beagle.Search* - Fsplit $pkgname-gui usr/lib/beagle/Settings* - Fsplit $pkgname-gui usr/share/applications - - Fbuild_gnome_scriptlet - - Fmonocleanup -} - -# optimization OK diff --git a/source/gnome-extra/beagle/beagle-0.3.9-sqlite.patch b/source/gnome-extra/beagle/beagle-0.3.9-sqlite.patch deleted file mode 100644 index 1ae1136..0000000 --- a/source/gnome-extra/beagle/beagle-0.3.9-sqlite.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 59f63233908b8ccee70251f698351014546d5765 Mon Sep 17 00:00:00 2001 -From: Gabriel Burt <[email protected]> -Date: Thu, 07 Jan 2010 01:08:34 +0000 -Subject: Update to build against Mono.Data.Sqlite 2.x - ---- -diff --git a/Util/FSpotTools.cs b/beagle/Util/FSpotTools.cs -index 9470a0a..82f7752 100644 ---- a/Util/FSpotTools.cs -+++ b/Util/FSpotTools.cs -@@ -85,8 +85,12 @@ namespace Beagle.Util { - while (reader == null) { - try { - reader = command.ExecuteReader (); -- } catch (SqliteBusyException) { -- Thread.Sleep (50); -+ } catch (SqliteException e) { -+ if (e.ErrorCode == SQLiteErrorCode.Busy) { -+ Thread.Sleep (50); -+ } else { -+ throw; -+ } - } - } - reader.Close (); -diff --git a/beagled/SqliteUtils.cs b/beagle/beagled/SqliteUtils.cs -index f4be4c6..f747db5 100644 ---- a/beagled/SqliteUtils.cs -+++ b/beagled/SqliteUtils.cs -@@ -55,8 +55,13 @@ namespace Beagle.Util { - try { - ret = command.ExecuteNonQuery (); - break; -- } catch (SqliteBusyException ex) { -- Thread.Sleep (50); -+ } catch (SqliteException ex) { -+ if (ex.ErrorCode == SQLiteErrorCode.Busy) { -+ Thread.Sleep (50); -+ } else { -+ Log.Error (ex, "SQL that caused the exception: {0}", command_text); -+ throw; -+ } - } catch (Exception e) { - Log.Error (e, "SQL that caused the exception: {0}", command_text); - throw; -@@ -79,8 +84,13 @@ namespace Beagle.Util { - try { - ret = command.ExecuteNonQuery (); - break; -- } catch (SqliteBusyException ex) { -- Thread.Sleep (50); -+ } catch (SqliteException ex) { -+ if (ex.ErrorCode == SQLiteErrorCode.Busy) { -+ Thread.Sleep (50); -+ } else { -+ Log.Error (ex, "SQL that caused the exception: {0}", command.CommandText); -+ throw; -+ } - } catch (Exception e) { - Log.Error ( e, "SQL that caused the exception: {0}", command.CommandText); - throw; -@@ -96,8 +106,12 @@ namespace Beagle.Util { - while (reader == null) { - try { - reader = command.ExecuteReader (); -- } catch (SqliteBusyException ex) { -- Thread.Sleep (50); -+ } catch (SqliteException ex) { -+ if (ex.ErrorCode == SQLiteErrorCode.Busy) { -+ Thread.Sleep (50); -+ } else { -+ throw; -+ } - } - } - return reader; -@@ -108,8 +122,12 @@ namespace Beagle.Util { - while (true) { - try { - return reader.Read (); -- } catch (SqliteBusyException ex) { -- Thread.Sleep (50); -+ } catch (SqliteException ex) { -+ if (ex.ErrorCode == SQLiteErrorCode.Busy) { -+ Thread.Sleep (50); -+ } else { -+ throw; -+ } - } - } - } --- -cgit v0.8.3.1 diff --git a/source/gnome-extra/beagle/beagle.install b/source/gnome-extra/beagle/beagle.install deleted file mode 100644 index bcddec0..0000000 --- a/source/gnome-extra/beagle/beagle.install +++ /dev/null @@ -1,40 +0,0 @@ -post_install() { - if ! grep -q 'beagleindex' /etc/group; then - /usr/sbin/groupadd -g 44 beagleindex 2>/dev/null - /usr/sbin/useradd -s /bin/false -c "Beagle daemon system user" -d /var/cache/beagle -u 44 -g beagleindex beagleindex 2>/dev/null - fi - - mkdir -p /var/cache/beagle/indexes - chown -R beagleindex:beagleindex /var/cache/beagle/indexes/ - - cat << 'EOM' -==> Remember to enable extended attributes on the partitions you wish to index. - -> This can be done by adding the user_xattr mount option in /etc/fstab. - -> To activate it on a running system, run: mount -o remount <mount point> -EOM -} - -post_upgrade() -{ - if ! grep -q 'beagleindex' /etc/group; then - /usr/sbin/groupadd -g 44 beagleindex 2>/dev/null - /usr/sbin/useradd -s /bin/false -c "Beagle daemon system user" -d /var/cache/beagle -u 44 -g beagleindex beagleindex 2>/dev/null - fi - - mkdir -p /var/cache/beagle/indexes - chown -R beagleindex:beagleindex /var/cache/beagle/indexes/ -} - -pre_remove() -{ - # Could be already removed - if grep -q 'beagleindex' /etc/group; then - /usr/sbin/userdel beagleindex 2>/dev/null - /usr/sbin/groupdel beagleindex 2>/dev/null - fi - rm -rf /var/cache/beagle/indexes -} - -op=$1 -shift -$op $* diff --git a/source/gnome-extra/beagle/mono28.diff b/source/gnome-extra/beagle/mono28.diff deleted file mode 100644 index 5032434..0000000 --- a/source/gnome-extra/beagle/mono28.diff +++ /dev/null @@ -1,152 +0,0 @@ -Patch to enable compilation against mono-2.8 - -* Mono-2.8 uses mono-2.pc instead of mono.pc for setting cflags and libs. -* Mono-2.8 disables direct access to struct MonoType fields; use accessors -instead (mono_type_get_type and mono_field_get_flags have been present in -the API since at least mono-1.2, so we do not need any version ifdefs). -* Cast FSpot.MetadataStore to IEnumerable in foreach() to prevent CS1640 -errors (non-unique enumeration of the type) with mono-2.8's gmcs. - -diff -ru beagle-0.3.9-orig/configure.in beagle-0.3.9/configure.in ---- beagle-0.3.9-orig/configure.in 2010-10-16 01:30:03.807825004 -0400 -+++ beagle-0.3.9/configure.in 2010-10-16 01:30:10.385825003 -0400 -@@ -59,11 +59,20 @@ - AC_MSG_ERROR([You need to install the Mono gmcs compiler]) - fi - --AC_MSG_CHECKING([for mono.pc]) --if test -z `$PKG_CONFIG --variable=prefix mono`; then -- AC_MSG_ERROR([missing the mono.pc file, usually found in the mono-devel package]) -+# mono-2.8 and higher uses mono-2.pc instead of mono.pc for cflags and libs -+AC_MSG_CHECKING([for mono-2.pc]) -+if test -z `$PKG_CONFIG --variable=prefix mono-2`; then -+ AC_MSG_RESULT([not found]) -+ AC_MSG_CHECKING([for mono.pc]) -+ if test -z `$PKG_CONFIG --variable=prefix mono`; then -+ AC_MSG_ERROR([missing the mono.pc file, usually found in the mono-devel package]) -+ else -+ AC_MSG_RESULT([found]) -+ mono_pc=mono -+ fi - else - AC_MSG_RESULT([found]) -+ mono_pc=mono-2 - fi - - BEAGLE_DEFINES="" -@@ -71,10 +80,10 @@ - # check that we have the require version of mono - - # Temporary: check for mono-1.9 --PKG_CHECK_MODULES(MONO, mono >= 1.9, mono_1_9=yes, mono_1_9=no) -+PKG_CHECK_MODULES(MONO, $mono_pc >= 1.9, mono_1_9=yes, mono_1_9=no) - if test "x$mono_1_9" = "xno"; then - AC_MSG_RESULT([missing mono >= 1.9. Searching for mono >= 1.2.4]) -- PKG_CHECK_MODULES(MONO, mono >= $MONO_REQUIRED) -+ PKG_CHECK_MODULES(MONO, $mono_pc >= $MONO_REQUIRED) - else - AC_MSG_RESULT([found mono >= 1.9]) - BEAGLE_DEFINES="$BEAGLE_DEFINES -define:MONO_1_9" -@@ -84,7 +93,7 @@ - needed_dlls="Mono.Data.Sqlite Mono.Posix System.Data System.Web ICSharpCode.SharpZipLib" - for i in $needed_dlls; do - AC_MSG_CHECKING([for $i.dll]) -- if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll; then -+ if test ! -e `$PKG_CONFIG --variable=prefix $mono_pc`/lib/mono/2.0/$i.dll; then - AC_MSG_ERROR([missing required mono DLL: $i.dll]) - else - AC_MSG_RESULT([found]) -@@ -195,7 +204,7 @@ - if test "x$enable_google" = "xyes"; then - i="System.Security" - AC_MSG_CHECKING([for $i.dll (needed by Google backends)]) -- if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll; then -+ if test ! -e `$PKG_CONFIG --variable=prefix $mono_pc`/lib/mono/2.0/$i.dll; then - AC_MSG_ERROR([missing required mono DLL: $i.dll]) - else - AC_MSG_RESULT([found]) -@@ -560,7 +569,7 @@ - if test "x$enable_qt" != "xno" -a "x$has_qyoto" = "xno"; then - i="qt-dotnet" - AC_MSG_CHECKING([for $i.dll]) -- if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll; then -+ if test ! -e `$PKG_CONFIG --variable=prefix $mono_pc`/lib/mono/2.0/$i.dll; then - AC_MSG_ERROR([missing required mono DLL: $i.dll]) - else - AC_MSG_RESULT([found]) -Only in beagle-0.3.9: configure.in.orig -diff -ru beagle-0.3.9-orig/Filters/FilterImage.cs beagle-0.3.9/Filters/FilterImage.cs ---- beagle-0.3.9-orig/Filters/FilterImage.cs 2008-04-13 15:24:13.000000000 -0400 -+++ beagle-0.3.9/Filters/FilterImage.cs 2010-10-16 02:08:10.755825005 -0400 -@@ -141,7 +141,7 @@ - Resource rights_anon = null; - Resource title_anon = null; - -- foreach (Statement stmt in xmp.Store) { -+ foreach (Statement stmt in (IEnumerable)xmp.Store) { - if (stmt.Predicate == MetadataStore.Namespaces.Resolve ("dc:subject")) { - //Console.WriteLine ("found subject"); - subject_anon = stmt.Object; -@@ -163,7 +163,7 @@ - } - } - -- foreach (Statement stmt in xmp.Store) { -+ foreach (Statement stmt in (IEnumerable)xmp.Store) { - if (stmt.Subject == subject_anon && - stmt.Predicate != MetadataStore.Namespaces.Resolve ("rdf:type")) { - AddProperty (Beagle.Property.New ("dc:subject", ((Literal)stmt.Object).Value)); -diff -ru beagle-0.3.9-orig/Filters/FilterPdf.cs beagle-0.3.9/Filters/FilterPdf.cs ---- beagle-0.3.9-orig/Filters/FilterPdf.cs 2008-04-13 15:31:18.000000000 -0400 -+++ beagle-0.3.9/Filters/FilterPdf.cs 2010-10-16 02:22:09.528825003 -0400 -@@ -8,6 +8,7 @@ - // - - using System; -+using System.Collections; - using System.IO; - using System.Diagnostics; - -@@ -220,7 +221,7 @@ - Resource rights_anon = null; - Resource title_anon = null; - -- foreach (Statement stmt in xmp.Store) { -+ foreach (Statement stmt in (IEnumerable)xmp.Store) { - if (stmt.Predicate == MetadataStore.Namespaces.Resolve ("dc:subject")) { - //Console.WriteLine ("found subject"); - subject_anon = stmt.Object; -@@ -239,7 +240,7 @@ - } - } - -- foreach (Statement stmt in xmp.Store) { -+ foreach (Statement stmt in (IEnumerable)xmp.Store) { - if (stmt.Subject == subject_anon && - stmt.Predicate != MetadataStore.Namespaces.Resolve ("rdf:type")) { - AddProperty (Beagle.Property.New ("dc:subject", ((Literal)stmt.Object).Value)); -diff -ru beagle-0.3.9-orig/glue/mono-glue.c beagle-0.3.9/glue/mono-glue.c ---- beagle-0.3.9-orig/glue/mono-glue.c 2007-11-26 20:50:05.000000000 -0500 -+++ beagle-0.3.9/glue/mono-glue.c 2010-10-16 01:04:19.839825010 -0400 -@@ -79,18 +79,18 @@ - type = mono_class_get_type (klass); - - /* This is an array, so drill down into it */ -- if (type->type == MONO_TYPE_SZARRAY) -+ if (mono_type_get_type (type) == MONO_TYPE_SZARRAY) - total += memory_usage_array ((MonoArray *) obj, visited); - - while ((field = mono_class_get_fields (klass, &iter)) != NULL) { - MonoType *ftype = mono_field_get_type (field); - gpointer value; - -- if ((ftype->attrs & (FIELD_ATTRIBUTE_STATIC | FIELD_ATTRIBUTE_HAS_FIELD_RVA)) != 0) -+ if ((mono_field_get_flags (field) & (FIELD_ATTRIBUTE_STATIC | FIELD_ATTRIBUTE_HAS_FIELD_RVA)) != 0) - continue; - - /* FIXME: There are probably other types we need to drill down into */ -- switch (ftype->type) { -+ switch (mono_type_get_type (ftype)) { - - case MONO_TYPE_CLASS: - case MONO_TYPE_OBJECT: _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
