<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f68816f56d489a95682adc4155bc4f0798c7d591">https://github.com/macports/macports-ports/commit/f68816f56d489a95682adc4155bc4f0798c7d591</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 f68816f56d4 nicotine-plus: update to 3.3.6
</span>f68816f56d4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f68816f56d489a95682adc4155bc4f0798c7d591
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Sat Nov 2 22:05:19 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> nicotine-plus: update to 3.3.6
</span>---
www/nicotine-plus/Portfile | 17 ++++++++++----
.../0757668709f00190c357549f3eb5101566da0bde.patch | 27 ++++++++++++++++++++++
.../937eacfb63e026030e4f010097c3c2e8f8a0cbf6.patch | 27 ++++++++++++++++++++++
www/nicotine-plus/files/patch-GTK3.diff | 4 ++--
www/nicotine-plus/files/patch-GTK4.diff | 19 +++++++--------
5 files changed, 78 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nicotine-plus/Portfile b/www/nicotine-plus/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 827a0728d33..b3150e2fda8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/nicotine-plus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/nicotine-plus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,20 +4,20 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup python 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup nicotine-plus nicotine-plus 3.3.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup nicotine-plus nicotine-plus 3.3.6
</span> revision 0
categories www p2p python
license GPL-3
platforms {darwin any}
supported_archs noarch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span> description Nicotine+ is a graphical client for the Soulseek peer-to-peer network
long_description Nicotine+ aims to be a lightweight, pleasant, free and open-source alternative \
to the official Soulseek client, while also providing a comprehensive set of features.
homepage https://nicotine-plus.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1213351fcfd1c6be078a6bef55b9b2975edaffb9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f096b0ee343ca01a53dac1a265cd5dea672a7f8c19a55916241c4728df0d4102 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3742720
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 dfd85784edcd0af1859d886b8d57ebc70e98af2c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3911c178f96da1fdd48dedd98ac2d2ad6a59da388f091f91bb5722871cca91da \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3752758
</span> github.tarball_from archive
variant python311 conflicts python312 description "Use Python 3.11" {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,6 +41,12 @@ depends_lib-append port:adwaita-icon-theme \
</span> port:gettext-runtime \
port:py${python.version}-gobject3
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patches from the upstream. Drop in next release.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/nicotine-plus/nicotine-plus/issues/3172
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/nicotine-plus/nicotine-plus/issues/3176
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 937eacfb63e026030e4f010097c3c2e8f8a0cbf6.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0757668709f00190c357549f3eb5101566da0bde.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant gtk3 conflicts gtk4 description "Build with GTK3" {
patchfiles-append \
patch-GTK3.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,6 +56,7 @@ variant gtk3 conflicts gtk4 description "Build with GTK3" {
</span> }
# https://github.com/nicotine-plus/nicotine-plus/issues/2942
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/nicotine-plus/nicotine-plus/issues/3172
</span> variant gtk4 conflicts gtk3 description "Build with GTK4" {
patchfiles-append \
patch-GTK4.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nicotine-plus/files/0757668709f00190c357549f3eb5101566da0bde.patch b/www/nicotine-plus/files/0757668709f00190c357549f3eb5101566da0bde.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..24c5eeb0cea
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/nicotine-plus/files/0757668709f00190c357549f3eb5101566da0bde.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 0757668709f00190c357549f3eb5101566da0bde Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Mat <mail@mathias.is>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 2 Nov 2024 10:22:35 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] popupmenu.py: fix crash in older PyGObject versions on macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes #3176
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pynicotine/gtkgui/widgets/popupmenu.py | 6 +++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 5 insertions(+), 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/pynicotine/gtkgui/widgets/popupmenu.py b/pynicotine/gtkgui/widgets/popupmenu.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7c7230ba8c58..afc767213213 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pynicotine/gtkgui/widgets/popupmenu.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pynicotine/gtkgui/widgets/popupmenu.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -296,7 +296,11 @@ def _callback_click_gtk4(self, controller, _num_p, pos_x, pos_y):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def _callback_click_gtk4_darwin(self, controller, _num_p, pos_x, pos_y):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- event = controller.get_last_event()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ event = controller.get_last_event()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ except TypeError:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # PyGObject <3.48.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if event.triggers_context_menu():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return self._callback(controller, pos_x, pos_y)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nicotine-plus/files/937eacfb63e026030e4f010097c3c2e8f8a0cbf6.patch b/www/nicotine-plus/files/937eacfb63e026030e4f010097c3c2e8f8a0cbf6.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..912584ce9b7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/nicotine-plus/files/937eacfb63e026030e4f010097c3c2e8f8a0cbf6.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 937eacfb63e026030e4f010097c3c2e8f8a0cbf6 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Mat <mail@mathias.is>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 1 Nov 2024 23:02:03 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] theme.py: fix crash in older GTK 4 versions on macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes #3172
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pynicotine/gtkgui/widgets/theme.py | 6 +++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 5 insertions(+), 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/pynicotine/gtkgui/widgets/theme.py b/pynicotine/gtkgui/widgets/theme.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index cd7163f04418..bb234d133810 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pynicotine/gtkgui/widgets/theme.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pynicotine/gtkgui/widgets/theme.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -148,7 +148,11 @@ def set_default_font_size():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Enable OS-specific font tweaks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GTK_SETTINGS.props.gtk_font_rendering = Gtk.FontRendering.MANUAL # pylint: disable=no-member
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GTK_SETTINGS.props.gtk_font_rendering = Gtk.FontRendering.MANUAL # pylint: disable=no-member
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ except AttributeError:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # GTK <4.16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pass
</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;'>+ def set_visual_settings():
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nicotine-plus/files/patch-GTK3.diff b/www/nicotine-plus/files/patch-GTK3.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e86781aa18a..3eae2b5d974 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/nicotine-plus/files/patch-GTK3.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/nicotine-plus/files/patch-GTK3.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pynicotine/gtkgui/__init__.py 2024-09-23 01:46:20.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pynicotine/gtkgui/__init__.py 2024-09-23 12:37:02.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pynicotine/gtkgui/__init__.py 2024-10-16 00:20:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pynicotine/gtkgui/__init__.py 2024-10-30 17:23:27.000000000 +0800
</span> @@ -25,7 +25,7 @@
def get_default_gtk_version():
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nicotine-plus/files/patch-GTK4.diff b/www/nicotine-plus/files/patch-GTK4.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 853d72c64b8..c91d0c5d66f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/nicotine-plus/files/patch-GTK4.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/nicotine-plus/files/patch-GTK4.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pynicotine/gtkgui/__init__.py 2024-09-23 01:46:20.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pynicotine/gtkgui/__init__.py 2024-09-23 12:42:10.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -137,6 +137,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Always enable CSD on macOS for a more uniform look
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os.environ["GTK_CSD"] = "1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pynicotine/gtkgui/__init__.py 2024-10-16 00:20:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pynicotine/gtkgui/__init__.py 2024-10-30 17:21:50.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -134,8 +134,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os.environ["GSK_RENDERER"] = "cairo"
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif sys.platform == "darwin":
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Older GL renderer is still faster on macOS for now
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- os.environ["GSK_RENDERER"] = "gl"
</span> + # Use Cairo software rendering due to flickering issues in the GPU renderer (#2859).
+ # https://gitlab.gnome.org/GNOME/gtk/-/issues/5858
+ # https://github.com/nicotine-plus/nicotine-plus/issues/2942
+ os.environ["GSK_RENDERER"] = "cairo"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if os.environ.get("GDK_BACKEND") != "broadway":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if "GSK_RENDERER" not in os.environ:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Old GL renderer is faster for now. Make it the default.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error = check_gtk_version(gtk_api_version=os.environ.get("NICOTINE_GTK_VERSION", get_default_gtk_version()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>