The FreeBSD GNOME team proudly presents GNOME 3.14 and Cinnamon 2.2.

Gnome 3.14.1 and Cinnamon 2.2.16 are supported on FreeBSD 9.3-RELEASE and up.

This commit removes the old GNOME 2 desktop, bindings and some ports that
can't be compiled. A few ports where updated to more recent versions to
allow them to compile with this update.

Apart from updating ports to newer versions

GDM is more integrated with gnome-shell now, and handles several things for
the GNOME desktop such as screen locking. If you want to use GNOME 3 via
startx, you will have to add your own lock screen/screensaver. For example xscreensaver
can be used for sessions started without GDM.

Shell Extensions can be installed via https://extensions.gnome.org/ , we have
ported a few that can't be installed via this way.
The old gnome-utils and gnome-games ports where split up into single ports
and where converted to meta-ports.
gnome-terminal requires a UTF-8 locale to run, gdm handles this already, but
if you use startx you need to do this yourself.

Upgrade instructions:

Delete the old and conflicting packages:
# pkg delete clutter gnome-utils gnome-panel gnome-keyring vala-vapigen \
    guile gcalctool gnome-media libgnomekbd
# pkg delete gnome-screensaver gnome-applets bug-buddy evolution-exchange \
    evolution-webcal gnome-system-tools seahorse-plugins gnome-control-center

For package users the following lines will be enough:
# pkg upgrade
# pkg install gnome3

For ports users should do the following:
# portmaster -a
# portmaster x11/gnome3

We are currently aware of two issues. The first issue is a bug in the
file monitoring code in the glib20 port. This bug causes glib programs
to crash when files in a monitored directory are added or removed.
Upstream is aware of the problem, but since the problem is quite complex
there is no solution yet. This problem isn't restricted to BSD.

The second issue is that on certain video cards totem will display a
purple/pink overlay on the video. It not clear yet where the issues
comes from.

Major thanks goes to Gustau Perez for being a driving force behind getting
GNOME 3 up to speed again. Also thanks to Antoine Brodin for running the exp-runs.

This update was also made possible by:
	Joe Maloney
	Kris Moore
	Beeblebrox
	Ryan Lortie
	Antoine Jacoutot
	and everyone I missed

6 files changed, 5 insertions, 102 deletions

diff --git a/mail/evolution/files/fix-plugins.sh b/mail/evolution/files/fix-plugins.sh
index cadd97baeaae..b0171dcb5d0a 100644
--- a/mail/evolution/files/fix-plugins.sh
+++ b/mail/evolution/files/fix-plugins.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-plugin_srcs="addressbook-file/addressbook-file.c attachment-reminder/attachment-reminder.c audio-inline/audio-inline.c backup-restore/backup-restore.c bbdb/bbdb.c bogo-junk-plugin/bf-junk-filter.c caldav/caldav-source.c calendar-file/calendar-file.c calendar-http/calendar-http.c calendar-weather/calendar-weather.c contacts-map/contacts-map.c dbx-import/dbx-importer.c default-source/default-source.c email-custom-header/email-custom-header.c external-editor/external-editor.c face/face.c google-account-setup/google-source.c groupwise-features/install-shared.c image-inline/image-inline.c imap-features/imap-headers.c itip-formatter/itip-formatter.c mail-notification/mail-notification.c mail-to-task/mail-to-task.c mailing-list-actions/mailing-list-actions.c mark-all-read/mark-all-read.c plugin-manager/plugin-manager.c prefer-plain/prefer-plain.c profiler/profiler.c pst-import/pst-importer.c publish-calendar/publish-calendar.c sa-junk-plugin/em-junk-filter.c save-calendar/save-calendar.c subject-thread/subject-thread.c templates/templates.c tnef-attachments/tnef-plugin.c vcard-inline/vcard-inline.c webdav-account-setup/webdav-contacts-source.c"
+plugin_srcs="attachment-reminder/attachment-reminder.c bbdb/bbdb.c dbx-import/dbx-importer.c email-custom-header/email-custom-header.c external-editor/external-editor.c face/face.c image-inline/image-inline.c mail-notification/mail-notification.c mail-to-task/mail-to-task.c mailing-list-actions/mailing-list-actions.c mark-all-read/mark-all-read.c pst-import/pst-importer.c publish-calendar/publish-calendar.c save-calendar/save-calendar.c templates/templates.c"
 
