<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/48c89ae4a2431a291448e7da908a2922d8e34b3b">https://github.com/macports/macports-ports/commit/48c89ae4a2431a291448e7da908a2922d8e34b3b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 48c89ae4a2431a291448e7da908a2922d8e34b3b
</span>Author: Ken Cunningham <ken.cunningham.webuse@gmail.com>
AuthorDate: Sun Jun 28 11:07:13 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> gnucash: remove test that fails to be found
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> upstream issue of some kind, gnucash 3.11 is out soon
</span><span style='display:block; white-space:pre;color:#404040;'> and we can see if it is still there then
</span>---
gnome/gnucash/Portfile | 4 +-
.../files/gnucash-fix-python-include-dir.diff | 13 ------
...patch-gnucash-remove-test-failing-to-build.diff | 11 +++++
.../files/patch-python-include-dirs-typo-fix.diff | 52 ++++++++++++++++++++++
4 files changed, 65 insertions(+), 15 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 ea4831ae101..cfee4cc114e 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;'>@@ -39,8 +39,8 @@ checksums rmd160 25ad9822130e641240418d753a0092c98815688b \
</span> sha256 b60772c276a63639964d1e24c795fbb9a7c0c6c45959168fe5cdfe08eb796f16 \
size 14166587
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append gnucash-fix-python-include-dir.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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;'>+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;color:#808080;'>diff --git a/gnome/gnucash/files/gnucash-fix-python-include-dir.diff b/gnome/gnucash/files/gnucash-fix-python-include-dir.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 061fccff682..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnucash/files/gnucash-fix-python-include-dir.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git bindings/python/CMakeLists.txt bindings/python/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7bf9164..3d8a033 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- bindings/python/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ bindings/python/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -57,7 +57,7 @@ if(WITH_PYTHON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_SOURCE_DIR}/libgnucash/core-utils
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${GLIB_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${PYTHON_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${PYTHON_INCLUDE_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_library(gnucash_core_c MODULE ${SWIG_GNUCASH_CORE_C})
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnucash/files/patch-gnucash-remove-test-failing-to-build.diff b/gnome/gnucash/files/patch-gnucash-remove-test-failing-to-build.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9232efa9717
</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-gnucash-remove-test-failing-to-build.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;'>+--- ./bindings/python/tests/CMakeLists.txt.orig 2020-06-28 10:25:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./bindings/python/tests/CMakeLists.txt 2020-06-28 10:34:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,7 +5,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Because it hasn't been built yet
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(test_core_dir ${CMAKE_BINARY_DIR}/common/test-core)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_custom_target(test-python-bindings ALL DEPENDS unittest_support gnucash-core-c-build gnucash-core-c-py swig-app-utils-python)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_custom_target(test-python-bindings ALL DEPENDS unittest_support gnucash-core-c-build gnucash-core-c-py)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_dependencies(check test-python-bindings)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_test(python-bindings ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/runTests.py.in)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_property(TEST python-bindings PROPERTY ENVIRONMENT
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..54b54dfac5f
</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-python-include-dirs-typo-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,52 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git bindings/python/CMakeLists.txt bindings/python/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7bf9164..3d8a033 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- bindings/python/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ bindings/python/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -57,7 +57,7 @@ if(WITH_PYTHON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_SOURCE_DIR}/libgnucash/core-utils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${GLIB_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${PYTHON_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${PYTHON_INCLUDE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library(gnucash_core_c MODULE ${SWIG_GNUCASH_CORE_C})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git common/test-core/CMakeLists.txt common/test-core/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a2fe5b1..9cd9163 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- common/test-core/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ common/test-core/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,7 +46,7 @@ target_link_libraries(test-core-guile test-core ${GUILE_LDFLAGS} ${GLIB2_LDFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (WITH_PYTHON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library(unittest_support MODULE ${SWIG_UNITTEST_SUPPORT_PYTHON_C})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(unittest_support test-core ${PYTHON_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target_include_directories(unittest_support PRIVATE ${PYTHON_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_include_directories(unittest_support PRIVATE ${PYTHON_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties(unittest_support PROPERTIES PREFIX "_")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (HAVE_STRINGOP_TRUNCATION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_options(unittest_support PRIVATE -Wno-error=stringop-truncation)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git libgnucash/app-utils/CMakeLists.txt libgnucash/app-utils/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 50eedc5..f52bb1e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgnucash/app-utils/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgnucash/app-utils/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,7 +120,7 @@ if (WITH_PYTHON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_include_directories (sw_app_utils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PRIVATE ${app_utils_ALL_INCLUDES} ${PYTHON_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PRIVATE ${app_utils_ALL_INCLUDES} ${PYTHON_INCLUDE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_definitions (sw_app_utils PRIVATE -DG_LOG_DOMAIN=\"gnc.app-utils\")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git libgnucash/core-utils/CMakeLists.txt libgnucash/core-utils/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c12fe3d..de0d0e3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgnucash/core-utils/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgnucash/core-utils/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -147,7 +147,7 @@ if (WITH_PYTHON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_include_directories (sw_core_utils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PRIVATE ${core_utils_ALL_INCLUDES} ${PYTHON_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PRIVATE ${core_utils_ALL_INCLUDES} ${PYTHON_INCLUDE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_definitions (sw_core_utils PRIVATE -DG_LOG_DOMAIN=\"gnc.core-utils\")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>