The FreeBSD GNOME team proudly presents GNOME 3.18 for FreeBSD.

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

This update doesn't contain the glib/gtk c++ bindings which will
be done in a another update due to the requirement on c++11 and the
amount of fallout this probably will give.

GDM is still at version 3.16 due to some issues.

Bump mate-themes to use the gtk 3.18 version of the themes.

Thanks to Antoine Brodin for running the exp-runs.

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

PR:	207006

7 files changed, 12 insertions, 94 deletions

diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 6fe3ad0f284c..a5ca511e64e2 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	metacity
-PORTVERSION=	3.16.1
+PORTVERSION=	3.18.1
 CATEGORIES=	x11-wm
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -22,7 +22,8 @@ RUN_DEPENDS=	zenity>=3.0.0:${PORTSDIR}/x11/zenity \
 PORTSCOUT=	limitw:1,even
 
 USE_XORG=	x11 xcomposite xdamage xrender xcursor xinerama xext xrandr
-USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USES=		compiler:c11 gettext gmake gnome libtool \
+		pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gtk30 intlhack libxml2:build
 USE_LDCONFIG=	yes
diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo
index 4237edc73007..dc53a2853a25 100644
--- a/x11-wm/metacity/distinfo
+++ b/x11-wm/metacity/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/metacity-3.16.1.tar.xz) = 7a2e4ab7e19bfa5e6fc75d80d66e79f7965b5a51435c9675b0e895179d256f86
-SIZE (gnome3/metacity-3.16.1.tar.xz) = 1621884
+SHA256 (gnome3/metacity-3.18.1.tar.xz) = 5ccb2343413b6ba4d75f300b494524bde7fe77ec818f7f73e3b232777ce6dad8
+SIZE (gnome3/metacity-3.18.1.tar.xz) = 1667196
diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile
index a44a3c540ca3..c0de4030cb5e 100644
--- a/x11-wm/mutter/Makefile
+++ b/x11-wm/mutter/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mutter
-PORTVERSION=	3.16.4
+PORTVERSION=	3.18.2
 CATEGORIES=	x11-wm
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -22,7 +22,8 @@ RUN_DEPENDS=	zenity>=3.0.0:${PORTSDIR}/x11/zenity \
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USES=		compiler:c++0x gettext gmake gmake libtool pathfix \
+		pkgconfig tar:xz
 USE_GNOME=	gnomedesktop3 gtk30 intlhack introspection:build
 USE_XORG=	x11 xext xrandr xcomposite xcursor xinerama ice sm xfixes \
 		xrender xdamage
@@ -37,13 +38,6 @@ GLIB_SCHEMAS=	org.gnome.mutter.gschema.xml \
 
 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 5fc7461cc91b..9787c8eb4eac 100644
--- a/x11-wm/mutter/distinfo
+++ b/x11-wm/mutter/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/mutter-3.16.4.tar.xz) = 23e8601a594a207fcfdf570e10710539176d41dd43304ef7b274a59d09e305da
-SIZE (gnome3/mutter-3.16.4.tar.xz) = 1535572
+SHA256 (gnome3/mutter-3.18.2.tar.xz) = 8a69326f216c7575ed6cd53938b9cfc49b3b359cde95d3b6a7ed46c837261181
+SIZE (gnome3/mutter-3.18.2.tar.xz) = 1468660
diff --git a/x11-wm/mutter/files/extra-src_core_keybindings-private.h b/x11-wm/mutter/files/extra-src_core_keybindings-private.h
deleted file mode 100644
index 80825ed1f0d6..000000000000
--- a/x11-wm/mutter/files/extra-src_core_keybindings-private.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$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
deleted file mode 100644
index 3f755e5857e1..000000000000
--- a/x11-wm/mutter/files/extra-src_ui_frames.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$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/pkg-plist b/x11-wm/mutter/pkg-plist
index 6c56af31bd61..27735c63d2e6 100644
--- a/x11-wm/mutter/pkg-plist
+++ b/x11-wm/mutter/pkg-plist
@@ -1,5 +1,4 @@
 bin/mutter
-include/mutter/meta/atomnames.h
 include/mutter/meta/barrier.h
 include/mutter/meta/boxes.h
 include/mutter/meta/common.h
@@ -16,6 +15,7 @@ include/mutter/meta/meta-background-group.h
 include/mutter/meta/meta-background-image.h
 include/mutter/meta/meta-background.h
 include/mutter/meta/meta-cursor-tracker.h
+include/mutter/meta/meta-enum-types.h
 include/mutter/meta/meta-idle-monitor.h
 include/mutter/meta/meta-monitor-manager.h
 include/mutter/meta/meta-plugin.h
@@ -23,6 +23,7 @@ include/mutter/meta/meta-shadow-factory.h
 include/mutter/meta/meta-shaped-texture.h
 include/mutter/meta/meta-version.h
 include/mutter/meta/meta-window-actor.h
+include/mutter/meta/meta-window-shape.h
 include/mutter/meta/prefs.h
 include/mutter/meta/screen.h
 include/mutter/meta/theme.h
@@ -45,42 +46,6 @@ share/applications/mutter.desktop
 share/gnome-control-center/keybindings/50-mutter-navigation.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/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