-module_srcs="addressbook/evolution-module-addressbook.c calendar/evolution-module-calendar.c composer-autosave/e-composer-autosave.c connman/evolution-connman.c mail/evolution-module-mail.c mailto-handler/evolution-mailto-handler.c network-manager/evolution-network-manager.c plugin-lib/evolution-module-plugin-lib.c plugin-mono/evolution-module-plugin-mono.c plugin-python/evolution-module-plugin-python.c startup-wizard/evolution-startup-wizard.c windows-sens/evolution-windows-sens.c"
+module_srcs="addressbook/evolution-module-addressbook.c audio-inline/evolution-module-audio-inline.c backup-restore/evolution-backup-tool.c bogofilter/evolution-bogofilter.c book-config-google/evolution-book-config-google.c book-config-ldap/evolution-book-config-ldap.c book-config-local/evolution-book-config-local.c book-config-webdav/evolution-book-config-webdav.c cal-config-caldav/evolution-cal-config-caldav.c cal-config-contacts/evolution-cal-config-contacts.c cal-config-google/evolution-cal-config-google.c cal-config-local/evolution-cal-config-local.c cal-config-weather/evolution-cal-config-weather.c cal-config-webcal/evolution-cal-config-webcal.c calendar/evolution-module-calendar.c composer-autosave/evolution-composer-autosave.c imap-features/evolution-imap-features.c itip-formatter/itip-view.c itip-formatter/plugin/config-ui.c mail-config/evolution-mail-config.c mail/evolution-module-mail.c mailto-handler/evolution-mailto-handler.c mdn/evolution-mdn.c offline-alert/evolution-offline-alert.c online-accounts/evolution-online-accounts.c plugin-lib/evolution-module-plugin-lib.c plugin-manager/evolution-plugin-manager.c prefer-plain/evolution-module-prefer-plain.c prefer-plain/plugin/config-ui.c spamassassin/evolution-spamassassin.c startup-wizard/evolution-startup-wizard.c text-highlight/languages.c tnef-attachment/evolution-module-tnef-attachment.c vcard-inline/evolution-module-vcard-inline.c web-inspector/evolution-web-inspector.c"
 
 WRKSRC=$1
 
@@ -46,4 +46,3 @@ for i in ${module_srcs}; do
     fi
 done
 
-
diff --git a/mail/evolution/files/patch-calendar_gui_alarm-notify_alarm-queue.c b/mail/evolution/files/patch-calendar_gui_alarm-notify_alarm-queue.c
deleted file mode 100644
index e713de004f69..000000000000
--- a/mail/evolution/files/patch-calendar_gui_alarm-notify_alarm-queue.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- calendar/gui/alarm-notify/alarm-queue.c.orig	2011-03-07 20:53:40.000000000 +0100
-+++ calendar/gui/alarm-notify/alarm-queue.c	2011-03-07 20:53:50.000000000 +0100
-@@ -1606,7 +1606,7 @@ popup_notification (time_t trigger, Comp
- 			body = g_strdup_printf ("%s %s", start_str, time_str);
- 	}
- 
--	n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL);
-+	n = notify_notification_new (summary, body, "stock_appointment-reminder");
- 	if (!notify_notification_show(n, NULL))
- 	    g_warning ("Could not send notification to daemon\n");
- 
diff --git a/mail/evolution/files/patch-configure b/mail/evolution/files/patch-configure
index 3b9eb70943d4..1c7bafc75817 100644
--- a/mail/evolution/files/patch-configure
+++ b/mail/evolution/files/patch-configure
@@ -1,15 +1,6 @@
---- configure.orig	2009-12-26 20:42:20.000000000 +0100
-+++ configure	2009-12-26 20:49:17.000000000 +0100
-@@ -4329,7 +4329,7 @@
- 	-Wdeclaration-after-statement
- 	-Werror-implicit-function-declaration
- 	-Wformat-security -Winit-self
--	-Wmissing-declarations -Wmissing-include-dirs
-+	-Wmissing-declarations 
- 	-Wmissing-noreturn -Wnested-externs -Wpointer-arith
- 	-Wredundant-decls -Wundef -Wwrite-strings"
-   flags_supported=""
-@@ -16441,6 +16441,16 @@
+--- configure.orig	2011-01-26 18:09:29.000000000 +0000
++++ configure	2011-01-26 18:11:16.000000000 +0000
+@@ -15450,6 +15450,16 @@
  	CHAMPLAIN_REQUIREMENT=''
  	GEOCLUE_REQUIREMENT=''
  	;;
@@ -26,11 +17,3 @@
  *)
  	os_win32=no
  	NO_UNDEFINED='-no-undefined'
