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

4 files changed, 27 insertions, 17 deletions

diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index ab6aaf11bc53..83d8582c96dc 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gvfs
-PORTVERSION=	1.24.2
+PORTVERSION=	1.26.2
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -14,11 +14,12 @@ BUILD_DEPENDS=	docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
 LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
 		libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome \
 		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
+		libgcr-base-3.so:${PORTSDIR}/security/gcr \
 		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake libarchive libtool pathfix pkgconfig tar:xz
+USES=		gettext gmake gnome libarchive libtool pathfix pkgconfig tar:xz
 USE_GNOME=	glib20 intlhack libxslt:build
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -42,12 +43,13 @@ INSTALL_TARGET=	install-strip
 GLIB_SCHEMAS=	org.gnome.system.gvfs.enums.xml
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	AVAHI SAMBA GPHOTO2 CDDA HAL FUSE AFC
-OPTIONS_DEFAULT=AVAHI SAMBA GPHOTO2 CDDA HAL FUSE
+OPTIONS_DEFINE=	AVAHI SAMBA GPHOTO2 CDDA HAL FUSE AFC GOOGLE
+OPTIONS_DEFAULT=AVAHI SAMBA GPHOTO2 CDDA HAL FUSE GOOGLE
 CDDA_DESC=	CDDA (enables HAL)
 GPHOTO2_DESC=	Gphoto 2 camera support (enables HAL)
 SAMBA_DESC=	Samba support
 AFC_DESC=	Apple device support
+GOOGLE_DESC=	Google backend
 
 FUSE_USES=	fuse
 FUSE_CONFIGURE_ENABLE=	fuse
@@ -68,6 +70,10 @@ AFC_LIB_DEPENDS=	libimobiledevice.so:${PORTSDIR}/comms/libimobiledevice \
 			libplist.so:${PORTSDIR}/devel/libplist
 AFC_CONFIGURE_ENABLE=	afc
 
+GOOGLE_CONFIGURE_ENABLE=	google
+GOOGLE_LIB_DEPENDS=	libgdata.so:${PORTSDIR}/devel/libgdata \
+			libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSAMBA}
@@ -93,5 +99,6 @@ post-patch:
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/remote-volume-monitors
+	@${RM} -rf ${STAGEDIR}${PREFIX}/lib/systemd
 
 .include <bsd.port.mk>
diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo
index 4e865d066002..cd4745e5fff0 100644
--- a/devel/gvfs/distinfo
+++ b/devel/gvfs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gvfs-1.24.2.tar.xz) = 0949eaedd1df7175f8d7ee2700df8210d1f854b8ee37d963bc32ee7091eeb228
-SIZE (gnome3/gvfs-1.24.2.tar.xz) = 1627808
+SHA256 (gnome3/gvfs-1.26.2.tar.xz) = 695b6e0f3de5ac2cb4d188917edef3f13299328150a2413f1a7131d9b2d48d18
+SIZE (gnome3/gvfs-1.26.2.tar.xz) = 1680404
diff --git a/devel/gvfs/files/patch-client_Makefile.in b/devel/gvfs/files/patch-client_Makefile.in
index 1470cbce0ef6..a18061922e32 100644
--- a/devel/gvfs/files/patch-client_Makefile.in
+++ b/devel/gvfs/files/patch-client_Makefile.in
@@ -1,11 +1,11 @@
---- client/Makefile.in.orig	2010-12-26 18:25:46.000000000 +0100
-+++ client/Makefile.in	2010-12-26 18:26:12.000000000 +0100
-@@ -196,7 +196,7 @@
- EXPAT_LIBS = @EXPAT_LIBS@
+--- client/Makefile.in.orig	2015-08-17 21:54:17.000000000 +0200
++++ client/Makefile.in	2015-08-17 21:54:39.000000000 +0200
+@@ -292,7 +292,7 @@
+ EXEEXT = @EXEEXT@
  FGREP = @FGREP@
  FUSE_CFLAGS = @FUSE_CFLAGS@
 -FUSE_LIBS = @FUSE_LIBS@
 +FUSE_LIBS = @FUSE_LIBS@ -lfuse
+ GCR_CFLAGS = @GCR_CFLAGS@
+ GCR_LIBS = @GCR_LIBS@
  GDU_CFLAGS = @GDU_CFLAGS@
- GDU_LIBS = @GDU_LIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist
index 874baa167f5b..b31c4192c149 100644
--- a/devel/gvfs/pkg-plist
+++ b/devel/gvfs/pkg-plist
@@ -37,6 +37,7 @@ libexec/gvfsd-dav
 %%AVAHI%%libexec/gvfsd-dnssd
 libexec/gvfsd-ftp
 %%FUSE%%libexec/gvfsd-fuse
+%%GOOGLE%%libexec/gvfsd-google
 %%GPHOTO2%%libexec/gvfsd-gphoto2
 libexec/gvfsd-http
 libexec/gvfsd-localtest
@@ -86,11 +87,11 @@ share/bash-completion/completions/gvfs-save
 share/bash-completion/completions/gvfs-set-attribute
 share/bash-completion/completions/gvfs-trash
 share/bash-completion/completions/gvfs-tree
-share/dbus-1/services/gvfs-daemon.service
-share/dbus-1/services/gvfs-metadata.service
-%%AFC%%share/dbus-1/services/org.gtk.Private.AfcVolumeMonitor.service
-%%GPHOTO2%%share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
-%%HAL%%share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service
+share/dbus-1/services/org.gtk.vfs.Daemon.service
+share/dbus-1/services/org.gtk.vfs.Metadata.service
+%%AFC%%share/dbus-1/services/org.gtk.vfs.AfcVolumeMonitor.service
+%%GPHOTO2%%share/dbus-1/services/org.gtk.vfs.GPhoto2VolumeMonitor.service
+%%HAL%%share/dbus-1/services/org.gtk.vfs.HalVolumeMonitor.service
 %%AFC%%%%DATADIR%%/mounts/afc.mount
 share/gvfs/mounts/afp-browse.mount
 share/gvfs/mounts/afp.mount
@@ -102,6 +103,8 @@ share/gvfs/mounts/afp.mount
 %%AVAHI%%%%DATADIR%%/mounts/dav+sd.mount
 %%AVAHI%%%%DATADIR%%/mounts/dns-sd.mount
 %%DATADIR%%/mounts/ftp.mount
+%%DATADIR%%/mounts/ftps.mount
+%%GOOGLE%%%%DATADIR%%/mounts/google.mount
 %%GPHOTO2%%%%DATADIR%%/mounts/gphoto2.mount
 %%DATADIR%%/mounts/http.mount
 %%DATADIR%%/mounts/localtest.mount