<pre style='margin:0'>
Dan Ports (drkp) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0bdff764a6eb1e85c231eb5932c8801cf513610b">https://github.com/macports/macports-ports/commit/0bdff764a6eb1e85c231eb5932c8801cf513610b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0bdff764a6eb1e85c231eb5932c8801cf513610b
</span>Author: Dan R. K. Ports <dports@macports.org>
AuthorDate: Mon Dec 18 17:28:44 2017 -0800
<span style='display:block; white-space:pre;color:#404040;'> gnucash: update to v2.6.19
</span>---
gnome/gnucash/Portfile | 93 ++++++++++++++++++++++++++++++++++++++------------
1 file changed, 71 insertions(+), 22 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnucash/Portfile b/gnome/gnucash/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1414df3..ff46e20 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnucash/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnucash/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,7 @@ PortGroup perl5 1.0
</span> name gnucash
conflicts gnucash gnucash-devel
conflicts-delete ${subport}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.6.18
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.6.19
</span> perl5.branches 5.26
categories gnome x11
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,14 +29,10 @@ homepage http://www.gnucash.org/
</span> master_sites sourceforge \
http://www.gnucash.org/pub/gnucash/sources/stable/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# specific to 2.6.18
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${name}-${version}-1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir ${name}-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 79b1ac0150899746fc2a77ed6a3ae201a91a6da9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 68730bcfcead7485011eb43d3b2c5df032c714571c81f9a15d33d8494fc4249d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f7bc0779687b288b076dcc52cc7988e244c4dbd4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 50b89367246ec2d51e9765bd6bd8c669e35ceb4ac5ab92636f76758a9f3f7fd1
</span>
# We'll install gnucash's libraries in a separate subdir of
# ${prefix}/lib, because gnucash sets DYLD_LIBRARY_PATH at runtime in
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,24 +42,40 @@ checksums rmd160 79b1ac0150899746fc2a77ed6a3ae201a91a6da9 \
</span> # See https://trac.macports.org/ticket/52494.
set gnclibdir ${prefix}/lib/gnucash
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_bin_environment.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_core-utils_gnc-path.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport eq $name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src_bin_environment.in.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src_core-utils_gnc-path.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@GUILEPATH@@|${prefix}/lib/guile18|" ${worksrcpath}/src/bin/environment.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@LIBDIR@@|${gnclibdir}|" ${worksrcpath}/src/bin/environment.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@LIBDIR@@|${gnclibdir}|" ${worksrcpath}/src/core-utils/gnc-path.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # gnc-fq-dump needs to be patched to use MacPorts perl.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (autoconf takes care of the other perl scripts.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|^#!/usr/bin/perl|#!${perl5.bin}|" ${worksrcpath}/src/quotes/gnc-fq-dump
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {$subport eq "gnucash-devel"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-devel-src_bin_environment.in.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-devel-src_core-utils_gnc-path.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@GUILEPATH@@|${prefix}/lib/guile18|" ${worksrcpath}/gnucash/environment.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@LIBDIR@@|${gnclibdir}|" ${worksrcpath}/gnucash/environment.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@LIBDIR@@|${gnclibdir}|" ${worksrcpath}/libgnucash/core-utils/gnc-path.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # gnc-fq-dump needs to be patched to use MacPorts perl.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (autoconf takes care of the other perl scripts.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|^#!/usr/bin/perl|#!${perl5.bin}|" ${worksrcpath}/libgnucash/quotes/gnc-fq-dump
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@GUILEPATH@@|${prefix}/lib/guile18|" ${worksrcpath}/src/bin/environment.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@LIBDIR@@|${gnclibdir}|" ${worksrcpath}/src/bin/environment.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@LIBDIR@@|${gnclibdir}|" ${worksrcpath}/src/core-utils/gnc-path.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # gnc-fq-dump needs to be patched to use MacPorts perl.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (autoconf takes care of the other perl scripts.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|^#!/usr/bin/perl|#!${perl5.bin}|" ${worksrcpath}/src/quotes/gnc-fq-dump
</span>
# patch source files to include guile18 header instead of guile.
# (Note that gnucash's autoconf scripts prefer guile18 over guile
# if both are installed.)
fs-traverse f ${worksrcpath} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [regexp {\.[ch]$} ${f}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [regexp {\.(c|h|cpp|hpp)$} ${f}] {
</span> reinplace -q -locale C "s|<libguile\\.h>|<libguile18.h>|g" ${f}
reinplace -q -locale C "s|<libguile/|<libguile18/|g" ${f}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,7 +118,7 @@ universal_variant no
</span>
# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span> xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
system "cd ${worksrcpath} && ./autogen.sh"
if {[variant_isset python27]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,7 +134,6 @@ configure.args --disable-dependency-tracking \
</span> --disable-aqbanking \
--disable-ofx \
--disable-dbi \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-html-engine=webkit \
</span> --with-guile=1.8
configure.args-append --libdir=${gnclibdir}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,8 +186,47 @@ livecheck.regex "/${name} .*/(\[0-9\]+\\.\[0-9\]*\[02468\]\\.\[0-9\]+)/"
</span>
subport gnucash-devel {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2.7.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 6227bc00052b67ca7c609f56ef1b772ce64448fc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 baa6bae13918da62be58fe09d904ccf38893607e57dae4eba53db4ff96ab61b3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-devel-src_bin_environment.in.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-devel-src_core-utils_gnc-path.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:gtest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:libgnomecanvas \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:goffice08
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:boost \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/webkit2gtk-4.0.pc:webkit-gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-html-engine=webkit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-gtest-root=${prefix}/src/googletest \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-gmock-root=${prefix}/src/googlemock
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|-lboost_filesystem|-lboost_filesystem-mt|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/libgnucash/core-utils/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|-lboost_regex|-lboost_regex-mt|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/libgnucash/backend/dbi/Makefile.am \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/libgnucash/backend/dbi/test/Makefile.am \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/libgnucash/engine/Makefile.am \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/gnucash/import-export/csv-imp/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|-lboost_locale|-lboost_locale-mt|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/gnucash/import-export/csv-imp/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Drop in a patched version of glibconfig.h via
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://git.gnome.org/browse/gtk-osx/plain/patches/glib-gint64-long-long.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # because gnucash incorrectly assumes int64_t and gint64 are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the same size. See https://trac.macports.org/ticket/55446
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${filespath}/glibconfig.h ${worksrcpath}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> master_sites sourceforge:${name} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- http://www.gnucash.org/pub/gnucash/sources/unstable/${branch}.x/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ http://www.gnucash.org/pub/gnucash/sources/unstable/${branch}.x/
</span>
livecheck.regex "/${name} .*/(\[0-9\]+\\.\[0-9\]*\[0-9\]\\.\[0-9\]+)/"
}
</pre><pre style='margin:0'>
</pre>