-@@ -18544,6 +18554,7 @@
- 		#include <sys/socket.h>
- 		#include <netinet/in.h>
- 		#include <netdb.h>
-+		#include <stdio.h>
- 
- 		#define BUFSIZE (sizeof(struct hostent)+10)
- 
diff --git a/mail/evolution/files/patch-plugins_mail-notification_mail-notification.c b/mail/evolution/files/patch-plugins_mail-notification_mail-notification.c
deleted file mode 100644
index adddf1b38a77..000000000000
--- a/mail/evolution/files/patch-plugins_mail-notification_mail-notification.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- plugins/mail-notification/mail-notification.c.orig	2011-03-07 21:24:25.000000000 +0100
-+++ plugins/mail-notification/mail-notification.c	2011-03-07 21:24:40.000000000 +0100
-@@ -564,9 +564,7 @@ new_notify_status (EMEventTargetFolder *
- 
- 			notify  = notify_notification_new (
- 				_("New email"), safetext,
--				"mail-unread", NULL);
--			notify_notification_attach_to_status_icon (
--				notify, status_icon);
-+				"mail-unread");
- 
- 			/* Check if actions are supported */
- 			if (can_support_actions ()) {
diff --git a/mail/evolution/files/patch-plugins_publish-calendar_publish-calendar.c b/mail/evolution/files/patch-plugins_publish-calendar_publish-calendar.c
deleted file mode 100644
index 55120db4c19c..000000000000
--- a/mail/evolution/files/patch-plugins_publish-calendar_publish-calendar.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- plugins/publish-calendar/publish-calendar.c.orig	2011-03-07 21:12:59.000000000 +0100
-+++ plugins/publish-calendar/publish-calendar.c	2011-03-07 21:14:23.000000000 +0100
-@@ -150,8 +150,7 @@ update_publish_notification (GtkMessageT
- 				return;
- 			}
- 
--			notify  = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name, NULL);
--			notify_notification_attach_to_status_icon (notify, status_icon);
-+			notify  = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name);
- 			notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL);
- 			notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT);
- 			g_timeout_add (500, show_notify_cb, NULL);
diff --git a/mail/evolution/files/patch-support-libxml2-2.9 b/mail/evolution/files/patch-support-libxml2-2.9
deleted file mode 100644
index 57f833cc9cea..000000000000
--- a/mail/evolution/files/patch-support-libxml2-2.9
+++ /dev/null
@@ -1,43 +0,0 @@
---- plugins/caldav/caldav-browse-server.c.ori	2013-03-02 12:33:59.220751490 -0300
-+++ plugins/caldav/caldav-browse-server.c	2013-03-02 16:47:55.601296985 -0300
-@@ -63,6 +63,18 @@
- 
- typedef void (*process_message_cb) (GObject *dialog, const gchar *msg_path, guint status_code, const gchar *msg_body, gpointer user_data);
- 
-+static gconstpointer
-+compat_libxml_output_buffer_get_content (xmlOutputBufferPtr buf,
-+					gsize *out_len)
-+{
-+#ifdef LIBXML2_NEW_BUFFER
-+	*out_len = xmlOutputBufferGetSize (buf);
-+	return xmlOutputBufferGetContent (buf);
-+#else
-+	*out_len = buf->buffer->use;
-+	return buf->buffer->content;
-+#endif
-+}
- static void send_xml_message (xmlDocPtr doc, gboolean depth_1, const gchar *url, GObject *dialog, process_message_cb cb, gpointer cb_user_data, const gchar *info);
- 
- static gchar *
-@@ -953,6 +965,8 @@
- 	SoupSession *session;
- 	SoupMessage *message;
- 	xmlOutputBufferPtr buf;
-+	gconstpointer content;
-+	gsize length;
- 	guint poll_id;
- 	struct poll_data *pd;
- 
-@@ -977,9 +991,11 @@
- 	xmlNodeDumpOutput (buf, doc, xmlDocGetRootElement (doc), 0, 1, NULL);
- 	xmlOutputBufferFlush (buf);
- 
-+	content = compat_libxml_output_buffer_get_content (buf, &length);
-+
- 	soup_message_headers_append (message->request_headers, "User-Agent", "Evolution/" VERSION);
- 	soup_message_headers_append (message->request_headers, "Depth", depth_1 ? "1" : "0");
--	soup_message_set_request (message, "application/xml", SOUP_MEMORY_COPY, (const gchar *) buf->buffer->content, buf->buffer->use);
-+	soup_message_set_request (message, "application/xml", SOUP_MEMORY_COPY, content, length);
- 
- 	/* Clean up the memory */
- 	xmlOutputBufferClose (buf);