From 4acc6fb2a411b291c9c210d82bafe7c62e71c77d Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Wed, 24 Oct 2007 23:37:25 +0000 Subject: Presenting GNOME 2.20.1 and all related works for FreeBSD. The official GNOME 2.20 release notes can be found at http://www.gnome.org/start/2.20/notes/en/ . Beyond that, this update includes the new GIMP 2.4 (courtesy of ahze). The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME hierarchy. We are now using the more standard DATADIR of ${PREFIX}/share rather than ${PREFIX}/share/gnome. The result is that fewer patches and hacks are needed to port GNOME components to FreeBSD. This will mean some user changes may be required, so be sure to read /usr/ports/UPDATING for more details. This release and the things we accomplished in it would not have been possible without mezz's crazy idea to collapse DATADIR, and his persistence to make it happen successfully. Ahze and pav also deserve thanks for their work on porting modules and testing the whole ball of wax on pointyhat (respectively). The FreeBSD GNOME team would also like to thank our various testers and contributors: Yasuda Keisuke Frank Jahnke Pawel Worach Brian Gruber Franz Klammer Yuri Pankov Nick Barkas Cristian KLEIN Tony Maher Scot Hetzel Martin Matuska (mm) Benoit Dejean Martin Wilke (miwi) (And anyone else I may have missed) PRs fixed in this release: 111272, 113470, 115995, 116338 --- mail/evolution/files/patch-aa | 14 ++-- mail/evolution/files/patch-fix-maildir | 111 ----------------------------- mail/evolution/files/patch-mail_em-utils.h | 10 +++ 3 files changed, 17 insertions(+), 118 deletions(-) delete mode 100644 mail/evolution/files/patch-fix-maildir create mode 100644 mail/evolution/files/patch-mail_em-utils.h (limited to 'mail/evolution/files') diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa index 9adc9c36e145..30b05efea0a9 100644 --- a/mail/evolution/files/patch-aa +++ b/mail/evolution/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Wed Apr 11 20:01:06 2007 -+++ configure Thu Apr 12 01:10:01 2007 -@@ -24916,6 +24916,15 @@ case "$host" in +--- configure.orig Tue Jun 19 00:18:59 2007 ++++ configure Tue Jun 19 00:25:55 2007 +@@ -24959,6 +24959,15 @@ case "$host" in SOFTOKN3_LIB='' HAL_REQUIREMENT='' ;; @@ -16,7 +16,7 @@ *) os_win32=no NO_UNDEFINED='' SOEXT='.so' -@@ -26594,6 +26604,7 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -26433,6 +26442,7 @@ cat >>conftest.$ac_ext <<_ACEOF #include #include #include @@ -24,16 +24,16 @@ #define BUFSIZE (sizeof(struct hostent)+10) -@@ -30819,7 +30830,7 @@ if test "x${with_krb5}" != "xno"; then +@@ -30930,7 +30940,7 @@ if test "x${with_krb5}" != "xno"; then LDFLAGS_save="$LDFLAGS" mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5" - heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi" + heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi -lcrypt" + sunlibs="-lkrb5 -lgss" { echo "$as_me:$LINENO: checking for Kerberos 5" >&5 echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6; } - if test "${ac_cv_lib_kerberos5+set}" = set; then -@@ -37148,7 +37159,7 @@ componentdir="$privlibdir/components" +@@ -37393,7 +37403,7 @@ componentdir="$privlibdir/components" idldir='${datadir}'/idl/evolution-$BASE_VERSION diff --git a/mail/evolution/files/patch-fix-maildir b/mail/evolution/files/patch-fix-maildir deleted file mode 100644 index 6bf3fe7468cd..000000000000 --- a/mail/evolution/files/patch-fix-maildir +++ /dev/null @@ -1,111 +0,0 @@ -Index: mail/ChangeLog -=================================================================== ---- mail/ChangeLog (revision 33704) -+++ mail/ChangeLog (working copy) -@@ -1,3 +1,11 @@ -+2007-06-18 Milan Crha -+ -+ ** Fix for bug #352346 -+ -+ * em-migrate.c (em_update_accounts_2_11), (em_migrate): -+ Added function to change "spool" to "spooldir" for those -+ spools which points on directories. -+ - 2007-06-18 Srinivasa Ragavan - - ** Fix for bug #448223 from Gilles Dartiguelongue -Index: mail/mail-config.glade -=================================================================== ---- mail/mail-config.glade (revision 33704) -+++ mail/mail-config.glade (working copy) -@@ -1354,7 +1354,6 @@ - 2 - 2 - 3 -- fill - - - -Index: mail/em-account-editor.c -=================================================================== ---- mail/em-account-editor.c (revision 33704) -+++ mail/em-account-editor.c (working copy) -@@ -1665,9 +1665,19 @@ - } - if (url->user) - gtk_entry_set_text(service->username, url->user); -- if (service->pathentry && url->path) -- gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (service->pathentry), url->path); -+ if (service->pathentry) { -+ GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER; - -+ if (service->provider && (service->provider->url_flags & CAMEL_URL_NEED_PATH_DIR) == 0) -+ action = GTK_FILE_CHOOSER_ACTION_OPEN; -+ -+ if (action != gtk_file_chooser_get_action (GTK_FILE_CHOOSER (service->pathentry))) -+ gtk_file_chooser_set_action (GTK_FILE_CHOOSER (service->pathentry), action); -+ -+ if (url->path) -+ gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (service->pathentry), url->path); -+ } -+ - tmp = camel_url_get_param(url, "use_ssl"); - if (tmp == NULL) - tmp = "never"; -Index: mail/em-migrate.c -=================================================================== ---- mail/em-migrate.c (revision 33704) -+++ mail/em-migrate.c (working copy) -@@ -2639,6 +2639,41 @@ - return 0; - } - -+static void -+em_update_accounts_2_11 (void) -+{ -+ EAccountList *accounts; -+ EIterator *iter; -+ gboolean changed = FALSE; -+ -+ if (!(accounts = mail_config_get_accounts ())) -+ return; -+ -+ iter = e_list_get_iterator ((EList *) accounts); -+ while (e_iterator_is_valid (iter)) { -+ EAccount *account = (EAccount *) e_iterator_get (iter); -+ -+ if (g_str_has_prefix (account->source->url, "spool://")) { -+ struct stat st; -+ -+ if (stat(account->source->url + 8, &st) != -1 && S_ISDIR(st.st_mode)) { -+ char *str = g_strdup_printf ("spooldir://%s", account->source->url + 8); -+ -+ g_free (account->source->url); -+ account->source->url = str; -+ changed = TRUE; -+ } -+ } -+ -+ e_iterator_next (iter); -+ } -+ -+ g_object_unref (iter); -+ -+ if (changed) -+ mail_config_save_accounts (); -+} -+ - #endif - - static int -@@ -2777,6 +2812,10 @@ - - g_free (path); - } -+ -+ if (major < 2 || (major == 2 && minor <= 11)) { -+ em_update_accounts_2_11 (); -+ } - #endif /* !G_OS_WIN32 */ - return 0; - } diff --git a/mail/evolution/files/patch-mail_em-utils.h b/mail/evolution/files/patch-mail_em-utils.h new file mode 100644 index 000000000000..b3e7b9ffbe25 --- /dev/null +++ b/mail/evolution/files/patch-mail_em-utils.h @@ -0,0 +1,10 @@ +--- mail/em-utils.h.orig Tue Aug 3 16:59:46 2004 ++++ mail/em-utils.h Tue Aug 3 17:00:04 2004 +@@ -23,6 +23,7 @@ + #ifndef __EM_UTILS_H__ + #define __EM_UTILS_H__ + ++#include + #include + + #ifdef __cplusplus -- cgit v1.2.3