<!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>[133443] trunk/dports/gnome/gnucash</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/133443">133443</a></dd>
<dt>Author</dt> <dd>dports@macports.org</dd>
<dt>Date</dt> <dd>2015-03-01 15:41:00 -0800 (Sun, 01 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnucash: force configure to use guile18 (#46270)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnucashPortfile">trunk/dports/gnome/gnucash/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnucashfilespatchconfigureacdiff">trunk/dports/gnome/gnucash/files/patch-configure.ac.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegnucashPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnucash/Portfile (133442 => 133443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnucash/Portfile 2015-03-01 23:34:02 UTC (rev 133442)
+++ trunk/dports/gnome/gnucash/Portfile 2015-03-01 23:41:00 UTC (rev 133443)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name gnucash
</span><span class="cx"> version 2.6.5
</span><ins>+revision 1
</ins><span class="cx"> conflicts gnucash-devel
</span><span class="cx"> categories gnome x11
</span><span class="cx"> license GPL-2+
</span><span class="lines">@@ -30,6 +31,8 @@
</span><span class="cx"> checksums rmd160 187632d0622519d468c1d40a8e64601df397c686 \
</span><span class="cx"> sha256 b1b1a943a322e7bf7afb0c2202f491560d4734a2036438bf9820378c34203d65
</span><span class="cx">
</span><ins>+patchfiles patch-configure.ac.diff
+
</ins><span class="cx"> post-patch {
</span><span class="cx"> # gnc-fq-dump needs to be patched to use MacPorts perl.
</span><span class="cx"> # (autoconf takes care of the other perl scripts.)
</span><span class="lines">@@ -76,6 +79,8 @@
</span><span class="cx"> # aqbanking is not universal
</span><span class="cx"> universal_variant no
</span><span class="cx">
</span><ins>+use_autoreconf yes
+
</ins><span class="cx"> configure.args --disable-glibtest \
</span><span class="cx"> --disable-dependency-tracking \
</span><span class="cx"> --disable-aqbanking \
</span><span class="lines">@@ -83,6 +88,10 @@
</span><span class="cx"> --disable-dbi \
</span><span class="cx"> --with-html-engine=webkit
</span><span class="cx"> configure.perl ${prefix}/bin/perl5.16
</span><ins>+configure.env \
+ GUILE=${prefix}/bin/guile18 \
+ GUILE_CONFIG=${prefix}/bin/guile18-config \
+ GUILE_TOOLS=${prefix}/bin/guile18-tools
</ins><span class="cx">
</span><span class="cx"> # this variant is obsolete as the current version of gnucash no longer
</span><span class="cx"> # supports libgtkhtml3, only webkit-gtk. It didn't work anyway due to the
</span></span></pre></div>
<a id="trunkdportsgnomegnucashfilespatchconfigureacdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gnome/gnucash/files/patch-configure.ac.diff (0 => 133443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnucash/files/patch-configure.ac.diff (rev 0)
+++ trunk/dports/gnome/gnucash/files/patch-configure.ac.diff 2015-03-01 23:41:00 UTC (rev 133443)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+--- configure.ac 2014-12-15 17:56:52.000000000 -0500
++++ configure.ac 2015-03-01 17:30:54.000000000 -0500
+@@ -467,21 +467,11 @@
+ [ GUILE1_PROGS ],
+ [ GUILE_PROGS ])])
+ ], [
+- PKG_CHECK_MODULES(GUILE,
+- [guile-2.0 >= 2.0.0],
+- [m4_ifdef([GUILE_PROGS],
+- [ GUILE_PROGS
+- gnc_have_guile_2=yes ],
+- [ AC_MSG_ERROR([ guile 2 is found on your system, but appears
+- to export different autoconf macros than what we expected. Please report this as a bug
+- in GnuCash, so we can fix this for your platform.]) ])
+- ],
+- [AC_MSG_ERROR([
++ AC_MSG_ERROR([
+ guile does not appear to be installed correctly, or is not in the
+ correct version range. Perhaps you have not installed the guile
+ development packages? Gnucash requires at least version 1.8.5 to build.
+ ])])
+-])
+
+ AM_CONDITIONAL(GNC_HAVE_GUILE_2, test "${gnc_have_guile_2}" = yes)
+ AC_SUBST(GUILE_EFFECTIVE_VERSION)
</ins></span></pre>
</div>
</div>
</body>
</html>