<!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>[135330] trunk/dports/x11/xorg-libxkbfile</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/135330">135330</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2015-04-22 22:40:21 -0700 (Wed, 22 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>xorg-libxkbfile: Fix build with macports-clang-3.6</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsx11xorglibxkbfilePortfile">trunk/dports/x11/xorg-libxkbfile/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/x11/xorg-libxkbfile/files/</li>
<li><a href="#trunkdportsx11xorglibxkbfilefiles0001Removeunnecessarycheckpatch">trunk/dports/x11/xorg-libxkbfile/files/0001-Remove-unnecessary-check.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsx11xorglibxkbfilePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xorg-libxkbfile/Portfile (135329 => 135330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-libxkbfile/Portfile 2015-04-23 01:08:19 UTC (rev 135329)
+++ trunk/dports/x11/xorg-libxkbfile/Portfile 2015-04-23 05:40:21 UTC (rev 135330)
</span><span class="lines">@@ -27,6 +27,10 @@
</span><span class="cx"> port:xorg-libX11 \
</span><span class="cx"> port:xorg-kbproto
</span><span class="cx">
</span><ins>+patch.pre_args -p1
+patchfiles \
+ 0001-Remove-unnecessary-check.patch
+
</ins><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url http://xorg.freedesktop.org/archive/individual/lib/?C=M&O=D
</span><span class="cx"> livecheck.regex libxkbfile-(\\d+(?:\\.\\d+)*)
</span></span></pre></div>
<a id="trunkdportsx11xorglibxkbfilefiles0001Removeunnecessarycheckpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/xorg-libxkbfile/files/0001-Remove-unnecessary-check.patch (0 => 135330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-libxkbfile/files/0001-Remove-unnecessary-check.patch (rev 0)
+++ trunk/dports/x11/xorg-libxkbfile/files/0001-Remove-unnecessary-check.patch 2015-04-23 05:40:21 UTC (rev 135330)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+From 5fcfc1acd2620c786fb1b3b741d2a7cbee4445cb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Sonnenberger?= <joerg@NetBSD.org>
+Date: Wed, 26 Nov 2014 14:33:38 +0100
+Subject: [PATCH] Remove unnecessary check.
+
+The vmods member of XkbNamesPtr is an array and thus never NULL.
+
+Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+(cherry picked from commit 9fa04388dcbb5bf205319569f540a62c03754688)
+---
+ src/cout.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cout.c b/src/cout.c
+index 399512f..ee0971e 100644
+--- a/src/cout.c
++++ b/src/cout.c
+@@ -45,7 +45,7 @@ WriteCHdrVMods(FILE *file,Display *dpy,XkbDescPtr xkb)
+ {
+ register int i,nOut;
+
+- if ((!xkb)||(!xkb->names)||(!xkb->names->vmods))
++ if ((!xkb)||(!xkb->names))
+ return False;
+ for (i=nOut=0;i<XkbNumVirtualMods;i++) {
+ if (xkb->names->vmods[i]!=None) {
+--
+2.3.5
+
</ins></span></pre>
</div>
</div>
</body>
</html>