Attachment 202861 Details for Bug 233742 – Updated patch

[patch] Updated patch

cairo-1.16.0.diff (text/plain), 4.86 KB, created by Koop Mast on 2019-03-14 20:41:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Koop Mast

Created: 2019-03-14 20:41:30 UTC

Size: 4.86 KB

patch

obsolete

>Index: graphics/cairo/Makefile
>===================================================================
>--- graphics/cairo/Makefile	(revision 495732)
>+++ graphics/cairo/Makefile	(working copy)
>@@ -2,11 +2,11 @@
> # $FreeBSD$
> 
> PORTNAME=	cairo
>-PORTVERSION=	1.15.12
>+PORTVERSION=	1.16.0
> PORTEPOCH=	2
> CATEGORIES=	graphics
>-#MASTER_SITES=	http://cairographics.org/releases/
>-MASTER_SITES=	http://cairographics.org/snapshots/
>+MASTER_SITES=	http://cairographics.org/releases/ \
>+		http://cairographics.org/snapshots/
> 
> MAINTAINER=	gnome@FreeBSD.org
> COMMENT=	Vector graphics library with cross-device output support
>@@ -44,6 +44,7 @@
> X11_USE=	xorg=x11,xext,xrender
> X11_CONFIGURE_ENABLE=xlib
> 
>+OPENGL_USES=	gl
> OPENGL_USE=	gl=gl,egl xorg=xorgproto:both
> OPENGL_CONFIGURE_ENABLE=gl egl
> OPENGL_IMPLIES=	X11
>@@ -54,8 +55,6 @@
> 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
> 
>@@ -64,7 +63,7 @@
> MIPS_USES=	localbase
> MIPS_CONFIGURE_ENV=	cairo_cv_atomic_primitives="libatomic-ops"
> 
>-PLIST_SUB+=	LIBVER=2.11512.0
>+PLIST_SUB+=	LIBVER=2.11600.0
> 
> post-patch:
> 	@${REINPLACE_CMD} -e '/strings/s/ - / -a /' \
>Index: graphics/cairo/distinfo
>===================================================================
>--- graphics/cairo/distinfo	(revision 495732)
>+++ graphics/cairo/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1526801051
>-SHA256 (cairo-1.15.12.tar.xz) = 7623081b94548a47ee6839a7312af34e9322997806948b6eec421a8c6d0594c9
>-SIZE (cairo-1.15.12.tar.xz) = 41883440
>+TIMESTAMP = 1542402739
>+SHA256 (cairo-1.16.0.tar.xz) = 5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331
>+SIZE (cairo-1.16.0.tar.xz) = 41997432
>Index: graphics/cairo/files/patch-src_cairo-ft-font.c
>===================================================================
>--- graphics/cairo/files/patch-src_cairo-ft-font.c	(revision 495732)
>+++ graphics/cairo/files/patch-src_cairo-ft-font.c	(nonexistent)
>@@ -1,51 +0,0 @@
>-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
>-
>
>Property changes on: graphics/cairo/files/patch-src_cairo-ft-font.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: graphics/cairo/pkg-plist
>===================================================================
>--- graphics/cairo/pkg-plist	(revision 495732)
>+++ graphics/cairo/pkg-plist	(working copy)
>@@ -102,6 +102,7 @@
> %%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.16.html
> %%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.2.html
> %%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.4.html
> %%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.6.html

Actions: View | Diff

Attachments on bug 233742: 202861