<!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>[152719] 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/152719">152719</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2016-09-15 04:06:06 -0700 (Thu, 15 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>fontconfig: fix cache validation bug
This caused the cache to always be considered invalid and regenerated,
leading to performance problems.
Should resolve #52029 #52088 #52099</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsfontconfigPortfile">trunk/dports/graphics/fontconfig/Portfile</a></li>
<li><a href="#trunkdportsgraphicsfontconfigfilespatchsrcfcweightcdiff">trunk/dports/graphics/fontconfig/files/patch-src-fcweight.c.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsfontconfigfilespatchsrcfccachecdiff">trunk/dports/graphics/fontconfig/files/patch-src-fccache.c.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsfontconfigPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/fontconfig/Portfile (152718 => 152719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/fontconfig/Portfile 2016-09-15 11:04:11 UTC (rev 152718)
+++ trunk/dports/graphics/fontconfig/Portfile 2016-09-15 11:06:06 UTC (rev 152719)
</span><span class="lines">@@ -6,6 +6,7 @@
</span><span class="cx">
</span><span class="cx"> name fontconfig
</span><span class="cx"> version 2.12.1
</span><ins>+revision 1
</ins><span class="cx"> categories graphics
</span><span class="cx"> maintainers ryandesign
</span><span class="cx"> license fontconfig
</span><span class="lines">@@ -39,9 +40,8 @@
</span><span class="cx"> set docdir ${prefix}/share/doc/${name}
</span><span class="cx">
</span><span class="cx"> patchfiles patch-docbook-4.2.diff
</span><del>-
-# https://bugs.freedesktop.org/show_bug.cgi?id=96609
</del><span class="cx"> patchfiles-append patch-src-fcweight.c.diff
</span><ins>+patchfiles-append patch-src-fccache.c.diff
</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="trunkdportsgraphicsfontconfigfilespatchsrcfccachecdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/fontconfig/files/patch-src-fccache.c.diff (0 => 152719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/fontconfig/files/patch-src-fccache.c.diff (rev 0)
+++ trunk/dports/graphics/fontconfig/files/patch-src-fccache.c.diff 2016-09-15 11:06:06 UTC (rev 152719)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+Validate cache correctly
+https://bugs.freedesktop.org/show_bug.cgi?id=97546
+--- src/fccache.c.orig
++++ src/fccache.c
+@@ -640,6 +640,8 @@ FcCacheOffsetsValid (FcCache *cache)
+ FcPattern *font = FcFontSetFont (fs, i);
+ FcPatternElt *e;
+ FcValueListPtr l;
++ ssize_t c;
++ char *begin;
+
+ if ((char *) font < base ||
+ (char *) font > end - sizeof (FcFontSet) ||
+@@ -653,11 +655,18 @@ FcCacheOffsetsValid (FcCache *cache)
+ if (e->values != 0 && !FcIsEncodedOffset(e->values))
+ return FcFalse;
+
+- for (j = font->num, l = FcPatternEltValues(e); j >= 0 && l; j--, l = FcValueListNext(l))
+- if (l->next != NULL && !FcIsEncodedOffset(l->next))
+- break;
+- if (j < 0)
+- return FcFalse;
++ for (j = 0; j < font->num; j++)
++ {
++ begin = (char *)FcPatternEltValues(&e[j]);
++ c = (end - begin) / sizeof (FcValueList);
++ for (l = FcPatternEltValues(&e[j]); l; l = FcValueListNext(l))
++ {
++ if ((char *) l < begin || (char *)l > end - sizeof (*l) ||
++ (l->next != NULL && !FcIsEncodedOffset(l->next)) ||
++ c-- <= 0)
++ return FcFalse;
++ }
++ }
+ }
+ }
+
</ins></span></pre></div>
<a id="trunkdportsgraphicsfontconfigfilespatchsrcfcweightcdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/fontconfig/files/patch-src-fcweight.c.diff (152718 => 152719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/fontconfig/files/patch-src-fcweight.c.diff 2016-09-15 11:04:11 UTC (rev 152718)
+++ trunk/dports/graphics/fontconfig/files/patch-src-fcweight.c.diff 2016-09-15 11:06:06 UTC (rev 152719)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> Revert a 2.12 change in fcweight.c that introduced a bug
</span><ins>+https://bugs.freedesktop.org/show_bug.cgi?id=96609
</ins><span class="cx"> --- src/fcweight.c.orig 2016-07-01 14:58:33.000000000 -0400
</span><span class="cx"> +++ src/fcweight.c 2016-07-01 14:58:56.000000000 -0400
</span><span class="cx"> @@ -56,7 +56,7 @@
</span></span></pre>
</div>
</div>
</body>
</html>