The FreeBSD GNOME team proudly presents GNOME 3.16 for FreeBSD.

The offical GNOME 3.16 release notes can be found at https://help.gnome.org/misc/release-notes/3.16/

Upgrade instructions for port users:

Delete the old tracker package with:
# pkg delete -f tracker
And user port upgrade tool of choice to upgrade.

Thanks to Antoine Brodin for running the exp-runs.

This release was made possible by the following people:
  Gustau Perez
  Ting-Wei_Lan

PR:		201980

10 files changed, 98 insertions, 77 deletions

diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index d04e698ea588..6fe3ad0f284c 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -1,9 +1,8 @@
 # Created by: Garrett Rooney <rooneg@electricjellyfish.net>
 # $FreeBSD$
-#   $MCom: ports/trunk/x11-wm/metacity/Makefile 20004 2014-10-20 14:11:09Z gusi $
 
 PORTNAME=	metacity
-PORTVERSION=	3.14.3
+PORTVERSION=	3.16.1
 CATEGORIES=	x11-wm
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo
index 2141a0e40f6c..4237edc73007 100644
--- a/x11-wm/metacity/distinfo
+++ b/x11-wm/metacity/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/metacity-3.14.3.tar.xz) = a8295792ee3ff23d07833f60c979e8409fa8594245cef577c369b18be732812c
-SIZE (gnome3/metacity-3.14.3.tar.xz) = 1612780
+SHA256 (gnome3/metacity-3.16.1.tar.xz) = 7a2e4ab7e19bfa5e6fc75d80d66e79f7965b5a51435c9675b0e895179d256f86
+SIZE (gnome3/metacity-3.16.1.tar.xz) = 1621884
diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist
index 0426b2f27e3b..cd7cd520ec17 100644
--- a/x11-wm/metacity/pkg-plist
+++ b/x11-wm/metacity/pkg-plist
@@ -11,8 +11,8 @@ include/metacity/metacity-private/theme.h
 include/metacity/metacity-private/util.h
 lib/libmetacity-private.a
 lib/libmetacity-private.so
-lib/libmetacity-private.so.2
-lib/libmetacity-private.so.2.0.0
+lib/libmetacity-private.so.3
+lib/libmetacity-private.so.3.0.0
 libdata/pkgconfig/libmetacity-private.pc
 man/man1/metacity-message.1.gz
 man/man1/metacity-theme-viewer.1.gz
@@ -121,6 +121,7 @@ share/locale/zh_CN/LC_MESSAGES/metacity.mo
 share/locale/zh_HK/LC_MESSAGES/metacity.mo
 share/locale/zh_TW/LC_MESSAGES/metacity.mo
 %%DATADIR%%/icons/metacity-window-demo.png
+share/themes/Adwaita/metacity-1/metacity-theme-3.xml
 share/themes/AgingGorilla/metacity-1/active-button.png
 share/themes/AgingGorilla/metacity-1/active-close-button.png
 share/themes/AgingGorilla/metacity-1/active-close-menu-icon.png
@@ -217,6 +218,7 @@ share/themes/Crux/metacity-1/inactive-unstick-button.png
 share/themes/Crux/metacity-1/metacity-theme-1.xml
 share/themes/Crux/metacity-1/metacity-theme-2.xml
 share/themes/Esco/metacity-1/metacity-theme-1.xml
+share/themes/HighContrast/metacity-1/metacity-theme-3.xml
 share/themes/Metabox/metacity-1/metacity-theme-1.xml
 share/themes/Simple/metacity-1/close.png
 share/themes/Simple/metacity-1/maximize.png
diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile
index d255512c016d..b7c581c4f026 100644
--- a/x11-wm/mutter/Makefile
+++ b/x11-wm/mutter/Makefile
@@ -1,9 +1,8 @@
 # Created by: Pawel Worach <pawel.worach@gmail.com>
 # $FreeBSD$
-#   $MCom: ports/trunk/x11-wm/mutter/Makefile 20040 2014-11-03 17:21:59Z kwm $
 
 PORTNAME=	mutter
