Add patch from upstream to work around API instability of eel.

3 files changed, 77 insertions, 3 deletions

diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index f26d9631f0f..f22e29e58b8 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2008/03/06 14:53:51 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2008/05/21 16:13:46 gdt Exp $
 #
 
 DISTNAME=	mail-notification-5.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://savannah.nongnu.org/download/mailnotify/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/mail-notification/distinfo b/mail/mail-notification/distinfo
index de7643c10cb..a3deac392ad 100644
--- a/mail/mail-notification/distinfo
+++ b/mail/mail-notification/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.11 2008/02/21 00:16:53 gdt Exp $
+$NetBSD: distinfo,v 1.12 2008/05/21 16:13:46 gdt Exp $
 
 SHA1 (mail-notification-5.0.tar.bz2) = d43c070957c60d0ffd975475ae1c27c29dd83764
 RMD160 (mail-notification-5.0.tar.bz2) = a24c6a02844ef01c8a8be026a78e4c061c2275f5
 Size (mail-notification-5.0.tar.bz2) = 774039 bytes
 SHA1 (patch-aa) = 648bea57e01de4dc36d6c4715aa47de9fb53d3cd
+SHA1 (patch-ab) = 9b5d4620c77e75f0d5916f298323c730781ef374
 SHA1 (patch-af) = 0d3f3931e574ff97b48bc3cc725b4bc00cb9ded4
diff --git a/mail/mail-notification/patches/patch-ab b/mail/mail-notification/patches/patch-ab
new file mode 100644
index 00000000000..5ee2c041822
--- /dev/null
+++ b/mail/mail-notification/patches/patch-ab
@@ -0,0 +1,73 @@
+$NetBSD: patch-ab,v 1.3 2008/05/21 16:13:46 gdt Exp $
+
+This patch is from upstream, at
+  http://launchpadlibrarian.net/11684452/mail-notification-5.0-eelfix.diff
+referenced from
+  https://bugs.launchpad.net/mail-notification/+bug/180400
+
+--- src/mn-maildir-mailbox-backend.c.orig	2008-01-04 17:03:57.000000000 +0100
++++ src/mn-maildir-mailbox-backend.c	2008-01-31 20:47:10.000000000 +0100
+@@ -161,7 +161,7 @@
+       {
+ 	char *filename;
+ 
+-	filename = eel_uri_get_basename(info_uri);
++	filename = mn_vfs_uri_get_basename(info_uri);
+ 	if (filename)
+ 	  {
+ 	    if (filename[0] != '.')
+--- src/mn-mh-mailbox-backend.c.orig	2008-01-04 17:03:57.000000000 +0100
++++ src/mn-mh-mailbox-backend.c	2008-01-31 20:46:49.000000000 +0100
+@@ -191,7 +191,7 @@
+       {
+ 	char *filename;
+ 
+-	filename = eel_uri_get_basename(info_uri);
++	filename = mn_vfs_uri_get_basename(info_uri);
+ 	if (filename)
+ 	  {
+ 	    if (! strcmp(filename, SEQUENCES_FILE) || mn_str_isnumeric(filename))
+--- src/mn-sylpheed-mailbox-backend.c.orig	2008-01-04 17:03:58.000000000 +0100
++++ src/mn-sylpheed-mailbox-backend.c	2008-01-31 20:46:57.000000000 +0100
+@@ -180,7 +180,7 @@
+       {
+ 	char *filename;
+ 
+-	filename = eel_uri_get_basename(info_uri);
++	filename = mn_vfs_uri_get_basename(info_uri);
+ 	if (filename)
+ 	  {
+ 	    /*
+--- src/mn-vfs.c.orig	2008-01-04 16:40:15.000000000 +0100
++++ src/mn-vfs.c	2008-01-31 20:45:31.000000000 +0100
+@@ -335,3 +335,21 @@
+   g_set_error(err, 0, 0, "%s", gnome_vfs_result_to_string(result));
+   return FALSE;
+ }
++
++char *
++mn_vfs_uri_get_basename (const char *text_uri)
++{
++  GnomeVFSURI *uri;
++  char *name;
++
++  g_return_val_if_fail(text_uri != NULL, NULL);
++
++  uri = gnome_vfs_uri_new(text_uri);
++  if (! uri)
++    return NULL;
++
++  name = gnome_vfs_uri_extract_short_name(uri);
++  gnome_vfs_uri_unref(uri);
++
++  return name;
++}
+--- src/mn-vfs.h.orig	2008-01-04 16:40:16.000000000 +0100
++++ src/mn-vfs.h	2008-01-31 20:45:42.000000000 +0100
+@@ -54,4 +54,6 @@
+ 
+ gboolean mn_vfs_result_to_g_error (GnomeVFSResult result, GError **err);
+ 
++char *mn_vfs_uri_get_basename (const char *text_uri);
++
+ #endif /* _MN_VFS_H */