<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/b10120ce120a9a5ee33332dfabd15c07f2d3e310">https://github.com/macports/macports-ports/commit/b10120ce120a9a5ee33332dfabd15c07f2d3e310</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b10120ce120 gnucash, gnucash-docs: update to v4.2
</span>b10120ce120 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b10120ce120a9a5ee33332dfabd15c07f2d3e310
</span>Author: Dan R. K. Ports <dports@macports.org>
AuthorDate: Tue Sep 29 19:20:42 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> gnucash, gnucash-docs: update to v4.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * switch to webkit2-gtk instead of outdated webkit-gtk3
</span><span style='display:block; white-space:pre;color:#404040;'> * add patch to fix DYLD_LOAD_PATH
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/52404
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://github.com/macports/macports-ports/pull/8069
</span>---
gnome/gnucash-docs/Portfile | 8 ++++----
gnome/gnucash/Portfile | 22 ++++++++++++----------
gnome/gnucash/files/patch-environment.in.diff | 11 +++++++++++
3 files changed, 27 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnucash-docs/Portfile b/gnome/gnucash-docs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index df87bd46c2d..677f032feb0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnucash-docs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnucash-docs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name gnucash-docs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.2
</span> license GFDL-1.1+
categories gnome x11
maintainers {dports @drkp} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +25,9 @@ long_description \
</span> homepage http://www.gnucash.org/
master_sites sourceforge:gnucash
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 5a45621b2f8f47096b63c584b9ef3a691c1ab430 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6eb1504b189ed187ae19ce4a5a39adb83ebe7810c26d30f58ee10928ac4ef8f4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 62593456
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 cb84d10f7af5140f789690413eb3da6d5e97a8c6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 051f6a038d2f2d9fb0bad9ac1b9597d3186e48ed63c27f0bb40744ffc05e39dc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 62593703
</span>
depends_lib bin:scrollkeeper-config:rarian \
port:libxml2 \
<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 6de293e5a8b..466f037c783 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;'>@@ -7,8 +7,7 @@ PortGroup cmake 1.1
</span> name gnucash
conflicts gnucash gnucash-devel
conflicts-delete ${subport}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.2
</span> perl5.branches 5.28
categories gnome x11
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,16 +35,18 @@ use_bzip2 yes
</span> distname ${name}-${version}
worksrcdir ${name}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 16d8109500ed38944663aa02fb0cdf9f792c75d9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a40fc37122e1466c8085ad2be914f0687a111065f15c5d952faede78802225aa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 13994973
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 56ef137bca9fb59834b7da452535a451af48370a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 56d8ab039ef7784303ca9eab14bfc20f593f7a3f9b682a8a7eac25906a0d1308 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 14225695
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-python-include-dirs-typo-fix.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-python-include-dirs-typo-fix.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-environment.in.diff
</span> #patchfiles-append patch-gnucash-remove-test-failing-to-build.diff
post-patch {
reinplace "s|set(HAVE_OSX_KEYCHAIN 1)||" ${worksrcpath}/CMakeLists.txt
reinplace "s|-Werror||" ${worksrcpath}/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|if (WIN32 OR APPLE)|if (WIN32)|" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Drop in a patched version of glibconfig.h via
# https://git.gnome.org/browse/gtk-osx/plain/patches/glib-gint64-long-long.patch
# because gnucash incorrectly assumes int64_t and gint64 are
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +71,8 @@ depends_build-append port:pkgconfig \
</span> port:libtool \
port:gtest \
port:swig-guile \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:swig-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:swig-python \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:webkit2-gtk
</span>
depends_lib port:guile \
port:perl${perl5.major} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,14 +80,14 @@ depends_lib port:guile \
</span> port:p${perl5.major}-finance-quote \
port:boost \
port:gtk3 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:${prefix}/libpkgconfig/webkitgtk-3.0.pc:webkit-gtk3 \
</span> port:libdbi \
port:libdbi-drivers \
port:aqbanking6-gtk3 \
port:libofx \
port:python36 \
port:icu \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxml2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxml2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
depends_run port:gnucash-docs
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnucash/files/patch-environment.in.diff b/gnome/gnucash/files/patch-environment.in.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e143207048c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnucash/files/patch-environment.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gnucash/environment.in.orig 2020-09-29 18:44:53.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gnucash/environment.in 2020-09-29 18:59:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,7 +67,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GNC_LIBRARY_PATH={SYS_LIB};{GNC_LIB}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LD_LIBRARY_PATH={GNC_LIBRARY_PATH};{LD_LIBRARY_PATH}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The same, but for GnuCash on OS X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DYLD_LIBRARY_PATH={GNC_LIBRARY_PATH};{DYLD_LIBRARY_PATH}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DYLD_LIBRARY_PATH={GNC_LIB};{DYLD_LIBRARY_PATH}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # For changing the language GnuCash uses, first refer to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to https://wiki.gnucash.org/wiki/Locale_Settings.
</span></pre><pre style='margin:0'>
</pre>