<!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>[136030] trunk/dports/lang/q</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/136030">136030</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-05-10 03:33:02 -0700 (Sun, 10 May 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>q: fix build with readline 6.3 or newer (#47692)</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangqPortfile">trunk/dports/lang/q/Portfile</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangqfilespatchreadline63diff">trunk/dports/lang/q/files/patch-readline-6.3.diff</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangqPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/q/Portfile (136029 => 136030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/q/Portfile        2015-05-10 04:08:46 UTC (rev 136029)
+++ trunk/dports/lang/q/Portfile        2015-05-10 10:33:02 UTC (rev 136030)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx">     rmd160 61a7eba9857ae2c7c553625a423c62fd737836e4
</span><span class="cx"> 
</span><span class="cx"> patchfiles \
</span><ins>+    patch-readline-6.3.diff \
</ins><span class="cx">     patch-system.c.diff
</span><span class="cx"> 
</span><span class="cx"> configure.args \
</span></span></pre></div>
<a id="trunkdportslangqfilespatchreadline63diff"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/q/files/patch-readline-6.3.diff (0 => 136030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/q/files/patch-readline-6.3.diff                                (rev 0)
+++ trunk/dports/lang/q/files/patch-readline-6.3.diff        2015-05-10 10:33:02 UTC (rev 136030)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+Fix build with readline 6.3 and newer.
+--- modules/clib/system.c.orig        2008-02-23 01:31:15.000000000 -0600
++++ modules/clib/system.c        2015-05-10 05:28:51.000000000 -0500
+@@ -5149,7 +5149,7 @@
+   return rl_completion_matches(text, my_sym_generator);
+ }

+-static CPPFunction *my_completion_function(void)
++static rl_completion_func_t *my_completion_function(void)
+ {
+   expr x = mksym(sym(RL_COMPLETION_FUNCTION)), f = eval(x);
+   if (f != x &amp;&amp; f != completion_function) {
+@@ -5157,7 +5157,7 @@
+     completion_function = newref(f);
+   } else
+     dispose(f);
+-  return (CPPFunction *) (completion_function?my_sym_completion:NULL);
++  return (rl_completion_func_t *) (completion_function?my_sym_completion:NULL);
+ }

+ static char *my_word_break_characters(void)
+@@ -5185,7 +5185,7 @@
+     rl_basic_word_break_characters;
+   char *save_rl_completer_word_break_characters =
+     rl_completer_word_break_characters;
+-  CPPFunction *save_rl_attempted_completion_function =
++  rl_completion_func_t *save_rl_attempted_completion_function =
+     rl_attempted_completion_function;
+   HISTORY_STATE *save_hist = history_get_history_state();
+   int histmax = unstifle_history();
+--- src/q.c.orig        2007-10-27 13:59:05.000000000 -0500
++++ src/q.c        2015-05-10 05:29:08.000000000 -0500
+@@ -652,7 +652,7 @@
+ {
+   rl_readline_name = &quot;Q&quot;;
+   rl_basic_word_break_characters = &quot; \t\n\&quot;\\'`@$&gt;&lt;=,;|%&amp;~{[(&quot;;
+-  rl_attempted_completion_function = (CPPFunction *)sym_completion;
++  rl_attempted_completion_function = (rl_completion_func_t *)sym_completion;
+   save_hist = history_get_history_state();
+ }

</ins></span></pre>
</div>
</div>

</body>
</html>