<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/d23688c2aa2b6dd719554f48e4d5cf3d7fe8d609">https://github.com/macports/macports-ports/commit/d23688c2aa2b6dd719554f48e4d5cf3d7fe8d609</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 d23688c2aa2 cherrytree: add two upstream patches
</span>d23688c2aa2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d23688c2aa2b6dd719554f48e4d5cf3d7fe8d609
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Thu Jul 2 14:00:18 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> cherrytree: add two upstream patches
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> fix an issue with the systray function
</span><span style='display:block; white-space:pre;color:#404040;'> stop warnings on launch about linux-only proc
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> both upstreamed already, remove patches with
</span><span style='display:block; white-space:pre;color:#404040;'> next release
</span>---
editors/cherrytree/Portfile | 7 +++-
.../files/patch-cherrytree-libcprctl-warning.diff | 23 +++++++++++
.../cherrytree/files/patch-cherrytree-systray.diff | 47 ++++++++++++++++++++++
3 files changed, 76 insertions(+), 1 deletion(-)
<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 5fa473f102c..f9adb77a2b4 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;'>@@ -7,7 +7,7 @@ PortGroup app 1.0
</span> PortGroup active_variants 1.1
github.setup giuspen cherrytree 0.39.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories editors
license GPL-3+
maintainers {kencu @kencu} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,6 +23,11 @@ checksums rmd160 677853b8b6a13473435aa9e80ae85b437cbca5a3 \
</span> sha256 1cac0b1c1734013369505871dc4bd881a16cf8915f7e78357593425b6af6cbf0 \
size 17810949
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# remove these with next release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-cherrytree-libcprctl-warning.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cherrytree-systray.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append port:desktop-file-utils
python.default_version 27
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/cherrytree/files/patch-cherrytree-libcprctl-warning.diff b/editors/cherrytree/files/patch-cherrytree-libcprctl-warning.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8d0bceb9268
</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-libcprctl-warning.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c94c9df33b2fe43836b872a7c8d1d96f96a47061 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Ken <21211439+kencu@users.noreply.github.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 1 Jul 2020 02:29:05 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] main.py : don't try libc.prctl on MacOS (#973)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+It's not available on macOS, and so generates a warning every launch.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ modules/main.py | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/modules/main.py b/modules/main.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 47664b32..d3f6115b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/modules/main.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/modules/main.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -167,7 +167,7 @@ def initializations():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if hasattr(sys, 'frozen'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ warnings.filterwarnings(cons.STR_IGNORE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if not cons.IS_WIN_OS:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if not (cons.IS_WIN_OS or cons.IS_MAC_OS):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # change process name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import ctypes, ctypes.util
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/cherrytree/files/patch-cherrytree-systray.diff b/editors/cherrytree/files/patch-cherrytree-systray.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2e340e216eb
</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-systray.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,47 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 2b884b572a4c93c010892980b073ec64bde3e103 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: txe <whats.eternal@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 2 Jul 2020 18:27:54 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] :tager: disables systray on macos for pygtk (#980)
</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;'>+ modules/config.py | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ modules/cons.py | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ modules/core.py | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3 files changed, 3 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/modules/config.py b/modules/config.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e66d2756..4f5bed38 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/modules/config.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/modules/config.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2218,6 +2218,7 @@ def preferences_tab_misc(dad, vbox_misc, pref_dialog):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ frame_system_tray.add(align_system_tray)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checkbutton_systray.set_active(dad.systray)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if cons.DISABLE_SYSTRAY: checkbutton_systray.set_sensitive(False)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checkbutton_start_on_systray.set_active(dad.start_on_systray)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checkbutton_start_on_systray.set_sensitive(dad.systray)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checkbutton_use_appind.set_active(dad.use_appind)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/modules/cons.py b/modules/cons.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 90f97252..e1701909 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/modules/cons.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/modules/cons.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,6 +70,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ except: HAS_APPINDICATOR = False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XDG_CURRENT_DESKTOP = 'XDG_CURRENT_DESKTOP'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HAS_SYSTRAY = not (XDG_CURRENT_DESKTOP in os.environ and os.environ[XDG_CURRENT_DESKTOP] == "Unity")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DISABLE_SYSTRAY = IS_MAC_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AVAILABLE_LANGS = ['default', 'cs', 'de', 'el', 'en', 'es', 'fi', 'fr', 'hy', 'it', 'ja', 'lt', 'nl', 'pl', 'pt_BR', 'ru', 'sl', 'sv', 'tr', 'uk', 'zh_CN']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COLOR_48_LINK_WEBS = "#00008989ffff"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/modules/core.py b/modules/core.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1aea7796..a766b9d2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/modules/core.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/modules/core.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -255,6 +255,7 @@ def __init__(self, lang_str, open_with_file, node_name, boss, is_startup, is_arg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.file_startup_load(open_with_file, node_name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else: self.file_name = ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if self.tree_is_empty(): self.update_node_name_header()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if cons.DISABLE_SYSTRAY: self.systray = False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if self.systray:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if not self.boss.systray_active:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.status_icon_enable()
</span></pre><pre style='margin:0'>
</pre>