gnucash, gnucash-docs: update to v4.2

 * switch to webkit2-gtk instead of outdated webkit-gtk3
 * add patch to fix DYLD_LOAD_PATH

Closes: https://trac.macports.org/ticket/52404
Closes: macports#8069

gnome/gnucash-docs/Portfile

@@ -3,7 +3,7 @@
 PortSystem      1.0
 
 name            gnucash-docs
-version         4.1
+version         4.2
 license         GFDL-1.1+
 categories      gnome x11
 maintainers     {dports @drkp} openmaintainer
@@ -25,9 +25,9 @@ long_description \
 homepage        http://www.gnucash.org/
 master_sites    sourceforge:gnucash
 
-checksums       rmd160  5a45621b2f8f47096b63c584b9ef3a691c1ab430 \
-                sha256  6eb1504b189ed187ae19ce4a5a39adb83ebe7810c26d30f58ee10928ac4ef8f4 \
-                size    62593456
+checksums       rmd160  cb84d10f7af5140f789690413eb3da6d5e97a8c6 \
+                sha256  051f6a038d2f2d9fb0bad9ac1b9597d3186e48ed63c27f0bb40744ffc05e39dc \
+                size    62593703
 
 depends_lib     bin:scrollkeeper-config:rarian \
                 port:libxml2 \

gnome/gnucash/Portfile

@@ -7,8 +7,7 @@ PortGroup         cmake 1.1
 name              gnucash
 conflicts         gnucash gnucash-devel
 conflicts-delete  ${subport}
-version           4.1
-revision          1
+version           4.2
 perl5.branches    5.28
 categories        gnome x11
 license           GPL-2+
@@ -36,16 +35,18 @@ use_bzip2         yes
 distname          ${name}-${version}
 worksrcdir        ${name}-${version}
 
-checksums         rmd160  16d8109500ed38944663aa02fb0cdf9f792c75d9 \
-                  sha256  a40fc37122e1466c8085ad2be914f0687a111065f15c5d952faede78802225aa \
-                  size    13994973
+checksums         rmd160  56ef137bca9fb59834b7da452535a451af48370a \
+                  sha256  56d8ab039ef7784303ca9eab14bfc20f593f7a3f9b682a8a7eac25906a0d1308 \
+                  size    14225695
 
-patchfiles-append patch-python-include-dirs-typo-fix.diff
+patchfiles-append patch-python-include-dirs-typo-fix.diff \
+                  patch-environment.in.diff
 #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
-
+    reinplace "s|if (WIN32 OR APPLE)|if (WIN32)|" ${worksrcpath}/CMakeLists.txt
+
     # 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
@@ -70,22 +71,23 @@ depends_build-append     port:pkgconfig \
                          port:libtool \
                          port:gtest \
                          port:swig-guile \
-                         port:swig-python
+                         port:swig-python \
+                         port:webkit2-gtk
 
 depends_lib       port:guile \
                   port:perl${perl5.major} \
                   port:p${perl5.major}-date-manip \
                   port:p${perl5.major}-finance-quote \
                   port:boost \
                   port:gtk3 \
-                  path:${prefix}/libpkgconfig/webkitgtk-3.0.pc:webkit-gtk3 \
                   port:libdbi \
                   port:libdbi-drivers \
                   port:aqbanking6-gtk3 \
                   port:libofx \
                   port:python36 \
                   port:icu \
-                  port:libxml2 \
+                  port:libxml2
+
 
 depends_run       port:gnucash-docs
 

gnome/gnucash/files/patch-environment.in.diff

@@ -0,0 +1,11 @@
+--- gnucash/environment.in.orig	2020-09-29 18:44:53.000000000 -0700
++++ gnucash/environment.in	2020-09-29 18:59:04.000000000 -0700
+@@ -67,7 +67,7 @@
+ GNC_LIBRARY_PATH={SYS_LIB};{GNC_LIB}
+ LD_LIBRARY_PATH={GNC_LIBRARY_PATH};{LD_LIBRARY_PATH}
+ # The same, but for GnuCash on OS X
+-DYLD_LIBRARY_PATH={GNC_LIBRARY_PATH};{DYLD_LIBRARY_PATH}
++DYLD_LIBRARY_PATH={GNC_LIB};{DYLD_LIBRARY_PATH}
+
+ # For changing the language GnuCash uses, first refer to
+ # to https://wiki.gnucash.org/wiki/Locale_Settings.