Attachment 150119 Details for Bug 195595 – Proposed patch

[patch] Proposed patch

fontconfig.diff (text/plain), 2.01 KB, created by Xin LI on 2014-12-03 00:29:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Xin LI

Created: 2014-12-03 00:29:10 UTC

Size: 2.01 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 373793)
>+++ Makefile	(working copy)
>@@ -3,8 +3,7 @@
> #   $MCom: ports/trunk/x11-fonts/fontconfig/Makefile 18637 2013-07-27 09:15:21Z kwm $
> 
> PORTNAME=	fontconfig
>-PORTVERSION=	2.11.0
>-PORTREVISION?=	3
>+PORTVERSION=	2.11.1
> PORTEPOCH?=	1
> CATEGORIES=	x11-fonts
> MASTER_SITES=	http://www.freedesktop.org/software/fontconfig/release/
>Index: distinfo
>===================================================================
>--- distinfo	(revision 373793)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (fontconfig-2.11.0.tar.bz2) = cb0e0ef6f03bc8568e95653840bb07d5859dc89d7ce2cade9d94fcccf8c1a467
>-SIZE (fontconfig-2.11.0.tar.bz2) = 1541382
>+SHA256 (fontconfig-2.11.1.tar.bz2) = dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99
>+SIZE (fontconfig-2.11.1.tar.bz2) = 1516095
>Index: files/patch-src__fccompat.c
>===================================================================
>--- files/patch-src__fccompat.c	(revision 373793)
>+++ files/patch-src__fccompat.c	(working copy)
>@@ -2,12 +2,12 @@ There is an undiagnosed ARMv6 core dump in this co
> as discovered in FreeBSD Bug 183536 when using clang.
> Removing this code from ARM builds resolves it.
> 
>---- src/fccompat.c.orig	2013-10-11 03:10:18 UTC
>-+++ src/fccompat.c
>-@@ -178,7 +178,7 @@
>-     }
>- 
>-     random_r(&fcrandbuf, &result);
>+--- src/fccompat.c.orig	2014-02-06 23:30:47.000000000 -0800
>++++ src/fccompat.c	2014-12-02 15:54:13.350950795 -0800
>+@@ -191,7 +191,7 @@
>+ #else
>+     random_r (&fcrandbuf, &result);
>+ #endif
> -#elif HAVE_RANDOM
> +#elif HAVE_RANDOM && !defined(__arm__)
>      static char statebuf[256];
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 373793)
>+++ pkg-plist	(working copy)
>@@ -58,7 +58,6 @@ etc/fonts/fonts.dtd
> include/fontconfig/fcfreetype.h
> include/fontconfig/fcprivate.h
> include/fontconfig/fontconfig.h
>-lib/libfontconfig.a
> lib/libfontconfig.la
> lib/libfontconfig.so
> lib/libfontconfig.so.1

Actions: View | Diff

Attachments on bug 195595: 150119