The FreeBSD GNOME team proudly presents GNOME 3.28 for FreeBSD.

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

Thanks to Antoine Brodin for running the exp-runs.

PR:		229761

4 files changed, 139 insertions, 28 deletions

diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 786c7b0f5733..8c7cbc5e0872 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	cairo
-PORTVERSION=	1.14.8
-PORTREVISION=	3
+PORTVERSION=	1.15.12
 PORTEPOCH=	2
 CATEGORIES=	graphics
-MASTER_SITES=	http://cairographics.org/releases/
+#MASTER_SITES=	http://cairographics.org/releases/
+MASTER_SITES=	http://cairographics.org/snapshots/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Vector graphics library with cross-device output support
@@ -16,10 +16,6 @@ LICENSE_COMB=	dual
 LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING-LGPL-2.1
 LICENSE_FILE_MPL11=	${WRKSRC}/COPYING-MPL-1.1
 
-USES=		tar:xz
-
-.if !defined(REFERENCE_PORT)
-
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png \
 		libfontconfig.so:x11-fonts/fontconfig
@@ -30,10 +26,9 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR} \
 		--disable-directfb \
 		--enable-tee
-USES+=		cpe gnome libtool pathfix pkgconfig
+USES=		cpe gnome libtool pathfix pkgconfig tar:xz
 CPE_VENDOR=	cairographics
 USE_XORG=	pixman
-USE_GNOME=	referencehack
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
@@ -44,30 +39,35 @@ CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR} \
 		--disable-wgl \
 		--enable-tee
 
-OPTIONS_DEFINE=	OPENGL XCB GLIB X11
+OPTIONS_DEFINE=	OPENGL XCB GLIB X11 DOCS
 OPTIONS_DEFAULT=OPENGL XCB GLIB X11
 OPTIONS_SLAVE=	${ARCH:tu}
-XCB_DESC=	Enable XCB (X C-language Binding) Support
-GLIB_DESC=	Enable GObject Functions Feature
 OPTIONS_SUB=	yes
+
 X11_USE=	xorg=x11,xext,xrender
 X11_CONFIGURE_ENABLE=xlib
+
 OPENGL_USE=	gl=gl,egl xorg=xorgproto:both
 OPENGL_CONFIGURE_ENABLE=gl egl
 OPENGL_IMPLIES=	X11
+
+GLIB_DESC=	Enable GObject Functions Feature
 GLIB_USES=	gettext-runtime
 GLIB_USE=	gnome=glib20
 GLIB_CONFIGURE_ENABLE=	gobject
+
+XCB_DESC=	Enable XCB (X C-language Binding) Support
 XCB_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:x11/xcb-util-renderutil
 XCB_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:x11/xcb-util-renderutil
 XCB_USE=	xorg=xcb
 XCB_CONFIGURE_ENABLE=	xcb
+
 # this has another option --enable-xlib-xcb=auto but it is buggy.
 MIPS_BUILD_DEPENDS=	${LOCALBASE}/include/atomic_ops.h:devel/libatomic_ops
 MIPS_USES=	localbase
 MIPS_CONFIGURE_ENV=	cairo_cv_atomic_primitives="libatomic-ops"
 
-PLIST_SUB+=	LIBVER=2.11400.8
+PLIST_SUB+=	LIBVER=2.11512.0
 
 post-patch:
 	@${REINPLACE_CMD} -e '/strings/s/ - / -a /' \
