configure.ac | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 fix the nss libdir to add a "/nss"
 That variable is only used to point to the directory in which nssckbi (the
 built-in certificate store of NSS) lives, and it's actually under libdir/nss
 rather than directly under libdir.

configure.ac | 3 0 + 3 - 0 !
1 file changed, 3 deletions(-)

---

widgets/misc/e-contact-map-window.c | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 webkit port - port widgets

shell/Makefile.am | 3 2 + 1 - 0 !
shell/e-migrate-base-dirs.c | 655 655 + 0 - 0 !
shell/e-shell-migrate.c | 637 0 + 637 - 0 !
shell/main.c | 11 10 + 1 - 0 !
4 files changed, 667 insertions(+), 639 deletions(-)

 fix mbox-to-maildir conversion... again.

Commit ee5671fc fixed mbox-to-Maildir conversion for users upgrading
from Evolution 2.32, who had already migrated to XDG Base Directories.

But turns out, mbox-to-Maildir conversion was still broken for users
coming from Evolution 2.30 or earlier because the logic to move files
into XDG Base Directories was running *after* the conversion routine.
So the conversion routine found nothing to convert, and users were
left with a broken "On This Computer" mail store.

This commit runs the XDG Base Directory migration first on startup,
followed by the mbox-to-Maildir conversion.

(cherry picked from commit 1723ee09122a8e137e78ed301f2706eefb281adf)

a11y/Makefile.am | 2 1 + 1 - 0 !
addressbook/gui/contact-editor/Makefile.am | 2 1 + 1 - 0 !
addressbook/gui/contact-list-editor/Makefile.am | 2 1 + 1 - 0 !
addressbook/importers/Makefile.am | 2 1 + 1 - 0 !
addressbook/util/Makefile.am | 2 1 + 1 - 0 !
calendar/gui/Makefile.am | 2 1 + 1 - 0 !
calendar/importers/Makefile.am | 2 1 + 1 - 0 !
capplet/settings/Makefile.am | 2 1 + 1 - 0 !
composer/Makefile.am | 2 1 + 1 - 0 !
e-util/Makefile.am | 2 1 + 1 - 0 !
em-format/Makefile.am | 2 1 + 1 - 0 !
filter/Makefile.am | 2 1 + 1 - 0 !
libemail-engine/Makefile.am | 2 1 + 1 - 0 !
libemail-utils/Makefile.am | 2 1 + 1 - 0 !
libevolution-utils/Makefile.am | 2 1 + 1 - 0 !
libgnomecanvas/Makefile.am | 2 1 + 1 - 0 !
mail/Makefile.am | 2 1 + 1 - 0 !
mail/importers/Makefile.am | 2 1 + 1 - 0 !
shell/Makefile.am | 2 1 + 1 - 0 !
smclient/Makefile.am | 3 2 + 1 - 0 !
smime/gui/Makefile.am | 2 1 + 1 - 0 !
smime/lib/Makefile.am | 2 1 + 1 - 0 !
widgets/e-timezone-dialog/Makefile.am | 2 1 + 1 - 0 !
widgets/menus/Makefile.am | 2 1 + 1 - 0 !
widgets/misc/Makefile.am | 2 1 + 1 - 0 !
widgets/table/Makefile.am | 2 1 + 1 - 0 !
widgets/text/Makefile.am | 2 1 + 1 - 0 !
27 files changed, 28 insertions(+), 27 deletions(-)

 revert 160006402248075b95c98e9e34d4538670ba7480
 Revert upstream patch that adds -avoid-version to all libevolution
 libs, making them versionless. This is a massive WTF.
Bug-GNOME: https://bugzilla.gnome.org/show_bug.cgi?id=591436