<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6e274982415d7369a8fce8b754eac3a12f5e9b39">https://github.com/macports/macports-ports/commit/6e274982415d7369a8fce8b754eac3a12f5e9b39</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 6e27498 Merge pull request #4564 from chrstphrchvz/hexchat-2.14.2
</span>6e27498 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6e274982415d7369a8fce8b754eac3a12f5e9b39
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Mon Jun 10 07:17:45 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> Merge pull request #4564 from chrstphrchvz/hexchat-2.14.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> hexchat: update to 2.14.2
</span>---
irc/hexchat/Portfile | 36 +++----
...in-Call-EndInterpreter-when-deinit-ing-th.patch | 35 +++++++
irc/hexchat/files/patch-Fix-plugins-on-macOS.diff | 115 ---------------------
...-Add-option-to-specify-path-to-perl-binary.diff | 58 -----------
.../files/patch-build-perl-as-a-dependency.diff | 43 --------
5 files changed, 52 insertions(+), 235 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 fdfdbb8..0911787 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,8 +4,8 @@ PortSystem 1.0
</span> PortGroup meson 1.0
name hexchat
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.14.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.14.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories irc
maintainers {raimue @raimue} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,28 +22,26 @@ long_description \
</span> master_sites https://dl.hexchat.net/hexchat/
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 87f0aadaaeb4fd16650b3622a45510bd470c32d1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b032e4bcebe2229f87047439979a1246ddcbf599e7e538baa3f2abfac9a003a2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1281872
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a41067f7dd9b0eceaf2252aa7a8b8eca7dd228fd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7792b9e52560fbd3e10d75bfb5d138a20913a87771d676d296547f1b4ac09618 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1288732
</span>
patchfiles patch-meson-post-install.diff \
patch-build-scripts-python3.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-build-Add-option-to-specify-path-to-perl-binary.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-build-perl-as-a-dependency.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Fix-plugins-on-macOS.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0003-Python-plugin-Call-EndInterpreter-when-deinit-ing-th.patch
</span> patch.post_args -p1
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:@PYTHON3@:${prefix}/bin/python3.6:" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s:@PYTHON3@:${prefix}/bin/python3.7:" \
</span> ${worksrcpath}/plugins/perl/generate_header.py \
${worksrcpath}/src/common/make-te.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:@PERL@:${prefix}/bin/perl5.26:" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s:@PERL@:${prefix}/bin/perl5.28:" \
</span> ${worksrcpath}/plugins/perl/generate_header
}
depends_build-append \
port:pkgconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python37
</span>
depends_lib port:gtk2 \
port:dbus-glib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,16 +73,16 @@ 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.26" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:perl5.26
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -Dwith-perl=false -Dwith-perl=${prefix}/bin/perl5.26
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant perl description "Enable Perl scripting, using perl5.28" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:perl5.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dwith-perl=false -Dwith-perl=${prefix}/bin/perl5.28
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python description "Enable Python scripting" requires python36 {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python36 description "Enable Python scripting, using python36" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python36
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -Dwith-python=false -Dwith-python=python-3.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pkg_config_path ${frameworks_dir}/Python.framework/Versions/3.6/lib/pkgconfig/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python description "Enable Python scripting" requires python37 {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 description "Enable Python scripting, using python37" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dwith-python=false -Dwith-python=python-3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pkg_config_path ${frameworks_dir}/Python.framework/Versions/3.7/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>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..aec4ecb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/irc/hexchat/files/0003-Python-plugin-Call-EndInterpreter-when-deinit-ing-th.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Mattia Rizzolo <mattia@debian.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 25 May 2019 11:37:50 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: Python plugin: Call EndInterpreter when deinit'ing the plugin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Commonly-encountered bug when using Hexchat 2.14 on Python 3.7.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The next upstream release will have a completely rewritten Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+plugin that won't need this patch (check the upstream bug).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Bug: https://github.com/hexchat/hexchat/issues/2237
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Bug-Debian: https://bugs.debian.org/921208
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Bug-Ubuntu: https://bugs.launchpad.net/bug/1830246
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=1632039
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: @ncoghlan, on the upstream bug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Forwarded: not-needed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Mattia Rizzolo <mattia@debian.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ plugins/python/python.c | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file 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/plugins/python/python.c b/plugins/python/python.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4403474..475756b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/plugins/python/python.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/plugins/python/python.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2806,6 +2806,9 @@ hexchat_plugin_deinit(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xchatout_buffer = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (interp_plugin) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PyThreadState *tstate = ((PluginObject*)interp_plugin)->tstate;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PyThreadState_Swap(tstate);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Py_EndInterpreter(tstate);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Py_DECREF(interp_plugin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ interp_plugin = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/hexchat/files/patch-Fix-plugins-on-macOS.diff b/irc/hexchat/files/patch-Fix-plugins-on-macOS.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6cae749..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/irc/hexchat/files/patch-Fix-plugins-on-macOS.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,115 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream-Status: Accepted [https://github.com/hexchat/hexchat/commit/5ca767f7f881f480de90882233ed833846bd8a3d]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 5ca767f7f881f480de90882233ed833846bd8a3d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: =?UTF-8?q?Rainer=20M=C3=BCller?= <raimue@codingfarm.de>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 31 Mar 2018 00:53:56 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix plugins on macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The switch to the meson build system broke plugins on macOS. GNU libtool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-builds shared libraries with ".dylib" and shared modules (plugins) with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-the extension ".so", but meson is using ".dylib" for both.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Although overriding the name_suffix for shared_module() in meson is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-possible, this would be messy for other platforms as there is no way to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-query the default. Therefore it seems like we have to go with ".dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-for now on macOS.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-However, G_MODULE_SUFFIX is defined to ".so", because glib follows what
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-GNU libtool does. Therefore define a separate preprocessor macro that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-has the correct extension.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-See: https://github.com/mesonbuild/meson/issues/1160
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/common/outbound.c | 6 +++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/common/plugin.c | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/common/plugin.h | 8 ++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/fe-gtk/plugingui.c | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4 files changed, 15 insertions(+), 7 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/common/outbound.c b/src/common/outbound.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index fe6da8c86..96fb7fe44 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/common/outbound.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/common/outbound.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2610,7 +2610,7 @@ cmd_load (struct session *sess, char *tbuf, char *word[], char *word_eol[])
</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;'>- #ifdef USE_PLUGIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (g_str_has_suffix (word[2], "."G_MODULE_SUFFIX))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (g_str_has_suffix (word[2], "."PLUGIN_SUFFIX))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- arg = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (word_eol[3][0])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3616,7 +3616,7 @@ cmd_unload (struct session *sess, char *tbuf, char *word[], char *word_eol[])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef USE_PLUGIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gboolean by_file = FALSE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (g_str_has_suffix (word[2], "."G_MODULE_SUFFIX))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (g_str_has_suffix (word[2], "."PLUGIN_SUFFIX))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- by_file = TRUE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch (plugin_kill (word[2], by_file))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3641,7 +3641,7 @@ cmd_reload (struct session *sess, char *tbuf, char *word[], char *word_eol[])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef USE_PLUGIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gboolean by_file = FALSE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (g_str_has_suffix (word[2], "."G_MODULE_SUFFIX))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (g_str_has_suffix (word[2], "."PLUGIN_SUFFIX))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- by_file = TRUE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch (plugin_reload (sess, word[2], by_file))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/common/plugin.c b/src/common/plugin.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3ad3c558e..1db11f355 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/common/plugin.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/common/plugin.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -464,10 +464,10 @@ plugin_auto_load (session *sess)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for_files (lib_dir, "hcwinamp.dll", plugin_auto_load_cb);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for_files (lib_dir, "hcsysinfo.dll", plugin_auto_load_cb);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for_files (lib_dir, "*."G_MODULE_SUFFIX, plugin_auto_load_cb);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for_files (lib_dir, "*."PLUGIN_SUFFIX, plugin_auto_load_cb);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for_files (sub_dir, "*."G_MODULE_SUFFIX, plugin_auto_load_cb);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for_files (sub_dir, "*."PLUGIN_SUFFIX, plugin_auto_load_cb);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_free (sub_dir);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/common/plugin.h b/src/common/plugin.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 76ce97a3a..fb7da831a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/common/plugin.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/common/plugin.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -181,4 +181,12 @@ int plugin_show_help (session *sess, char *cmd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void plugin_command_foreach (session *sess, void *userdata, void (*cb) (session *sess, void *userdata, char *name, char *usage));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- session *plugin_find_context (const char *servname, const char *channel, server *current_server);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* On macOS, G_MODULE_SUFFIX says "so" but meson uses "dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * https://github.com/mesonbuild/meson/issues/1160 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define PLUGIN_SUFFIX "dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define PLUGIN_SUFFIX G_MODULE_SUFFIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/fe-gtk/plugingui.c b/src/fe-gtk/plugingui.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4399cd717..83bb745fa 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/fe-gtk/plugingui.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/fe-gtk/plugingui.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -162,7 +162,7 @@ plugingui_load (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *sub_dir = g_build_filename (get_xdir(), "addons", NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtkutil_file_req (_("Select a Plugin or Script to load"), plugingui_load_cb, current_sess,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sub_dir, "*."G_MODULE_SUFFIX";*.lua;*.pl;*.py;*.tcl;*.js", FRF_FILTERISINITIAL|FRF_EXTENSIONS);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sub_dir, "*."PLUGIN_SUFFIX";*.lua;*.pl;*.py;*.tcl;*.js", FRF_FILTERISINITIAL|FRF_EXTENSIONS);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_free (sub_dir);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -185,7 +185,7 @@ plugingui_unload (GtkWidget * wid, gpointer unused)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FILEPATH_COLUMN, &file, -1))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (g_str_has_suffix (file, "."G_MODULE_SUFFIX))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (g_str_has_suffix (file, "."PLUGIN_SUFFIX))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (plugin_kill (modname, FALSE) == 2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fe_message (_("That plugin is refusing to unload.\n"), FE_MSG_ERROR);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/hexchat/files/patch-build-Add-option-to-specify-path-to-perl-binary.diff b/irc/hexchat/files/patch-build-Add-option-to-specify-path-to-perl-binary.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 80646ad..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/irc/hexchat/files/patch-build-Add-option-to-specify-path-to-perl-binary.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,58 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream-Status: Accepted [https://github.com/hexchat/hexchat/commit/ed6f544572d6cbfba94962799d82d6c511c11f40]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 70b56d716a9eec27fff914a2921125b723854f84 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: =?UTF-8?q?Rainer=20M=C3=BCller?= <raimue@codingfarm.de>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 23 Mar 2018 01:36:35 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] build: Add option to specify path to perl binary
</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;'>- data/misc/meson.build | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- meson_options.txt | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- plugins/meson.build | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- plugins/perl/meson.build | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4 files changed, 5 insertions(+), 5 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/meson_options.txt b/meson_options.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index eee21791..23f4fd10 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/meson_options.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/meson_options.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,8 +42,8 @@ option('with-fishlim', type: 'boolean',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option('with-lua', type: 'string', value: 'luajit',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description: 'Lua scripting plugin, value is pkg-config name to use or "false"'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--option('with-perl', type: 'boolean',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- description: 'Perl scripting plugin'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+option('with-perl', type: 'string', value: 'perl',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ description: 'Perl scripting plugin, value is path to perl executable or "false"'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option('with-python', type: 'string', value: 'python3',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description: 'Python scripting plugin. value is pkg-config name to use or "false"'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/plugins/meson.build b/plugins/meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9e7fae93..6d41182b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/plugins/meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/plugins/meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,7 +26,7 @@ if get_option('with-lua') != 'false'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subdir('lua')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if get_option('with-perl')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if get_option('with-perl') != 'false'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subdir('perl')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/plugins/perl/meson.build b/plugins/perl/meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 180797ee..3779a35c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/plugins/perl/meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/plugins/perl/meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,7 +25,7 @@ if get_option('with-perl-legacy-api')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- perl_cflags += '-DOLD_PERL'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--perl = find_program('perl')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+perl = find_program(get_option('with-perl'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ret = run_command([perl, '-MExtUtils::Embed', '-e', 'ccopts'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ret.returncode() != 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.16.2
</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-perl-as-a-dependency.diff b/irc/hexchat/files/patch-build-perl-as-a-dependency.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3dfd251..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/irc/hexchat/files/patch-build-perl-as-a-dependency.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,43 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream-Status: Accepted [https://github.com/hexchat/hexchat/commit/111441302c4eb0c719088526c5b8c4be3df6a0dc]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 111441302c4eb0c719088526c5b8c4be3df6a0dc Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: =?UTF-8?q?Rainer=20M=C3=BCller?= <raimue@codingfarm.de>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 26 Mar 2018 16:53:02 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] build: perl as a dependency in meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-With the switch to meson, the problem previously fixed in #1822 came
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-back. The build system might pick up the installed hexchat-config.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-instead of using the header in the source directory, as the compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-arguments would be in the order of "-I${prefix}/include -I..".
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-It seems that the c_args in meson are always put to the front of the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler arguments, in order to be able to override any include paths
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-from dependencies. However, this was not the intention here, so perl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-should also be modeled as a dependency. This ensures that the arguments
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-with local include directories come first.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- plugins/perl/meson.build | 9 ++++++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 6 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/plugins/perl/meson.build b/plugins/perl/meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3779a35cd..06ffd54b6 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/plugins/perl/meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/plugins/perl/meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -76,11 +76,14 @@ int main(void) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error('found perl not suitable for plugin')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+perl_dep = declare_dependency(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ compile_args: perl_cflags,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ link_args: perl_ldflags
</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;'>- shared_module('perl',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sources: ['perl.c', hexchat_perl_module, irc_perl_module],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dependencies: [libgio_dep, hexchat_plugin_dep],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- c_args: perl_cflags,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- link_args: perl_ldflags,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dependencies: [libgio_dep, hexchat_plugin_dep, perl_dep],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install: true,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install_dir: plugindir,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install_rpath: perl_rpath,
</span></pre><pre style='margin:0'>
</pre>