summaryrefslogtreecommitdiff
path: root/chat
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2019-07-31 10:33:08 +0000
committernia <nia@pkgsrc.org>2019-07-31 10:33:08 +0000
commit0c9585fd1d592c639412ef812eee1c6682697f29 (patch)
tree1b7b4860f75112e3e05b051a6e8f56ec2f4e4c1c /chat
parent3f02849e8d9377a49aa6d78e52389b7296effde8 (diff)
downloadpkgsrc-0c9585fd1d592c639412ef812eee1c6682697f29.tar.gz
weechat: Stop the perl plugin from segfaulting on exit on NetBSD.
just apply the same workaround as upstream is using for FreeBSD. bump PKGREVISION
Diffstat (limited to 'chat')
-rw-r--r--chat/weechat/Makefile4
-rw-r--r--chat/weechat/distinfo3
-rw-r--r--chat/weechat/patches/patch-src_plugins_perl_weechat-perl.c16
3 files changed, 20 insertions, 3 deletions
diff --git a/chat/weechat/Makefile b/chat/weechat/Makefile
index 10930cc55bc..f53e37899ca 100644
--- a/chat/weechat/Makefile
+++ b/chat/weechat/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.99 2019/07/31 10:27:55 nia Exp $
+# $NetBSD: Makefile,v 1.100 2019/07/31 10:33:08 nia Exp $
DISTNAME= weechat-2.5
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= chat
MASTER_SITES= https://www.weechat.org/files/src/
EXTRACT_SUFX= .tar.bz2
diff --git a/chat/weechat/distinfo b/chat/weechat/distinfo
index 8ac2a7b3a5f..40f44ed5090 100644
--- a/chat/weechat/distinfo
+++ b/chat/weechat/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.55 2019/06/10 15:24:45 nia Exp $
+$NetBSD: distinfo,v 1.56 2019/07/31 10:33:08 nia Exp $
SHA1 (weechat-2.5.tar.bz2) = 86f4263645266060d1a2d80cc4ab4f3cd99b2f45
RMD160 (weechat-2.5.tar.bz2) = d71265cdfb4df485f8fa7902a459c76168c95870
@@ -9,3 +9,4 @@ SHA1 (patch-cmake_FindNcurses.cmake) = 0262cc58469e53c26dcc17ac862de12118fadc44
SHA1 (patch-po_CMakeLists.txt) = 9b97a4a4da4175e31ea53352fd0b95e1c985ba1e
SHA1 (patch-src_core_weechat.c) = 062cd7443a756edbdf60289a7847b4278d520105
SHA1 (patch-src_plugins_charset_charset.c) = f0b6e5268908caab5efa8048c8a55b0083ec0ca4
+SHA1 (patch-src_plugins_perl_weechat-perl.c) = 49e61419ea82157fa54a7847a653625944d3b341
diff --git a/chat/weechat/patches/patch-src_plugins_perl_weechat-perl.c b/chat/weechat/patches/patch-src_plugins_perl_weechat-perl.c
new file mode 100644
index 00000000000..14743c3223a
--- /dev/null
+++ b/chat/weechat/patches/patch-src_plugins_perl_weechat-perl.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_plugins_perl_weechat-perl.c,v 1.1 2019/07/31 10:33:08 nia Exp $
+
+Apply this workaround to NetBSD too, it seems to have the same problem
+with segfaulting on exit if the perl plugin is loaded.
+
+--- src/plugins/perl/weechat-perl.c.orig 2019-06-06 18:43:20.000000000 +0000
++++ src/plugins/perl/weechat-perl.c
+@@ -1340,7 +1340,7 @@ weechat_plugin_end (struct t_weechat_plu
+ }
+ #endif /* MULTIPLICITY */
+
+-#if defined(PERL_SYS_TERM) && !defined(__FreeBSD__) && !defined(WIN32) && !defined(__CYGWIN__) && !(defined(__APPLE__) && defined(__MACH__))
++#if defined(PERL_SYS_TERM) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(WIN32) && !defined(__CYGWIN__) && !(defined(__APPLE__) && defined(__MACH__))
+ /*
+ * we call this function on all OS, but NOT on FreeBSD or Cygwin,
+ * because it crashes with no reason (bug in Perl?)