@@ -83,6 +83,8 @@ post-patch:
 		${WRKSRC}/util/*/Makefile.in \
 		${WRKSRC}/boilerplate/Makefile.in
 
-.include <bsd.port.mk>
+post-patch-DOCS-off:
+	@${REINPLACE_CMD} -e 's|public||g' \
+		${WRKSRC}/doc/Makefile.in
 
-.endif
+.include <bsd.port.mk>
diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo
index 47b297bab1d3..0d9a029fe440 100644
--- a/graphics/cairo/distinfo
+++ b/graphics/cairo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488198143
-SHA256 (cairo-1.14.8.tar.xz) = d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20
-SIZE (cairo-1.14.8.tar.xz) = 35392464
+TIMESTAMP = 1526801051
+SHA256 (cairo-1.15.12.tar.xz) = 7623081b94548a47ee6839a7312af34e9322997806948b6eec421a8c6d0594c9
+SIZE (cairo-1.15.12.tar.xz) = 41883440
diff --git a/graphics/cairo/files/patch-src_cairo-ft-font.c b/graphics/cairo/files/patch-src_cairo-ft-font.c
new file mode 100644
index 000000000000..95a02188f384
--- /dev/null
+++ b/graphics/cairo/files/patch-src_cairo-ft-font.c
@@ -0,0 +1,51 @@
+From 7554822dd0b52d33ec7898e81b59e97164b00142 Mon Sep 17 00:00:00 2001
+From: Uli Schlachter <psychon@znc.in>
+Date: Sat, 21 Apr 2018 09:37:06 +0200
+Subject: [PATCH] Fix assertion failure in the freetype backend
+
+Fonts are kept in a hash table, so when creating a new font, the code
+first checks the hash table for an already-existing entry and only then
+is a new instance really created. There is an assert that checks that
+the key used for the hash table lookup is the same as the instance that
+is created later has, because otherwise the hash table was checked
+incorrectly.
+
+This assert failed in some conditions.
+
+Fix this by fixing some places that initialised ft hash keys in a wrong
+way.
+
+Patch by Behdad Esfahbod and submitted via bugzilla.
+
+Source: https://bugs.freedesktop.org/show_bug.cgi?id=105746#c4
+Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=105746
+Signed-off-by: Uli Schlachter <psychon@znc.in>
+---
+ src/cairo-ft-font.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
+index 79aef78f5b0d..9b10708988d7 100644
+--- src/cairo-ft-font.c
++++ src/cairo-ft-font.c
+@@ -445,7 +445,7 @@ _cairo_ft_unscaled_font_init (cairo_ft_unscaled_font_t *unscaled,
+ 
+     if (from_face) {
+ 	unscaled->from_face = TRUE;
+-	_cairo_ft_unscaled_font_init_key (unscaled, TRUE, NULL, face->face_index, face);
++	_cairo_ft_unscaled_font_init_key (unscaled, TRUE, NULL, id, face);
+ 
+ 
+         unscaled->have_color = FT_HAS_COLOR (face) != 0;
+@@ -640,7 +640,7 @@ static cairo_status_t
+ _cairo_ft_unscaled_font_create_from_face (FT_Face face,
+ 					  cairo_ft_unscaled_font_t **out)
+ {
+-    return _cairo_ft_unscaled_font_create_internal (TRUE, NULL, 0, face, out);
++    return _cairo_ft_unscaled_font_create_internal (TRUE, NULL, face->face_index, face, out);
+ }
+ 
+ static cairo_bool_t
+-- 
+2.17.0
+
diff --git a/graphics/cairo/pkg-plist b/graphics/cairo/pkg-plist
index 9967b4da831d..f79cbf2e2d2d 100644
--- a/graphics/cairo/pkg-plist
+++ b/graphics/cairo/pkg-plist
@@ -18,16 +18,10 @@ include/cairo/cairo-version.h
 include/cairo/cairo.h
 lib/cairo/cairo-fdr.a
 lib/cairo/cairo-fdr.so
-lib/cairo/cairo-fdr.so.0
-lib/cairo/cairo-fdr.so.0.0.0
 %%GLIB%%lib/cairo/cairo-sphinx.a
 %%GLIB%%lib/cairo/cairo-sphinx.so
-%%GLIB%%lib/cairo/cairo-sphinx.so.0
-%%GLIB%%lib/cairo/cairo-sphinx.so.0.0.0
 lib/cairo/libcairo-trace.a
 lib/cairo/libcairo-trace.so
-lib/cairo/libcairo-trace.so.0
-lib/cairo/libcairo-trace.so.0.0.0
 %%GLIB%%lib/libcairo-gobject.a
 %%GLIB%%lib/libcairo-gobject.so
 %%GLIB%%lib/libcairo-gobject.so.2
@@ -40,7 +34,6 @@ lib/libcairo.a
 lib/libcairo.so
 lib/libcairo.so.2
 lib/libcairo.so.%%LIBVER%%
-libdata/pkgconfig/cairo.pc
 %%OPENGL%%libdata/pkgconfig/cairo-egl.pc
 libdata/pkgconfig/cairo-fc.pc
 libdata/pkgconfig/cairo-ft.pc
@@ -53,8 +46,73 @@ libdata/pkgconfig/cairo-ps.pc
 libdata/pkgconfig/cairo-script.pc
 libdata/pkgconfig/cairo-svg.pc
 libdata/pkgconfig/cairo-tee.pc
-%%XCB%%libdata/pkgconfig/cairo-xcb.pc
 %%XCB%%libdata/pkgconfig/cairo-xcb-shm.pc
-%%X11%%libdata/pkgconfig/cairo-xlib.pc
-@comment %%X11%%%%XCB%%libdata/pkgconfig/cairo-xlib-xcb.pc
+%%XCB%%libdata/pkgconfig/cairo-xcb.pc
 %%X11%%libdata/pkgconfig/cairo-xlib-xrender.pc
+%%X11%%libdata/pkgconfig/cairo-xlib.pc
+libdata/pkgconfig/cairo.pc
+%%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-errors.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-fonts.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-memory.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-overloading.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-path.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-patterns.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-return-values.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-streams.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-surfaces.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Error-handling.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-FreeType-Fonts.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Image-Surfaces.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-PDF-Surfaces.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-PNG-Support.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Paths.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-PostScript-Surfaces.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Quartz-(CGFont)-Fonts.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Quartz-Surfaces.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Raster-Sources.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Recording-Surfaces.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Regions.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-SVG-Surfaces.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Script-Surfaces.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Tags-and-Links.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Transformations.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Types.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-User-Fonts.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Version-Information.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Win32-Fonts.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Win32-Surfaces.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-XCB-Surfaces.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-XLib-Surfaces.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-XLib-XRender-Backend.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-cairo-device-t.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-cairo-font-face-t.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-cairo-font-options-t.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-cairo-matrix-t.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-cairo-pattern-t.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-cairo-scaled-font-t.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-cairo-surface-t.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-cairo-t.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-drawing.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-fonts.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-support.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-surfaces.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-text.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo.devhelp2
+%%PORTDOCS%%%%DOCSDIR%%/cairo/home.png
+%%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.10.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.12.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.14.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.2.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.4.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.6.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.8.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/index-all.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/index.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/language-bindings.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/left-insensitive.png
+%%PORTDOCS%%%%DOCSDIR%%/cairo/left.png
+%%PORTDOCS%%%%DOCSDIR%%/cairo/right-insensitive.png
+%%PORTDOCS%%%%DOCSDIR%%/cairo/right.png
+%%PORTDOCS%%%%DOCSDIR%%/cairo/style.css
+%%PORTDOCS%%%%DOCSDIR%%/cairo/up-insensitive.png
+%%PORTDOCS%%%%DOCSDIR%%/cairo/up.png