<!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>[122236] trunk/dports/gnome/genius</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/122236">122236</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-07-17 23:07:52 -0700 (Thu, 17 Jul 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>genius: various build fixes.
  * depend on vte-gtk2-compat instead of vte
  * patch outdated readline api
  * disable clang incompatible gcc optimizations 
  * set compile warnings to minimum
  * autoreconf to reconfigure with our intltool.m4
  * various additional dependency updates</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegeniusPortfile">trunk/dports/gnome/genius/Portfile</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li>trunk/dports/gnome/genius/files/</li>
<li><a href="#trunkdportsgnomegeniusfilespatchreadlineapidiff">trunk/dports/gnome/genius/files/patch-readline-api.diff</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegeniusPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/genius/Portfile (122235 => 122236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/genius/Portfile        2014-07-18 05:39:29 UTC (rev 122235)
+++ trunk/dports/gnome/genius/Portfile        2014-07-18 06:07:52 UTC (rev 122236)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx"> 
</span><span class="cx"> name                genius
</span><span class="cx"> version             1.0.17
</span><ins>+revision            1
</ins><span class="cx"> license             GPL-3+
</span><span class="cx"> set branch          [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories          gnome math
</span><span class="lines">@@ -20,7 +21,6 @@
</span><span class="cx">                     genius functions are written in GEL itself.
</span><span class="cx"> 
</span><span class="cx"> homepage            http://www.jirka.org/genius.html
</span><del>-#master_sites        gnome:sources/${name}/${branch}
</del><span class="cx"> master_sites        http://ftp.5z.com/pub/genius/
</span><span class="cx"> use_xz              yes
</span><span class="cx"> 
</span><span class="lines">@@ -28,35 +28,50 @@
</span><span class="cx">                     sha256  c605dde4b7b7da8e47ac9327e7d5ffddf04264e335bdefaad92bfb3640127f38
</span><span class="cx"> 
</span><span class="cx"> depends_build       port:pkgconfig \
</span><ins>+                    port:gnome-common \
</ins><span class="cx">                     port:intltool \
</span><del>-                    port:rarian
</del><ins>+                    port:gnome-doc-utils
</ins><span class="cx"> 
</span><span class="cx"> depends_lib         path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><del>-                    port:gnome-doc-utils \
</del><span class="cx">                     port:mpfr \
</span><span class="cx">                     port:ncurses \
</span><span class="cx">                     port:readline
</span><span class="cx"> 
</span><span class="cx"> depends_run         port:desktop-file-utils \
</span><span class="cx">                     port:rarian \
</span><del>-                    port:shared-mime-info \
-                    port:yelp
</del><ins>+                    port:shared-mime-info
</ins><span class="cx"> 
</span><del>-configure.args      --disable-gnome \
</del><ins>+patchfiles          patch-readline-api.diff
+
+# autoreconf to reconfigure with our intltool.m4
+
+use_autoreconf      yes
+autoreconf.args     -fvi
+
+# disable extra gcc optimization for clang compatibility
+
+configure.args      --disable-extra-gcc-optimization \
+                    --enable-compile-warnings=minimum \
+                    --disable-gnome \
</ins><span class="cx">                     --disable-gtksourceview \
</span><span class="cx">                     --disable-update-mimedb \
</span><span class="cx">                     --disable-scrollkeeper
</span><span class="cx"> 
</span><del>-configure.cflags-append -std=gnu89
</del><ins>+configure.cflags-append \
+                    -std=gnu89
</ins><span class="cx"> 
</span><span class="cx"> variant gnome description {Compile with the GNOME frontend (GUI, plotting} {
</span><span class="cx">     depends_lib-append \
</span><span class="cx">                     port:gtksourceview2 \
</span><del>-                    port:vte
</del><ins>+                    port:vte-gtk2-compat
</ins><span class="cx"> 
</span><ins>+    depends_run-append \
+                    port:yelp
+
</ins><span class="cx">     configure.args-append \
</span><span class="cx">                     --enable-gnome \
</span><span class="cx">                     --enable-gtksourceview
</span><ins>+    
</ins><span class="cx">     configure.args-delete \
</span><span class="cx">                     --disable-gnome \
</span><span class="cx">                     --disable-gtksourceview
</span></span></pre></div>
<a id="trunkdportsgnomegeniusfilespatchreadlineapidiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gnome/genius/files/patch-readline-api.diff (0 => 122236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/genius/files/patch-readline-api.diff                                (rev 0)
+++ trunk/dports/gnome/genius/files/patch-readline-api.diff        2014-07-18 06:07:52 UTC (rev 122236)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+diff -ur src.orig/genius-readline-helper.c src/genius-readline-helper.c
+--- src.orig/genius-readline-helper.c        2014-07-17 22:44:27.000000000 -0700
++++ src/genius-readline-helper.c        2014-07-17 22:45:34.000000000 -0700
+@@ -183,7 +183,7 @@
+         rl_terminal_name = &quot;xterm&quot;;
+         rl_readline_name = &quot;Genius&quot;;
+         rl_attempted_completion_function =
+-                (CPPFunction *)tab_completion;
++                (rl_completion_func_t *)tab_completion;

+         while(fgets(buf,4096,infp)) {
+                 int count;
+diff -ur src.orig/inter.c src/inter.c
+--- src.orig/inter.c        2014-07-17 22:44:27.000000000 -0700
++++ src/inter.c        2014-07-17 22:46:08.000000000 -0700
+@@ -367,5 +367,5 @@
+ {
+         rl_readline_name = &quot;Genius&quot;;
+         rl_attempted_completion_function =
+-                (CPPFunction *)tab_completion;
++                (rl_completion_func_t *)tab_completion;
+ }
</ins></span></pre>
</div>
</div>

</body>
</html>