<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/b299dc5ed074c125451148dd9467782d7c9efb64">https://github.com/macports/macports-ports/commit/b299dc5ed074c125451148dd9467782d7c9efb64</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b299dc5ed074c125451148dd9467782d7c9efb64
</span>Author: Dan R. K. Ports <dports@macports.org>
AuthorDate: Mon Jul 6 00:10:10 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> gnucash: update to v4.0
</span>---
gnome/gnucash/Portfile | 18 +++++++++---------
.../files/patch-python-include-dirs-typo-fix.diff | 13 -------------
2 files changed, 9 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 cfee4cc114e..35238b2c0b1 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,7 +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 3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.0
</span> perl5.branches 5.28
categories gnome x11
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,12 +35,12 @@ use_bzip2 yes
</span> distname ${name}-${version}
worksrcdir ${name}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 25ad9822130e641240418d753a0092c98815688b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b60772c276a63639964d1e24c795fbb9a7c0c6c45959168fe5cdfe08eb796f16 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 14166587
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 65e64e9dc19518ddb9a54f62af5abcf5efbaf852 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 aa523c4f1721b19ff51ac534c049644f175e3c3c01139555eb3d9cfa50949bb7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 13978744
</span>
patchfiles-append patch-python-include-dirs-typo-fix.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-gnucash-remove-test-failing-to-build.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#patchfiles-append patch-gnucash-remove-test-failing-to-build.diff
</span> 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:#e0e0e0;'>@@ -68,8 +68,8 @@ depends_build-append port:pkgconfig \
</span> port:automake \
port:libtool \
port:gtest \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:swig3-guile \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:swig3-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:swig-guile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:swig-python
</span>
depends_lib port:guile \
port:perl${perl5.major} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,11 +80,11 @@ depends_lib port:guile \
</span> path:${prefix}/libpkgconfig/webkitgtk-3.0.pc:webkit-gtk3 \
port:libdbi \
port:libdbi-drivers \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:aqbanking5-gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:aqbanking6-gtk3 \
</span> 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>
depends_run port:gnucash-docs
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnucash/files/patch-python-include-dirs-typo-fix.diff b/gnome/gnucash/files/patch-python-include-dirs-typo-fix.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 54b54dfac5f..f939145cf67 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnucash/files/patch-python-include-dirs-typo-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnucash/files/patch-python-include-dirs-typo-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,16 +37,3 @@ index 50eedc5..f52bb1e 100644
</span> )
target_compile_definitions (sw_app_utils PRIVATE -DG_LOG_DOMAIN=\"gnc.app-utils\")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git libgnucash/core-utils/CMakeLists.txt libgnucash/core-utils/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c12fe3d..de0d0e3 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgnucash/core-utils/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgnucash/core-utils/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -147,7 +147,7 @@ if (WITH_PYTHON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_include_directories (sw_core_utils
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PRIVATE ${core_utils_ALL_INCLUDES} ${PYTHON_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PRIVATE ${core_utils_ALL_INCLUDES} ${PYTHON_INCLUDE_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_compile_definitions (sw_core_utils PRIVATE -DG_LOG_DOMAIN=\"gnc.core-utils\")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>