<!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>[135863] trunk/dports/gnome/gnucash-devel</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/135863">135863</a></dd>
<dt>Author</dt> <dd>dports@macports.org</dd>
<dt>Date</dt> <dd>2015-05-05 14:55:22 -0700 (Tue, 05 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnucash-devel: update to v2.6.6 [merge <a href="https://trac.macports.org/changeset/135862">r135862</a> from gnucash port]</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnucashdevelPortfile">trunk/dports/gnome/gnucash-devel/Portfile</a></li>
<li><a href="#trunkdportsgnomegnucashdevelfilespatchconfigureacdiff">trunk/dports/gnome/gnucash-devel/files/patch-configure.ac.diff</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkdportsgnomegnucashdevel">trunk/dports/gnome/gnucash-devel/</a></li>
<li><a href="#trunkdportsgnomegnucashdevelPortfile">trunk/dports/gnome/gnucash-devel/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegnucashdevel"></a>
<div class="propset"><h4>Property changes: trunk/dports/gnome/gnucash-devel</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /trunk/dports/gnome/gnucash:75076,76649,87597,88798,88800,89699,95009,95767,97916,98516,105077,133443,135862
</span><a id="trunkdportsgnomegnucashdevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnucash-devel/Portfile (135862 => 135863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnucash-devel/Portfile 2015-05-05 21:54:40 UTC (rev 135862)
+++ trunk/dports/gnome/gnucash-devel/Portfile 2015-05-05 21:55:22 UTC (rev 135863)
</span><span class="lines">@@ -6,8 +6,7 @@
</span><span class="cx"> name gnucash-devel
</span><span class="cx"> conflicts gnucash
</span><span class="cx"> set my_name gnucash
</span><del>-version 2.6.5
-revision 1
</del><ins>+version 2.6.6
</ins><span class="cx"> categories gnome x11
</span><span class="cx"> license GPL-2+
</span><span class="cx"> maintainers dports openmaintainer
</span><span class="lines">@@ -33,8 +32,8 @@
</span><span class="cx"> distname ${my_name}-${version}
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><del>-checksums rmd160 187632d0622519d468c1d40a8e64601df397c686 \
- sha256 b1b1a943a322e7bf7afb0c2202f491560d4734a2036438bf9820378c34203d65
</del><ins>+checksums rmd160 6032708fd7f0ac493bb8fae4a55460df047d1dfc \
+ sha256 2337c791511ec35ca1ab207bac5f80dd5764df6029adf46a15154df370c97180
</ins><span class="cx">
</span><span class="cx"> patchfiles patch-configure.ac.diff
</span><span class="cx">
</span><span class="lines">@@ -49,6 +48,7 @@
</span><span class="cx"> fs-traverse f ${worksrcpath} {
</span><span class="cx"> if [regexp {\.[ch]$} ${f}] {
</span><span class="cx"> reinplace -locale C "s|<libguile\\.h>|<libguile18.h>|g" ${f}
</span><ins>+ reinplace -locale C "s|<libguile/|<libguile18/|g" ${f}
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -106,16 +106,6 @@
</span><span class="cx"> GUILE_CONFIG=${prefix}/bin/guile18-config \
</span><span class="cx"> GUILE_TOOLS=${prefix}/bin/guile18-tools
</span><span class="cx">
</span><del>-# this variant is obsolete as the current version of gnucash no longer
-# supports libgtkhtml3, only webkit-gtk. It didn't work anyway due to the
-# webkit-gtk dependency manipulations above.
-
-# variant gtkhtml description {Use gtkhtml instead of webkit-gtk for html rendering} {
-# configure.args-delete --with-html-engine=webkit
-# depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
-# depends_lib-append port:libgtkhtml3
-# }
-
</del><span class="cx"> variant hbci description {AqBanking/HBCI support} {
</span><span class="cx"> depends_lib-append path:lib/libaqbanking.dylib:aqbanking5-gtk
</span><span class="cx"> configure.args-delete --disable-aqbanking
</span><span class="cx">Property changes on: trunk/dports/gnome/gnucash-devel/Portfile
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /trunk/dports/gnome/gnucash/Portfile:75076,76649,77149,77299,77346,78188,79161,80328,80330,84977,86481,87597,88798,88800,89699,94888,94890,94892,95009,95767,97916,98516,105077,116990,118521,118834-118835,120699,120704,121044,129619,129799,133443,135862
</span><a id="trunkdportsgnomegnucashdevelfilespatchconfigureacdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnucash-devel/files/patch-configure.ac.diff (135862 => 135863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnucash-devel/files/patch-configure.ac.diff 2015-05-05 21:54:40 UTC (rev 135862)
+++ trunk/dports/gnome/gnucash-devel/files/patch-configure.ac.diff 2015-05-05 21:55:22 UTC (rev 135863)
</span><span class="lines">@@ -1,25 +1,22 @@
</span><del>---- 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,
</del><ins>+--- configure.ac.orig 2015-03-30 12:21:17.000000000 -0700
++++ configure.ac 2015-04-13 16:35:41.000000000 -0700
+@@ -457,11 +457,6 @@
+ gnc_have_guile_2=no
+ gnc_have_guile_www=no
+ PKG_CHECK_MODULES(GUILE,
</ins><span class="cx"> - [guile-2.0 >= 2.0.0],
</span><del>-- [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
</del><ins>+- [gnc_have_guile_2=yes
+- GUILE_EFFECTIVE_VERSION=2.0
+- AC_PATH_PROG([GUILD], guild)],
+- [PKG_CHECK_MODULES(GUILE,
+ [guile-1.8 >= 1.8.5],
+ [GUILE_EFFECTIVE_VERSION=1.8],
+ [AC_MSG_ERROR([
+@@ -469,7 +464,6 @@
</ins><span class="cx"> correct version range. Perhaps you have not installed the guile
</span><span class="cx"> development packages? Gnucash requires at least version 1.8.5 to build.
</span><span class="cx"> ])])
</span><span class="cx"> -])
</span><span class="cx">
</span><del>- AM_CONDITIONAL(GNC_HAVE_GUILE_2, test "${gnc_have_guile_2}" = yes)
</del><ins>+ AM_CONDITIONAL(GNC_HAVE_GUILE_2, test "x${gnc_have_guile_2}" = xyes)
</ins><span class="cx"> AC_SUBST(GUILE_EFFECTIVE_VERSION)
</span></span></pre>
</div>
</div>
</body>
</html>