<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/0811fd8f382159eecbd77901c374525d178d266c">https://github.com/macports/macports-ports/commit/0811fd8f382159eecbd77901c374525d178d266c</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 0811fd8f382 cherrytree: update to 0.99.39
</span>0811fd8f382 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0811fd8f382159eecbd77901c374525d178d266c
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Wed Aug 4 09:23:51 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> cherrytree: update to 0.99.39
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> completely redone; uses C++ now rather than
</span><span style='display:block; white-space:pre;color:#404040;'> python. We'll see how far back this builds.
</span><span style='display:block; white-space:pre;color:#404040;'> It is likely we might need to resurrect the python
</span><span style='display:block; white-space:pre;color:#404040;'> version of cherrytree for older systems, but
</span><span style='display:block; white-space:pre;color:#404040;'> development has stopped on that version.
</span>---
editors/cherrytree/Portfile | 57 ++++++++++++----------
...ll-apple-is-not-homebrew-for-goodness-sake.diff | 41 ++++++++++++++++
2 files changed, 71 insertions(+), 27 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/cherrytree/Portfile b/editors/cherrytree/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 399e597f508..2f69a2dd166 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/cherrytree/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/cherrytree/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,16 +2,19 @@
</span>
PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup python 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span> PortGroup app 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup giuspen cherrytree 0.39.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup giuspen cherrytree 0.99.39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories editors
license GPL-3+
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 db35f372e7f5b119c20c51291a84ca154bbd6cf4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 37ab93e25569dfdc472262cc19cfee69b0c26043780c5e3ff9b44ff322818a4f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 17993346
</span>
description Hierarchical Note Taking
long_description A Hierarchical Note Taking Application, featuring Rich Text\
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,42 +22,42 @@ long_description A Hierarchical Note Taking Application, featuring Rich T
</span>
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 677853b8b6a13473435aa9e80ae85b437cbca5a3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1cac0b1c1734013369505871dc4bd881a16cf8915f7e78357593425b6af6cbf0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 17810949
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-cherrytree-all-apple-is-not-homebrew-for-goodness-sake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:pkgconfig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# remove these with next release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-cherrytree-libcprctl-warning.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-cherrytree-systray.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:adwaita-icon-theme \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libfmt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gspell \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtksourceviewmm3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxmlxx2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:spdlog \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:uchardet
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:desktop-file-utils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DBUILD_TESTING=OFF
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.default_version 27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:py${python.version}-pygtk \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pygtksourceview \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-chardet \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:dbus-python${python.version} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-enchant \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p7zip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 18} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the legacysupport implementation of this did not work for me, doing it manually
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:macports-libcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append -nostdinc++ -I${prefix}/include/libcxx/v1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -L${prefix}/lib/libcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
app.name CherryTree
<span style='display:block; white-space:pre;background:#ffe0e0;'>-app.executable ${python.prefix}/bin/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-app.icon ./future/icons/cherrytree.ico
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.executable ${prefix}/bin/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.icon ./icons/cherrytree.ico
</span> app.use_launch_script yes
variant x11 conflicts quartz {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants gtk2 x11 quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants gtk3 x11 quartz
</span> }
variant quartz conflicts x11 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants gtk2 quartz x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants gtk3 quartz x11
</span> }
if {![variant_isset quartz]} {
default_variants-append +x11
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/bin/env python|${prefix}/bin/python2.7|" setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/cherrytree/files/patch-cherrytree-all-apple-is-not-homebrew-for-goodness-sake.diff b/editors/cherrytree/files/patch-cherrytree-all-apple-is-not-homebrew-for-goodness-sake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..df5a059a3a9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/cherrytree/files/patch-cherrytree-all-apple-is-not-homebrew-for-goodness-sake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,41 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git CMakeLists.txt CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9f8009a..eb61c88 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,13 +8,6 @@ set(CT_VERSION ${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CT_VERSION_WINDOWS ${CMAKE_MATCH_1},${CMAKE_MATCH_2},${CMAKE_MATCH_3},0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "CT_VERSION = ${CT_VERSION}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# APPLE has issues with installing in /usr/bin because of SIP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "..." FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-elseif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "..." FORCE)
</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;'>+ if(NOT PYTHON_EXEC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(PYTHON_EXEC "python3")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(NOT PYTHON_EXEC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -80,10 +73,6 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
</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;'>+ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- link_directories(/usr/local/lib /usr/local/opt/gettext/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- include_directories(/usr/local/opt/gettext/include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_MACOSX_RPATH 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig:/opt/X11/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/libxml++/lib/pkgconfig")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to fix libxml++2.6 compilation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_compile_options(-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -190,11 +179,6 @@ execute_process(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WORKING_DIRECTORY ${CMAKE_SOURCE_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;'>+-# set icon on macos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(CODE "execute_process(COMMAND ${PYTHON_EXEC} ${CMAKE_SOURCE_DIR}/scripts/set_icon_macos.py ${CMAKE_SOURCE_DIR}/icons/cherrytree.ico ${CMAKE_INSTALL_PREFIX}/bin/cherrytree)")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # install other files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(${CMAKE_SYSTEM_NAME} MATCHES Linux|.*BSD|DragonFly|Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT APPLE)
</span></pre><pre style='margin:0'>
</pre>