Attachment 214242 Details for Bug 245915 – workaround: revert regressing backport

[patch] workaround: revert regressing backport

bug245915.workaround.diff (text/plain), 1.96 KB, created by Jan Beich on 2020-05-07 19:14:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2020-05-07 19:14:42 UTC

Size: 1.96 KB

patch

obsolete

>Index: x11-fonts/fontconfig/Makefile
>===================================================================
>--- x11-fonts/fontconfig/Makefile	(revision 534282)
>+++ x11-fonts/fontconfig/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	fontconfig
> PORTVERSION=	2.13.92
>-PORTREVISION?=	1
>+PORTREVISION?=	2
> PORTEPOCH?=	1
> CATEGORIES=	x11-fonts
> MASTER_SITES=	https://www.freedesktop.org/software/fontconfig/release/
>Index: x11-fonts/fontconfig/files/patch-2.13.92.diff
>===================================================================
>--- x11-fonts/fontconfig/files/patch-2.13.92.diff	(revision 534282)
>+++ x11-fonts/fontconfig/files/patch-2.13.92.diff	(working copy)
>@@ -26,8 +26,6 @@
> # https://cgit.freedesktop.org/fontconfig/commit/?id=452be8125f0e2a18a7dfef469e05d19374d36307
> # Fix the process substitution doesn't work with FONTCONFIG_FILE
> # https://cgit.freedesktop.org/fontconfig/commit/?id=71d6866d381a0ab3585eb9ee760aeec98e722359
>-# Fix memory leaks
>-# https://cgit.freedesktop.org/fontconfig/commit/?id=61573ad5f7c4dd0860d613d99d0086433240eb75
> # Fix assertion in FcFini()
> # https://cgit.freedesktop.org/fontconfig/commit/?id=fbc05949ef52c8a8d69233eed77f6636dffec280
> # Set exact boolean value to color property
>@@ -1400,33 +1398,6 @@ test/test-bz1744377.c, test/test-crbug1004254.c, t
>      /* Add the PostScript name into the cache */
>      if (!variable)
>      {
>-@@ -2142,6 +2200,17 @@ bail2:
>-     FcCharSetDestroy (cs);
>- bail1:
>-     FcPatternDestroy (pat);
>-+    if (master)
>-+    {
>-+#ifdef HAVE_FT_DONE_MM_VAR
>-+	if (face->glyph)
>-+	    FT_Done_MM_Var (face->glyph->library, master);
>-+#else
>-+	free (master);
>-+#endif
>-+    }
>-+    if (!nm_share && name_mapping)
>-+	free (name_mapping);
>-     if (foundry_)
>- 	free (foundry_);
>- bail0:
>-@@ -2302,6 +2371,8 @@ bail:
>-     if (face)
>- 	FT_Done_Face (face);
>-     FT_Done_FreeType (ftLibrary);
>-+    if (nm)
>-+	free (nm);
>- 
>-     return ret;
>- }
> --- src/fcinit.c.orig	2018-06-05 10:36:38 UTC
> +++ src/fcinit.c
> @@ -199,10 +199,10 @@ void

Actions: View | Diff

Attachments on bug 245915: 214242 | 214243 | 214244