<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[115782] trunk/dports/graphics/fontconfig</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/115782">115782</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-01-10 21:56:18 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>fontconfig: Fix cache invalidation when font subdirectories exist (maintainer timeout)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsfontconfigPortfile">trunk/dports/graphics/fontconfig/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsfontconfigfiles0001RevertWorkaroundtheraceconditionissueonupdatipatch">trunk/dports/graphics/fontconfig/files/0001-Revert-Workaround-the-race-condition-issue-on-updati.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsfontconfigPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/fontconfig/Portfile (115781 => 115782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/fontconfig/Portfile 2014-01-11 05:01:10 UTC (rev 115781)
+++ trunk/dports/graphics/fontconfig/Portfile 2014-01-11 05:56:18 UTC (rev 115782)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx">
</span><span class="cx"> name fontconfig
</span><span class="cx"> version 2.11.0
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> categories graphics
</span><span class="cx"> maintainers ryandesign
</span><span class="cx"> license fontconfig
</span><span class="lines">@@ -39,7 +39,8 @@
</span><span class="cx"> lappend add_fonts ${prefix}/share/fonts
</span><span class="cx"> set docdir ${prefix}/share/doc/${name}
</span><span class="cx">
</span><del>-patchfiles patch-docbook-4.2.diff
</del><ins>+patchfiles patch-docbook-4.2.diff \
+ 0001-Revert-Workaround-the-race-condition-issue-on-updati.patch
</ins><span class="cx">
</span><span class="cx"> configure.args --disable-silent-rules HASDOCBOOK=no
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsgraphicsfontconfigfiles0001RevertWorkaroundtheraceconditionissueonupdatipatch"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/fontconfig/files/0001-Revert-Workaround-the-race-condition-issue-on-updati.patch (0 => 115782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/fontconfig/files/0001-Revert-Workaround-the-race-condition-issue-on-updati.patch (rev 0)
+++ trunk/dports/graphics/fontconfig/files/0001-Revert-Workaround-the-race-condition-issue-on-updati.patch 2014-01-11 05:56:18 UTC (rev 115782)
</span><span class="lines">@@ -0,0 +1,162 @@
</span><ins>+From e6f5880b2bb97e286e9609869384a57d5b3756ff Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Mon, 4 Nov 2013 15:28:07 -0800
+Subject: [PATCH] Revert "Workaround the race condition issue on updating
+ cache"
+
+Fix 90 second start time regression in XQuartz
+
+This reverts commit 0203055520206028eecee5d261887cdc91500e15.
+---
+ fc-cache/fc-cache.c | 62 +++++++++++++++++++++----------------------------
+ fontconfig/fontconfig.h | 3 ---
+ src/fcstr.c | 6 -----
+ 3 files changed, 26 insertions(+), 45 deletions(-)
+
+diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
+index af7ba6d..aeb0af2 100644
+--- fc-cache/fc-cache.c
++++ fc-cache/fc-cache.c
+@@ -118,7 +118,7 @@ usage (char *program, int error)
+ static FcStrSet *processed_dirs;
+
+ static int
+-scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force, FcBool verbose, FcBool recursive, int *changed)
++scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force, FcBool verbose, int *changed)
+ {
+ int ret = 0;
+ const FcChar8 *dir;
+@@ -141,7 +141,7 @@ scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force,
+ fflush (stdout);
+ }
+
+- if (recursive && FcStrSetMember (processed_dirs, dir))
++ if (FcStrSetMember (processed_dirs, dir))
+ {
+ if (verbose)
+ printf ("skipping, looped directory detected\n");
+@@ -213,37 +213,32 @@ scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force,
+ ret++;
+ }
+ }
+-
+- if (recursive)
+- {
+- subdirs = FcStrSetCreate ();
+- if (!subdirs)
+- {
+- fprintf (stderr, "%s: Can't create subdir set\n", dir);
+- ret++;
+- FcDirCacheUnload (cache);
+- continue;
+- }
+- for (i = 0; i < FcCacheNumSubdir (cache); i++)
+- FcStrSetAdd (subdirs, FcCacheSubdir (cache, i));
+
++ subdirs = FcStrSetCreate ();
++ if (!subdirs)
++ {
++ fprintf (stderr, "%s: Can't create subdir set\n", dir);
++ ret++;
+ FcDirCacheUnload (cache);
++ continue;
++ }
++ for (i = 0; i < FcCacheNumSubdir (cache); i++)
++ FcStrSetAdd (subdirs, FcCacheSubdir (cache, i));
+
+- sublist = FcStrListCreate (subdirs);
+- FcStrSetDestroy (subdirs);
+- if (!sublist)
+- {
+- fprintf (stderr, "%s: Can't create subdir list\n", dir);
+- ret++;
+- continue;
+- }
+- FcStrSetAdd (processed_dirs, dir);
+- ret += scanDirs (sublist, config, force, really_force, verbose, recursive, changed);
+- FcStrListDone (sublist);
++ FcDirCacheUnload (cache);
++
++ sublist = FcStrListCreate (subdirs);
++ FcStrSetDestroy (subdirs);
++ if (!sublist)
++ {
++ fprintf (stderr, "%s: Can't create subdir list\n", dir);
++ ret++;
++ continue;
+ }
+- else
+- FcDirCacheUnload (cache);
++ FcStrSetAdd (processed_dirs, dir);
++ ret += scanDirs (sublist, config, force, really_force, verbose, changed);
+ }
++ FcStrListDone (list);
+ return ret;
+ }
+
+@@ -371,11 +366,7 @@ main (int argc, char **argv)
+ }
+
+ changed = 0;
+- ret = scanDirs (list, config, force, really_force, verbose, FcTrue, &changed);
+- /* Update the directory cache again to avoid the race condition as much as possible */
+- FcStrListFirst (list);
+- ret += scanDirs (list, config, FcTrue, really_force, verbose, FcFalse, &changed);
+- FcStrListDone (list);
++ ret = scanDirs (list, config, force, really_force, verbose, &changed);
+
+ /*
+ * Try to create CACHEDIR.TAG anyway.
+@@ -388,8 +379,6 @@ main (int argc, char **argv)
+
+ cleanCacheDirectories (config, verbose);
+
+- FcConfigDestroy (config);
+- FcFini ();
+ /*
+ * Now we need to sleep a second (or two, to be extra sure), to make
+ * sure that timestamps for changes after this run of fc-cache are later
+@@ -397,7 +386,8 @@ main (int argc, char **argv)
+ * sleep(3) can't be interrupted by a signal here -- this isn't in the
+ * library, and there aren't any signals flying around here.
+ */
+- /* the resolution of mtime on FAT is 2 seconds */
++ FcConfigDestroy (config);
++ FcFini ();
+ if (changed)
+ sleep (2);
+ if (verbose)
+diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
+index dfc48f9..e2c32fe 100644
+--- fontconfig/fontconfig.h
++++ fontconfig/fontconfig.h
+@@ -974,9 +974,6 @@ FcStrSetDestroy (FcStrSet *set);
+ FcPublic FcStrList *
+ FcStrListCreate (FcStrSet *set);
+
+-FcPublic void
+-FcStrListFirst (FcStrList *list);
+-
+ FcPublic FcChar8 *
+ FcStrListNext (FcStrList *list);
+
+diff --git a/src/fcstr.c b/src/fcstr.c
+index 5707172..3a32031 100644
+--- src/fcstr.c
++++ src/fcstr.c
+@@ -1374,12 +1374,6 @@ FcStrListCreate (FcStrSet *set)
+ return list;
+ }
+
+-void
+-FcStrListFirst (FcStrList *list)
+-{
+- list->n = 0;
+-}
+-
+ FcChar8 *
+ FcStrListNext (FcStrList *list)
+ {
+--
+1.8.4.1
+
</ins></span></pre>
</div>
</div>
</body>
</html>