Re: [Evolution] Evolution + MAPI = too much hassle

[R Daly <daly ctc com>]

Suman Manjunath-2 wrote:
> You can remove the GLib 2.16 dependency if you apply the attached patch.
> :-)
>
> -Suman
>
> diff -Nupr
> evolution-mapi-provider-20080526.0/src/backends/calendar/e-cal-backend-mapi.c
> evolution-mapi-provider-20080526.0-mine/src/backends/calendar/e-cal-backend-mapi.c
> ---
> evolution-mapi-provider-20080526.0/src/backends/calendar/e-cal-backend-mapi.c
> 2008-05-26 11:25:13.000000000 +0530
> +++
> evolution-mapi-provider-20080526.0-mine/src/backends/calendar/e-cal-backend-mapi.c
> 2008-05-29 12:35:49.000000000 +0530
> @@ -20,7 +20,7 @@
>  
>  
>  #include <libecal/e-cal-time-util.h>
> -#include <gio/gio.h>
> +#include <libgnomevfs/gnome-vfs-utils.h>
>  
>  #include "e-cal-backend-mapi.h"
>  #include "e-cal-backend-mapi-utils.h"
> @@ -1618,7 +1618,7 @@ e_cal_backend_mapi_compute_changes (ECal
>       cache = cbmapi->priv->cache;
>  
>       /* FIXME Will this always work? */
> -     unescaped_uri = g_uri_unescape_string (cbmapi->priv->uri, "");
> +     unescaped_uri = gnome_vfs_unescape_string (cbmapi->priv->uri, "");
>       filename = g_strdup_printf ("%s-%s.db", unescaped_uri, change_id);
>       ehash = e_xmlhash_new (filename);
>       g_free (filename);
Yeah, that's my fault.  I didn't inspect the .spec file as I should have.  I
found that Patch5 was included for people not using Glib 2.16.

I modified evolution-mapi-provider.spec accordingly:

: server23 95#; diff -u evolution-mapi-provider.spec
evolution-mapi-provider.spec.ORIG 
--- evolution-mapi-provider.spec        2008-06-30 16:27:49.000000000 -0400
+++ evolution-mapi-provider.spec.ORIG   2008-06-30 17:18:01.000000000 -0400
@@ -11,12 +11,10 @@
 # norootforbuild
 %if 0%{?fedora_version}
 %if 0%{?fedora_version} == 9 || 0%{?fedora_version} == 8 ||
0%{?fedora_version} == 7
-BuildRequires: python popt popt-devel readline readline-devel pkgconfig
gnutls gnutls-devel e2fsprogs e2fsprogs-devel glibc-devel pam pam-devel
which redhat-rpm-config lynx elinks w3m
+BuildRequires: python popt popt-devel readline readline-devel pkgconfig
gnutls gnutls-devel e2fsprogs e2fsprogs-devel glibc-devel pam pam-devel
which perl-ExtUtils-MakeMaker redhat-rpm-config lynx elinks w3m
 %else
 BuildRequires: python popt popt-devel readline readline-devel pkgconfig
gnutls gnutls-devel e2fsprogs e2fsprogs-devel glibc-devel pam pam-devel
which redhat-rpm-config
 %endif
-%else if 0%{rhel_version}
-BuildRequires: python popt readline readline-devel pkgconfig gnutls
gnutls-devel e2fsprogs e2fsprogs-devel glibc-devel pam pam-devel which
redhat-rpm-config
 %endif
 
 Name:           evolution-mapi-provider
@@ -67,8 +65,6 @@
 %if 0%{?fedora_version} < 9
 %patch5 -p1
 %endif
-%else if 0%{rhel_version}
-%patch5 -p1
 %endif
 %if 0%{?suse_version} 
 %if 0%{?suse_version} <= 1030
-- 
View this message in context: 
http://www.nabble.com/Evolution-%2B-MAPI-%3D-too-much-hassle-tp16745245p18204633.html
Sent from the Gnome Evolution - General mailing list archive at Nabble.com.