<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c76d84f31d0df6589e6e81498cde716a2a29dfeb">https://github.com/macports/macports-ports/commit/c76d84f31d0df6589e6e81498cde716a2a29dfeb</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 c76d84f31d0 hexchat: update to 2.16.1
</span>c76d84f31d0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c76d84f31d0df6589e6e81498cde716a2a29dfeb
</span>Author: Evan Miller <emmiller@gmail.com>
AuthorDate: Mon Feb 21 12:18:27 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> hexchat: update to 2.16.1
</span>---
irc/hexchat/Portfile | 44 +++++++++++-----------
...in-Call-EndInterpreter-when-deinit-ing-th.patch | 35 -----------------
irc/hexchat/files/patch-build-scripts-python3.diff | 8 ++++
irc/hexchat/files/patch-meson-post-install.diff | 2 +-
4 files changed, 32 insertions(+), 57 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/hexchat/Portfile b/irc/hexchat/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bcb8039c5dd..e25a7bd2261 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/irc/hexchat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/irc/hexchat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,9 +4,11 @@ PortSystem 1.0
</span> PortGroup meson 1.0
name hexchat
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.14.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.16.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set perl_minor 34
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_minor 10
</span> categories irc
maintainers {raimue @raimue} \
openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,26 +24,27 @@ long_description \
</span> master_sites https://dl.hexchat.net/hexchat/
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a41067f7dd9b0eceaf2252aa7a8b8eca7dd228fd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7792b9e52560fbd3e10d75bfb5d138a20913a87771d676d296547f1b4ac09618 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1288732
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5b0d5e72af7862d0983d86493758e2b38c363c1e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a7e497da71df419daf9855582d51c723a2611de25d5e97b5efc33fe78da5c4c7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1349536
</span>
patchfiles patch-meson-post-install.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-build-scripts-python3.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0003-Python-plugin-Call-EndInterpreter-when-deinit-ing-th.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-build-scripts-python3.diff
</span> patch.post_args -p1
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:@PYTHON3@:${prefix}/bin/python3.7:" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s:@PYTHON3@:${prefix}/bin/python3.${python_minor}:" \
</span> ${worksrcpath}/plugins/perl/generate_header.py \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/plugins/python/generate_plugin.py \
</span> ${worksrcpath}/src/common/make-te.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:@PERL@:${prefix}/bin/perl5.28:" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s:@PERL@:${prefix}/bin/perl5.${perl_minor}:" \
</span> ${worksrcpath}/plugins/perl/generate_header
}
depends_build-append \
port:pkgconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python3${python_minor} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py3${python_minor}-cffi
</span>
depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
port:dbus-glib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,9 +56,9 @@ depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
</span> depends_run port:desktop-file-utils
configure.args \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dwith-ssl=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dtls=disabled \
</span> -Dwith-fishlim=false \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dwith-theme-manager=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dtheme-manager=false \
</span> -Dwith-lua=false \
-Dwith-perl=false \
-Dwith-python=false
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +72,7 @@ default_variants +ssl +lua +perl +python
</span>
variant ssl description "Enable SSL using openssl" {
depends_lib-append path:lib/libssl.dylib:openssl
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -Dwith-ssl=false -Dwith-ssl=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dtls=disabled -Dtls=enabled
</span> configure.args-append -Dwith-fishlim=true
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,16 +81,15 @@ variant lua description "Enable Lua scripting, using luajit" {
</span> configure.args-replace -Dwith-lua=false -Dwith-lua=lua
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant perl description "Enable Perl scripting, using perl5.28" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:perl5.28
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -Dwith-perl=false -Dwith-perl=${prefix}/bin/perl5.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant perl description "Enable Perl scripting, using perl5.${perl_minor}" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:perl5.${perl_minor}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dwith-perl=false -Dwith-perl=${prefix}/bin/perl5.${perl_minor}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python description "Enable Python scripting" requires python37 {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 description "Enable Python scripting, using python37" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python37
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -Dwith-python=false -Dwith-python=python-3.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pkg_config_path ${frameworks_dir}/Python.framework/Versions/3.7/lib/pkgconfig/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python description "Enable Python scripting, using python3${python_minor}" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python3${python_minor}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dwith-python=false -Dwith-python=python-3.${python_minor}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pkg_config_path ${frameworks_dir}/Python.framework/Versions/3.${python_minor}/lib/pkgconfig/
</span> }
post-activate {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/hexchat/files/0003-Python-plugin-Call-EndInterpreter-when-deinit-ing-th.patch b/irc/hexchat/files/0003-Python-plugin-Call-EndInterpreter-when-deinit-ing-th.patch
</span>deleted file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index aec4ecb1b60..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/irc/hexchat/files/0003-Python-plugin-Call-EndInterpreter-when-deinit-ing-th.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,35 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Mattia Rizzolo <mattia@debian.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 25 May 2019 11:37:50 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: Python plugin: Call EndInterpreter when deinit'ing the plugin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Commonly-encountered bug when using Hexchat 2.14 on Python 3.7.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The next upstream release will have a completely rewritten Python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-plugin that won't need this patch (check the upstream bug).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Bug: https://github.com/hexchat/hexchat/issues/2237
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Bug-Debian: https://bugs.debian.org/921208
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Bug-Ubuntu: https://bugs.launchpad.net/bug/1830246
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=1632039
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Author: @ncoghlan, on the upstream bug
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Forwarded: not-needed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Mattia Rizzolo <mattia@debian.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- plugins/python/python.c | 3 +++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 3 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/plugins/python/python.c b/plugins/python/python.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4403474..475756b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/plugins/python/python.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/plugins/python/python.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2806,6 +2806,9 @@ hexchat_plugin_deinit(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xchatout_buffer = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (interp_plugin) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyThreadState *tstate = ((PluginObject*)interp_plugin)->tstate;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyThreadState_Swap(tstate);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Py_EndInterpreter(tstate);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_DECREF(interp_plugin);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- interp_plugin = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/hexchat/files/patch-build-scripts-python3.diff b/irc/hexchat/files/patch-build-scripts-python3.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f962481df83..845d7a07f14 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/irc/hexchat/files/patch-build-scripts-python3.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/irc/hexchat/files/patch-build-scripts-python3.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,3 +22,11 @@
</span>
use strict;
use warnings;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/plugins/python/generate_plugin.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- b/plugins/python/generate_plugin.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!@PYTHON3@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import sys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import cffi
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/hexchat/files/patch-meson-post-install.diff b/irc/hexchat/files/patch-meson-post-install.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index df2b86f7eca..d7d1ead1a2e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/irc/hexchat/files/patch-meson-post-install.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/irc/hexchat/files/patch-meson-post-install.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,6 +8,6 @@ running gtk-update-icon-cache and update-desktop-database, just remove it.
</span> subdir('po') # FIXME: build xgettext
-
- meson.add_install_script('meson_post_install.py',
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- '@0@'.format(get_option('with-theme-manager'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '@0@'.format(get_option('theme-manager'))
</span> - )
endif
</pre><pre style='margin:0'>
</pre>