4 files changed, 45 insertions, 51 deletions
diff --git a/irc/hexchat/files/patch-meson.build b/irc/hexchat/files/patch-meson.build
index 80ac239f3c41..f953c239872b 100644
--- a/irc/hexchat/files/patch-meson.build
+++ b/irc/hexchat/files/patch-meson.build
@@ -1,20 +1,24 @@
---- meson.build.orig	2019-12-21 06:38:06 UTC
-+++ meson.build
-@@ -16,11 +16,21 @@ cc = meson.get_compiler('c')
+--- meson.build.orig	2021-10-01 21:52:09.000000000 +0200
++++ meson.build	2021-10-07 10:35:49.739120000 +0200
+@@ -15,7 +15,7 @@
+ 
  libgio_dep = dependency('gio-2.0', version: '>= 2.34.0')
  libgmodule_dep = dependency('gmodule-2.0')
- global_deps = []
+-
 +libssl_dep_found = false
- if cc.get_id() == 'msvc'
-   libssl_dep = cc.find_library('libeay32')
+ libcanberra_dep = dependency('libcanberra', version: '>= 0.22',
+                              required: get_option('libcanberra'))
+ dbus_glib_dep = dependency('dbus-glib-1', required: get_option('dbus'))
+@@ -25,7 +25,16 @@
+   libssl_dep = cc.find_library('libssl')
  else
    libssl_dep = dependency('openssl', version: '>= 0.9.8',
--                          required: get_option('with-ssl'))
+-                          required: get_option('tls'))
 +                          required: false)
 +  if not libssl_dep.found()
 +    libssl_dep = [
-+        cc.find_library('ssl', required: get_option('with-ssl')),
-+        cc.find_library('crypto', required: get_option('with-ssl'))
++        cc.find_library('ssl', required: get_option('tls')),
++        cc.find_library('crypto', required: get_option('tls'))
 +    ]
 +    libssl_dep_found = libssl_dep[0].found()
 +  else
@@ -23,22 +27,30 @@
  endif
  
  config_h = configuration_data()
-@@ -49,7 +59,7 @@ config_h.set('GLIB_VERSION_MIN_REQUIRED', 'GLIB_VERSIO
- config_h.set('HAVE_MEMRCHR', cc.has_function('memrchr'))
- config_h.set('HAVE_STRINGS_H', cc.has_header('strings.h'))
+@@ -37,7 +46,7 @@
+ config_h.set10('ENABLE_NLS', true)
+ 
+ # Optional features
+-config_h.set('USE_OPENSSL', libssl_dep.found())
++config_h.set('USE_OPENSSL', libssl_dep_found)
+ config_h.set('USE_LIBCANBERRA', libcanberra_dep.found())
+ config_h.set('USE_DBUS', dbus_glib_dep.found())
+ config_h.set('USE_PLUGIN', get_option('plugin'))
+@@ -57,7 +66,7 @@
+   join_paths(get_option('prefix'), get_option('libdir'), 'hexchat/plugins')
+ )
  
 -if libssl_dep.found()
 +if libssl_dep_found
    config_h.set('HAVE_X509_GET_SIGNATURE_NID',
      cc.has_function('X509_get_signature_nid', dependencies: libssl_dep)
    )
-@@ -129,9 +139,6 @@ global_ldflags = []
- test_ldflags = [
-   '-Wl,-z,relro',
-   '-Wl,-z,now',
--  # mingw
--  '-Wl,--dynamicbase',
--  '-Wl,--nxcompat',
- ]
- foreach ldflag : test_ldflags
-   if meson.version().version_compare('>= 0.46.0')
+@@ -178,7 +187,7 @@
+   }, section: 'Directories')
+ 
+   summary({
+-    'TLS (openssl)': libssl_dep.found(),
++    'TLS (openssl)': libssl_dep_found,
+     'Plugin Support': get_option('plugin'),
+     'DBus Support': dbus_glib_dep.found(),
+     'libcanberra': libcanberra_dep.found(),
diff --git a/irc/hexchat/files/patch-plugins_sysinfo_meson.build b/irc/hexchat/files/patch-plugins_sysinfo_meson.build
deleted file mode 100644
index b925d3296d7c..000000000000
--- a/irc/hexchat/files/patch-plugins_sysinfo_meson.build
+++ /dev/null
@@ -1,18 +0,0 @@
---- plugins/sysinfo/meson.build.orig	2019-12-22 13:48:33 UTC
-+++ plugins/sysinfo/meson.build
-@@ -13,13 +13,13 @@ sysinfo_includes = []
- sysinfo_cargs = []
- 
- system = host_machine.system()
--if system == 'linux' or system == 'gnu' or system.startswith('gnu/') or system == 'darwin'
-+if system == 'linux' or system == 'gnu' or system.startswith('gnu/') or system == 'darwin' or system == 'freebsd'
-   sysinfo_includes += 'shared'
-   sysinfo_sources += [
-     'shared/df.c'
-   ]
- 
--  if system == 'linux' or system == 'gnu' or system.startswith('gnu/')
-+  if system == 'linux' or system == 'gnu' or system.startswith('gnu/') or system == 'freebsd'
-     libpci = dependency('libpci', required: false, method: 'pkg-config')
-     if libpci.found()
-       sysinfo_deps += libpci
diff --git a/irc/hexchat/files/patch-src__common__server.c b/irc/hexchat/files/patch-src__common__server.c
deleted file mode 100644
index fd3fd906f47e..000000000000
--- a/irc/hexchat/files/patch-src__common__server.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/server.c.orig	2018-08-29 16:41:08 UTC
-+++ src/common/server.c
-@@ -748,7 +748,7 @@ server_connect_success (server *serv)
- 
- 		/* it'll be a memory leak, if connection isn't terminated by
- 		   server_cleanup() */
--		if ((err = _SSL_set_verify (serv->ctx, ssl_cb_verify, NULL)))
-+		if ((err = _SSL_set_verify (serv->ctx, ssl_cb_verify, "%%CA_BUNDLE%%")))
- 		{
- 			EMIT_SIGNAL (XP_TE_CONNFAIL, serv->server_session, err, NULL,
- 							 NULL, NULL, 0);
diff --git a/irc/hexchat/files/patch-src_common_meson.build b/irc/hexchat/files/patch-src_common_meson.build
new file mode 100644
index 000000000000..159a277f2b28
--- /dev/null
+++ b/irc/hexchat/files/patch-src_common_meson.build
@@ -0,0 +1,11 @@
+--- src/common/meson.build.orig	2021-10-07 15:54:34.995639000 +0200
++++ src/common/meson.build	2021-10-07 15:54:46.304819000 +0200
+@@ -73,7 +73,7 @@
+ #   SIGACTION
+ #   HAVE_GTK_MAC
+ 
+-if libssl_dep.found()
++if libssl_dep_found
+   common_sources += 'ssl.c'
+   common_deps += libssl_dep
+ endif