-PORTVERSION=	3.14.4
+PORTVERSION=	3.16.3
 CATEGORIES=	x11-wm
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -24,8 +23,7 @@ RUN_DEPENDS=	zenity>=3.0.0:${PORTSDIR}/x11/zenity \
 PORTSCOUT=	limitw:1,even
 
 USES=		gettext gmake libtool pathfix pkgconfig tar:xz
-USE_GNOME=	gnomedesktop3 gnomeprefix gtk30 intlhack \
-		introspection:build
+USE_GNOME=	gnomedesktop3 gtk30 intlhack introspection:build
 USE_XORG=	x11 xext xrandr xcomposite xcursor xinerama ice sm xfixes \
 		xrender xdamage
 GNU_CONFIGURE=	yes
@@ -41,6 +39,11 @@ PLIST_SUB=	VERSION=${PORTVERSION:R}
 
 .include <bsd.port.options.mk>
 
+.if ${OSVERSION} < 1000000 && ${OPSYS} == FreeBSD
+EXTRA_PATCHES=	${FILESDIR}/extra-src_core_keybindings-private.h \
+		${FILESDIR}/extra-src_ui_frames.h
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-Wcast-align||g' \
 		${WRKSRC}/configure
diff --git a/x11-wm/mutter/distinfo b/x11-wm/mutter/distinfo
index 9a40802450e9..c31584d7a007 100644
--- a/x11-wm/mutter/distinfo
+++ b/x11-wm/mutter/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/mutter-3.14.4.tar.xz) = b4fbcc0664484d6215fc1f2101e9b636303de63544b786f2f87ebf2f6a616a8b
-SIZE (gnome3/mutter-3.14.4.tar.xz) = 1608836
+SHA256 (gnome3/mutter-3.16.3.tar.xz) = ee0098487d1bfb8f28e3927fbb9df227d846555142d352f8693f56a08441c755
+SIZE (gnome3/mutter-3.16.3.tar.xz) = 1550004
diff --git a/x11-wm/mutter/files/extra-src_core_keybindings-private.h b/x11-wm/mutter/files/extra-src_core_keybindings-private.h
new file mode 100644
index 000000000000..80825ed1f0d6
--- /dev/null
+++ b/x11-wm/mutter/files/extra-src_core_keybindings-private.h
@@ -0,0 +1,22 @@
+$OpenBSD: patch-src_core_keybindings-private_h,v 1.1 2015/04/13 08:14:07 jasper Exp $
+
+https://bugzilla.gnome.org/show_bug.cgi?id=747326
+
+--- src/core/keybindings-private.h.orig	Mon Mar 23 18:47:23 2015
++++ src/core/keybindings-private.h	Mon Apr 13 10:06:35 2015
+@@ -30,6 +30,7 @@
+ #include <gio/gio.h>
+ #include <meta/keybindings.h>
+ #include <xkbcommon/xkbcommon.h>
++#include "meta-accel-parse.h"
+ 
+ typedef struct _MetaKeyHandler MetaKeyHandler;
+ struct _MetaKeyHandler
+@@ -53,7 +54,6 @@ typedef struct _MetaResolvedKeyCombo {
+  * @keycode: keycode
+  * @modifiers: modifiers
+  */
+-typedef struct _MetaKeyCombo MetaKeyCombo;
+ struct _MetaKeyCombo
+ {
+   unsigned int keysym;
diff --git a/x11-wm/mutter/files/extra-src_ui_frames.h b/x11-wm/mutter/files/extra-src_ui_frames.h
new file mode 100644
index 000000000000..3f755e5857e1
--- /dev/null
+++ b/x11-wm/mutter/files/extra-src_ui_frames.h
@@ -0,0 +1,20 @@
+$OpenBSD: patch-src_ui_frames_h,v 1.1 2015/04/13 08:14:07 jasper Exp $
+--- src/ui/frames.h.orig	Mon Apr 13 09:51:38 2015
++++ src/ui/frames.h	Mon Apr 13 09:55:33 2015
+@@ -27,6 +27,7 @@
+ #include <meta/common.h>
+ #include <meta/types.h>
+ #include "theme-private.h"
++#include "ui.h"
+ 
+ typedef enum
+ {
+@@ -68,8 +69,6 @@ typedef enum
+ 
+ typedef struct _MetaFrames        MetaFrames;
+ typedef struct _MetaFramesClass   MetaFramesClass;
+-
+-typedef struct _MetaUIFrame         MetaUIFrame;
+ 
+ struct _MetaUIFrame
+ {
diff --git a/x11-wm/mutter/files/patch-src_backends_meta-cursor-private.h b/x11-wm/mutter/files/patch-src_backends_meta-cursor-private.h
deleted file mode 100644
index 4284d2a02fbe..000000000000
--- a/x11-wm/mutter/files/patch-src_backends_meta-cursor-private.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/backends/meta-cursor-private.h.orig	2014-11-23 16:45:02.933406434 +0100
-+++ src/backends/meta-cursor-private.h	2014-11-23 16:45:36.450634686 +0100
-@@ -25,7 +25,9 @@
- #include "meta-cursor.h"
- 
- #include <cogl/cogl.h>
-+#if defined(HAVE_NATIVE_BACKEND)
- #include <gbm.h>
-+#endif
- 
- typedef struct {
-   CoglTexture2D *texture;
diff --git a/x11-wm/mutter/files/patch-src_backends_meta-cursor-renderer.h b/x11-wm/mutter/files/patch-src_backends_meta-cursor-renderer.h
deleted file mode 100644
index 75c993750ef7..000000000000
--- a/x11-wm/mutter/files/patch-src_backends_meta-cursor-renderer.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/backends/meta-cursor-renderer.h.orig	2014-10-02 16:29:20.000000000 +0200
-+++ src/backends/meta-cursor-renderer.h	2014-11-23 16:44:45.685535555 +0100
-@@ -30,7 +30,9 @@
- #include <meta/screen.h>
- #include "meta-cursor.h"
- 
-+#if defined(HAVE_NATIVE_BACKEND)
- #include <gbm.h>
-+#endif
- 
- #define META_TYPE_CURSOR_RENDERER            (meta_cursor_renderer_get_type ())
- #define META_CURSOR_RENDERER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_CURSOR_RENDERER, MetaCursorRenderer))
diff --git a/x11-wm/mutter/pkg-plist b/x11-wm/mutter/pkg-plist
index ba4e46428860..550e69e97d8d 100644
--- a/x11-wm/mutter/pkg-plist
+++ b/x11-wm/mutter/pkg-plist
@@ -7,7 +7,6 @@ include/mutter/meta/compositor-mutter.h
 include/mutter/meta/compositor.h
 include/mutter/meta/display.h
 include/mutter/meta/errors.h
-include/mutter/meta/gradient.h
 include/mutter/meta/group.h
 include/mutter/meta/keybindings.h
 include/mutter/meta/main.h
@@ -18,6 +17,7 @@ include/mutter/meta/meta-background-image.h
 include/mutter/meta/meta-background.h
 include/mutter/meta/meta-cursor-tracker.h
 include/mutter/meta/meta-idle-monitor.h
+include/mutter/meta/meta-monitor-manager.h
 include/mutter/meta/meta-plugin.h
 include/mutter/meta/meta-shadow-factory.h
 include/mutter/meta/meta-shaped-texture.h
@@ -40,49 +40,48 @@ libdata/pkgconfig/libmutter.pc
 libexec/mutter-restart-helper
 man/man1/mutter.1.gz
 share/GConf/gsettings/mutter-schemas.convert
-share/applications/mutter.desktop
 share/applications/mutter-wayland.desktop
-share/doc/meta/MetaBackgroundActor.html
-share/doc/meta/MetaBarrier.html
-share/doc/meta/MetaDisplay.html
-share/doc/meta/MetaPlugin.html
-share/doc/meta/MetaRectangle.html
-share/doc/meta/MetaScreen.html
-share/doc/meta/MetaShadowFactory.html
-share/doc/meta/MetaShapedTexture.html
-share/doc/meta/MetaWindow.html
-share/doc/meta/MetaWindowActor.html
-share/doc/meta/MetaWorkspace.html
-share/doc/meta/annotation-glossary.html
-share/doc/meta/api-index-full.html
-share/doc/meta/core-reference.html
-share/doc/meta/deprecated-api-index.html
-share/doc/meta/home.png
-share/doc/meta/index.html
-share/doc/meta/index.sgml
-share/doc/meta/left-insensitive.png
-share/doc/meta/left.png
-share/doc/meta/meta-Common.html
-share/doc/meta/meta-Errors.html
-share/doc/meta/meta-Gradients.html
-share/doc/meta/meta-Main.html
-share/doc/meta/meta-MetaCompositor.html
-share/doc/meta/meta-MetaGroup.html
-share/doc/meta/meta-MetaKeybinding.html
-share/doc/meta/meta-Preferences.html
-share/doc/meta/meta-Utility-functions.html
-share/doc/meta/meta.devhelp2
-share/doc/meta/mutter-overview.html
-share/doc/meta/object-tree.html
-share/doc/meta/right-insensitive.png
-share/doc/meta/right.png
-share/doc/meta/running-mutter.html
-share/doc/meta/style.css
-share/doc/meta/up-insensitive.png
-share/doc/meta/up.png
+share/applications/mutter.desktop
 share/gnome-control-center/keybindings/50-mutter-navigation.xml
-share/gnome-control-center/keybindings/50-mutter-windows.xml
 share/gnome-control-center/keybindings/50-mutter-system.xml
+share/gnome-control-center/keybindings/50-mutter-windows.xml
+share/gtk-doc/html/meta/MetaBackgroundActor.html
+share/gtk-doc/html/meta/MetaBarrier.html
+share/gtk-doc/html/meta/MetaDisplay.html
+share/gtk-doc/html/meta/MetaPlugin.html
+share/gtk-doc/html/meta/MetaRectangle.html
+share/gtk-doc/html/meta/MetaScreen.html
+share/gtk-doc/html/meta/MetaShadowFactory.html
+share/gtk-doc/html/meta/MetaShapedTexture.html
+share/gtk-doc/html/meta/MetaWindow.html
+share/gtk-doc/html/meta/MetaWindowActor.html
+share/gtk-doc/html/meta/MetaWorkspace.html
+share/gtk-doc/html/meta/annotation-glossary.html
+share/gtk-doc/html/meta/api-index-full.html
+share/gtk-doc/html/meta/core-reference.html
+share/gtk-doc/html/meta/deprecated-api-index.html
+share/gtk-doc/html/meta/home.png
+share/gtk-doc/html/meta/index.html
+share/gtk-doc/html/meta/index.sgml
+share/gtk-doc/html/meta/left-insensitive.png
+share/gtk-doc/html/meta/left.png
+share/gtk-doc/html/meta/meta-Common.html
+share/gtk-doc/html/meta/meta-Errors.html
+share/gtk-doc/html/meta/meta-Main.html
+share/gtk-doc/html/meta/meta-MetaCompositor.html
+share/gtk-doc/html/meta/meta-MetaGroup.html
+share/gtk-doc/html/meta/meta-MetaKeybinding.html
+share/gtk-doc/html/meta/meta-Preferences.html
+share/gtk-doc/html/meta/meta-Utility-functions.html
+share/gtk-doc/html/meta/meta.devhelp2
+share/gtk-doc/html/meta/mutter-overview.html
+share/gtk-doc/html/meta/object-tree.html
+share/gtk-doc/html/meta/right-insensitive.png
+share/gtk-doc/html/meta/right.png
+share/gtk-doc/html/meta/running-mutter.html
+share/gtk-doc/html/meta/style.css
+share/gtk-doc/html/meta/up-insensitive.png
+share/gtk-doc/html/meta/up.png
 share/locale/am/LC_MESSAGES/mutter.mo
 share/locale/ar/LC_MESSAGES/mutter.mo
 share/locale/as/LC_MESSAGES/mutter.mo