patch to build eds against latest glib

[Larry Reaves]

There was a glib commit (git.gnome.org/glib
4c791f49e58688d1b8948d083c1780cab9d26e93) on the 18th that adds
reference counting to GMappedFile, and deprecates g_mapped_file_free,
replacing it with g_mapped_file_unref.  The attached patch replaces each
call to g_mapped_file_free with g_mapped_file unref.  Of course, eds
won't build with this patch without the very latest glib ;).

-Larry Reaves

[0001-Update-g_mapped_file_free-calls-to-g_mapped_file_unr.patch]

---

From d7e0f4a16757a2e75df447fa98a5a8ff5af51cfe Mon Sep 17 00:00:00 2001
From: Larry Reaves <larry@...>
Date: Fri, 19 Jun 2009 01:44:49 -0400
Subject: [PATCH] Update g_mapped_file_free calls to g_mapped_file_unref to keep up with glib

---
 calendar/backends/file/e-cal-backend-file.c        |    2 +-
 calendar/backends/google/e-cal-backend-google.c    |    2 +-
 .../backends/groupwise/e-cal-backend-groupwise.c   |    2 +-
 libedataserver/e-xml-utils.c                       |    2 +-
 libedataserver/md5-utils.c                         |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/calendar/backends/file/e-cal-backend-file.c b/calendar/backends/file/e-cal-backend-file.c
index 29284f7..4ac3572 100644
--- a/calendar/backends/file/e-cal-backend-file.c
+++ b/calendar/backends/file/e-cal-backend-file.c
@@ -2510,7 +2510,7 @@ fetch_attachments (ECalBackendSync *backend, ECalComponent *comp)
  g_message ("DEBUG: attachment write failed.\n");
  }
 
- g_mapped_file_free (mapped_file);
+ g_mapped_file_unref (mapped_file);
  if (fd != -1)
  close (fd);
  dest_url = g_filename_to_uri (dest_file, NULL, NULL);
diff --git a/calendar/backends/google/e-cal-backend-google.c b/calendar/backends/google/e-cal-backend-google.c
index 845d6d3..1d8624a 100644
--- a/calendar/backends/google/e-cal-backend-google.c
+++ b/calendar/backends/google/e-cal-backend-google.c
@@ -523,7 +523,7 @@ fetch_attachments (ECalBackendGoogle *cbgo, ECalComponent *comp)
  g_message ("DEBUG: attachment write failed.\n");
  }
 
- g_mapped_file_free (mapped_file);
+ g_mapped_file_unref (mapped_file);
  if (fd != -1)
  close (fd);
  dest_url = g_filename_to_uri (dest_file, NULL, NULL);
diff --git a/calendar/backends/groupwise/e-cal-backend-groupwise.c b/calendar/backends/groupwise/e-cal-backend-groupwise.c
index aec0661..a2c46da 100644
--- a/calendar/backends/groupwise/e-cal-backend-groupwise.c
+++ b/calendar/backends/groupwise/e-cal-backend-groupwise.c
@@ -2449,7 +2449,7 @@ fetch_attachments (ECalBackendGroupwise *cbgw, ECalComponent *comp)
  g_message ("DEBUG: attachment write failed.\n");
  }
 
- g_mapped_file_free (mapped_file);
+ g_mapped_file_unref (mapped_file);
  if (fd != -1)
  close (fd);
  dest_url = g_filename_to_uri (dest_file, NULL, NULL);
diff --git a/libedataserver/e-xml-utils.c b/libedataserver/e-xml-utils.c
index 8901ce3..525627f 100644
--- a/libedataserver/e-xml-utils.c
+++ b/libedataserver/e-xml-utils.c
@@ -50,7 +50,7 @@ e_xml_parse_file (const gchar *filename)
  if (mapped_file) {
  result = xmlParseMemory (g_mapped_file_get_contents (mapped_file),
  g_mapped_file_get_length (mapped_file));
- g_mapped_file_free (mapped_file);
+ g_mapped_file_unref (mapped_file);
  }
  return result;
 }
diff --git a/libedataserver/md5-utils.c b/libedataserver/md5-utils.c
index 4ef3780..fee9e7b 100644
--- a/libedataserver/md5-utils.c
+++ b/libedataserver/md5-utils.c
@@ -362,5 +362,5 @@ md5_get_digest_from_file (const gchar *filename, guchar digest[16])
 
  md5_get_digest (contents, length, digest);
 
- g_mapped_file_free (mapped_file);
+ g_mapped_file_unref (mapped_file);
 }
--
1.6.0.4

---

_______________________________________________
Evolution-patches mailing list
Evolution-patches@...
http://mail.gnome.org/mailman/listinfo/evolution-patches

[Suman Manjunath-2]

On Fri, Jun 19, 2009 at 11:26, Larry Reaves<larry@...> wrote:
> There was a glib commit (git.gnome.org/glib
> 4c791f49e58688d1b8948d083c1780cab9d26e93) on the 18th that adds
> reference counting to GMappedFile, and deprecates g_mapped_file_free,
> replacing it with g_mapped_file_unref.  The attached patch replaces each
> call to g_mapped_file_free with g_mapped_file unref.  Of course, eds
> won't build with this patch without the very latest glib ;).

which implies your patch gotta wait ;-)

-Suman
_______________________________________________
Evolution-patches mailing list
Evolution-patches@...
http://mail.gnome.org/mailman/listinfo/evolution-patches

[Matthew Barnes]

On Fri, 2009-06-19 at 01:56 -0400, Larry Reaves wrote:
> There was a glib commit (git.gnome.org/glib
> 4c791f49e58688d1b8948d083c1780cab9d26e93) on the 18th that adds
> reference counting to GMappedFile, and deprecates g_mapped_file_free,
> replacing it with g_mapped_file_unref.  The attached patch replaces each
> call to g_mapped_file_free with g_mapped_file unref.  Of course, eds
> won't build with this patch without the very latest glib ;).

Interim workarounds committed:

http://git.gnome.org/cgit/gtkhtml/commit/?id=2f5786fefbbf350359d60977ea4033da03203f3d

http://git.gnome.org/cgit/evolution-data-server/commit/?id=440cf63332708e09cc8a5fbcdcec32fa52d59ad2

http://git.gnome.org/cgit/evolution-mapi/commit/?id=94809815f679e9df93822aa2b810b730d654a29e

Matthew Barnes


_______________________________________________
Evolution-patches mailing list
Evolution-patches@...
http://mail.gnome.org/mailman/listinfo/evolution-patches