From b4056174e430916b8c9e4c2aa0c9afad6c87c576 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Fri, 28 Mar 2008 22:05:03 +0000 Subject: [PATCH] Fix the build with the new eel API. Reported by: pointyhat via pav --- mail/mail-notification/Makefile | 1 + mail/mail-notification/files/patch-eel_fix | 66 ++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 mail/mail-notification/files/patch-eel_fix diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile index 8b054abcf594..f9b25c1a8035 100644 --- a/mail/mail-notification/Makefile +++ b/mail/mail-notification/Makefile @@ -7,6 +7,7 @@ PORTNAME= mail-notification DISTVERSION= 4.1 +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= mailnotify diff --git a/mail/mail-notification/files/patch-eel_fix b/mail/mail-notification/files/patch-eel_fix new file mode 100644 index 000000000000..bf2d48f6e718 --- /dev/null +++ b/mail/mail-notification/files/patch-eel_fix @@ -0,0 +1,66 @@ +--- src/mn-maildir-mailbox-backend.c.orig 2008-03-28 17:57:40.000000000 -0400 ++++ src/mn-maildir-mailbox-backend.c 2008-03-28 17:58:18.000000000 -0400 +@@ -163,7 +163,7 @@ ___2_mn_maildir_mailbox_backend_monitor_ + { + 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-03-28 17:58:56.000000000 -0400 ++++ src/mn-mh-mailbox-backend.c 2008-03-28 17:59:07.000000000 -0400 +@@ -155,7 +155,7 @@ ___2_mn_mh_mailbox_backend_monitor_cb (M + { + 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-03-28 17:59:36.000000000 -0400 ++++ src/mn-sylpheed-mailbox-backend.c 2008-03-28 17:59:48.000000000 -0400 +@@ -277,7 +277,7 @@ ___4_mn_sylpheed_mailbox_backend_monitor + { + char *filename; + +- filename = eel_uri_get_basename(info_uri); ++ filename = mn_vfs_uri_get_basename(info_uri); + if (filename) + { + if (! strcmp(filename, SYLPHEED_MARK_FILE)) +--- src/mn-vfs.c.orig 2008-03-28 18:00:14.000000000 -0400 ++++ src/mn-vfs.c 2008-03-28 18:01:22.000000000 -0400 +@@ -325,3 +325,21 @@ mn_vfs_get_local_path (GnomeVFSURI *uri) + + return path; + } ++ ++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-03-28 18:01:40.000000000 -0400 ++++ src/mn-vfs.h 2008-03-28 18:02:16.000000000 -0400 +@@ -52,4 +52,6 @@ GnomeVFSURI *mn_vfs_uri_append_file_suff + + char *mn_vfs_get_local_path (GnomeVFSURI *uri); + ++char *mn_vfs_uri_get_basename (const char *text_uri); ++ + #endif /* _MN_VFS_H */