[Midnightbsd-cvs] mports [19266] trunk/x11-fonts/fontconfig: fix cache

[laffer1 at midnightbsd.org]

Revision: 19266
          http://svnweb.midnightbsd.org/mports/?rev=19266
Author:   laffer1
Date:     2015-05-31 10:37:59 -0400 (Sun, 31 May 2015)
Log Message:
-----------
fix cache

Modified Paths:
--------------
    trunk/x11-fonts/fontconfig/Makefile

Added Paths:
-----------
    trunk/x11-fonts/fontconfig/files/patch-fc-cache_fc-cache.c
    trunk/x11-fonts/fontconfig/files/patch-src__fccompat.c
    trunk/x11-fonts/fontconfig/files/patch-src_fcatomic.h

Modified: trunk/x11-fonts/fontconfig/Makefile
===================================================================
--- trunk/x11-fonts/fontconfig/Makefile	2015-05-31 02:17:14 UTC (rev 19265)
+++ trunk/x11-fonts/fontconfig/Makefile	2015-05-31 14:37:59 UTC (rev 19266)
@@ -2,7 +2,7 @@
 
 PORTNAME=	fontconfig
 PORTVERSION=	2.11.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH?=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.freedesktop.org/software/fontconfig/release/

Added: trunk/x11-fonts/fontconfig/files/patch-fc-cache_fc-cache.c
===================================================================
--- trunk/x11-fonts/fontconfig/files/patch-fc-cache_fc-cache.c	                        (rev 0)
+++ trunk/x11-fonts/fontconfig/files/patch-fc-cache_fc-cache.c	2015-05-31 14:37:59 UTC (rev 19266)
@@ -0,0 +1,25 @@
+From f44157c809d280e2a0ce87fb078fc4b278d24a67 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira at tagoh.org>
+Date: Thu, 10 Apr 2014 10:27:55 +0000
+Subject: Fix fc-cache fail with -r
+
+Do not unlink the cache even if --really-force is given.
+because re-scanning process expects the cache exists.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=77252
+---
+diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
+index 99e0e9f..90ebad3 100644
+--- fc-cache/fc-cache.c
++++ fc-cache/fc-cache.c
+@@ -388,7 +388,7 @@ main (int argc, char **argv)
+     list = FcStrListCreate (updateDirs);
+     if (list)
+     {
+-	ret += scanDirs (list, config, FcTrue, really_force, verbose, FcFalse, &changed, NULL);
++	ret += scanDirs (list, config, FcTrue, FcFalse, verbose, FcFalse, &changed, NULL);
+ 	FcStrListDone (list);
+     }
+     FcStrSetDestroy (updateDirs);
+--
+cgit v0.9.0.2-2-gbebe


Property changes on: trunk/x11-fonts/fontconfig/files/patch-fc-cache_fc-cache.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-fonts/fontconfig/files/patch-src__fccompat.c
===================================================================
--- trunk/x11-fonts/fontconfig/files/patch-src__fccompat.c	                        (rev 0)
+++ trunk/x11-fonts/fontconfig/files/patch-src__fccompat.c	2015-05-31 14:37:59 UTC (rev 19266)
@@ -0,0 +1,17 @@
+There is an undiagnosed ARMv6 core dump in this code
+as discovered in FreeBSD Bug 183536 when using clang.
+Removing this code from ARM builds resolves it.
+
+https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=183536
+
+--- src/fccompat.c.orig	2014-08-12 16:34:15.875384345 +0200
++++ src/fccompat.c	2014-08-12 16:35:04.752379905 +0200
+@@ -191,7 +191,7 @@
+ #else
+     random_r (&fcrandbuf, &result);
+ #endif
+-#elif HAVE_RANDOM
++#elif HAVE_RANDOM && !defined(__arm__)
+     static char statebuf[256];
+     char *state;
+     static FcBool initialized = FcFalse;


Property changes on: trunk/x11-fonts/fontconfig/files/patch-src__fccompat.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-fonts/fontconfig/files/patch-src_fcatomic.h
===================================================================
--- trunk/x11-fonts/fontconfig/files/patch-src_fcatomic.h	                        (rev 0)
+++ trunk/x11-fonts/fontconfig/files/patch-src_fcatomic.h	2015-05-31 14:37:59 UTC (rev 19266)
@@ -0,0 +1,20 @@
+--- ./src/fcatomic.h.orig	2013-10-11 03:10:18.000000000 +0000
++++ ./src/fcatomic.h	2014-12-06 21:48:12.136252912 +0000
+@@ -96,7 +96,17 @@
+ #define fc_atomic_int_add(AI, V)	__sync_fetch_and_add (&(AI), (V))
+ 
+ #define fc_atomic_ptr_get(P)		(void *) (__sync_synchronize (), *(P))
++#if defined(__FreeBSD__) && defined(__mips_n64)
++#include <sys/types.h>
++#include <machine/atomic.h>
++#define fc_atomic_ptr_cmpexch(P,O,N)	atomic_cmpset_rel_64 ((uint64_t *)(P), (uint64_t)(O), (uint64_t)(N))
++#elif defined(__FreeBSD__) && defined(__mips)
++#include <sys/types.h>
++#include <machine/atomic.h>
++#define fc_atomic_ptr_cmpexch(P,O,N)	atomic_cmpset_rel_32 ((uint32_t *)(P), (uint32_t)(O), (uint32_t)(N))
++#else
+ #define fc_atomic_ptr_cmpexch(P,O,N)	__sync_bool_compare_and_swap ((P), (O), (N))
++#endif /* defined(__FreeBSD__) && defined(__mips__) */
+ 
+ 
+ #elif !defined(FC_NO_MT) && defined(HAVE_SOLARIS_ATOMIC_OPS)


Property changes on: trunk/x11-fonts/fontconfig/files/patch-src_fcatomic.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property