<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/1e3d9a362225237d1e12d710708ffdfa9f27ead3">https://github.com/macports/macports-ports/commit/1e3d9a362225237d1e12d710708ffdfa9f27ead3</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 1e3d9a36222 gnucash: fix python module install path
</span>1e3d9a36222 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1e3d9a362225237d1e12d710708ffdfa9f27ead3
</span>Author: Dan R. K. Ports <dports@macports.org>
AuthorDate: Sun Jan 7 18:14:40 2024 -0800
<span style='display:block; white-space:pre;color:#404040;'> gnucash: fix python module install path
</span>---
gnome/gnucash/Portfile | 8 +++++---
gnome/gnucash/files/patch-CMakeLists.txt.diff | 22 ++++++++++++++++++++++
2 files changed, 27 insertions(+), 3 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 c9905add9a4..09b70293b1b 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;'>@@ -9,6 +9,7 @@ name gnucash
</span> conflicts gnucash gnucash-devel
conflicts-delete ${subport}
version 5.5
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> perl5.branches 5.34
categories gnome x11
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,12 +40,15 @@ checksums rmd160 e67c3bf1e9868800a655406ce62302754c5e1a63 \
</span> sha256 b4daf67bb892b706323f62e9fa97242039d7dd0a2e1e10771e0c25817dd0ed3b \
size 14986561
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-CMakeLists.txt.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
reinplace "s|if (WIN32 OR APPLE)|if (WIN32)|" ${worksrcpath}/CMakeLists.txt
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@PYTHON_PKGD@@|${frameworks_dir}/Python.framework/Versions/${py_ver}/lib/python${py_ver}/site-packages|" ${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;'>@@ -103,9 +107,7 @@ configure.args -DENABLE_BINRELOC=OFF \
</span> -DPOD2MAN_EXECUTABLE:FILEPATH=${prefix}/bin/pod2man-${perl5.major}
# force use of the requested python
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DPYTHON_EXECUTABLE:FILEPATH=${prefix}/bin/python${py_ver}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DPYTHON_INCLUDE_DIR:PATH=${frameworks_dir}/Python.framework/Versions/${py_ver}/include/python${py_ver}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DPYTHON_LIBRARY:FILEPATH=${frameworks_dir}/Python.framework/Versions/${py_ver}/lib/libpython${py_ver}.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DPython3_EXECUTABLE:FILEPATH=${prefix}/bin/python${py_ver}
</span>
post-destroot {
file delete ${destroot}${prefix}/lib/libgwengui-gtk3.dylib
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnucash/files/patch-CMakeLists.txt.diff b/gnome/gnucash/files/patch-CMakeLists.txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9562a25d463
</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-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2024-01-06 02:09:56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2024-01-06 02:11:14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -509,18 +509,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(SEND_ERROR "Python support enabled, but Python3 interpreter and/or libaries not found.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Determine where to install the python libraries.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- execute_process(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND ${Python3_EXECUTABLE} -c "from distutils import sysconfig; print(sysconfig.get_python_lib(prefix='${CMAKE_INSTALL_PREFIX}', plat_specific=True))"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- RESULT_VARIABLE PYTHON_SYSCONFIG_RESULT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- OUTPUT_VARIABLE PYTHON_SYSCONFIG_OUTPUT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ERROR_VARIABLE PYTHON_SYSCONFIG_ERROR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- OUTPUT_STRIP_TRAILING_WHITESPACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ERROR_STRIP_TRAILING_WHITESPACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (PYTHON_SYSCONFIG_RESULT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(SEND_ERROR "Could not determine Python site-package directory:\n${PYTHON_SYSCONFIG_ERROR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set (PYTHON_SYSCONFIG_OUTPUT @@PYTHON_PKGD@@)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string(REPLACE ${CMAKE_INSTALL_PREFIX} ${CMAKE_BINARY_DIR} PYTHON_SYSCONFIG_BUILD ${PYTHON_SYSCONFIG_OUTPUT})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>