fix crash on exit due to recent perl update, from upstream

ok tb
This commit is contained in:
jcs 2021-03-09 04:17:05 +00:00
parent 498bf7bbd8
commit 50b353c950
3 changed files with 48 additions and 2 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.49 2020/12/23 13:31:18 sthen Exp $
# $OpenBSD: Makefile,v 1.50 2021/03/09 04:17:05 jcs Exp $
COMMENT = clone of rxvt with Unicode and Xft support
DISTNAME = rxvt-unicode-9.22
REVISION = 11
REVISION = 12
CATEGORIES = x11
FIX_EXTRACT_PERMISSIONS = Yes

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-src_rxvtperl_h,v 1.1 2021/03/09 04:17:05 jcs Exp $
http://lists.schmorp.de/pipermail/rxvt-unicode/2020q2/002583.html
http://cvs.schmorp.de/rxvt-unicode/src/rxvtperl.h?r1=1.28&r2=1.29
Index: src/rxvtperl.h
--- src/rxvtperl.h.orig
+++ src/rxvtperl.h
@@ -51,7 +51,9 @@ struct rxvt_perl_interp
{
char **perl_environ;
+ #if 0 // see rxvtperl.xs
~rxvt_perl_interp ();
+ #endif
void init ();
void init (rxvt_term *term);

View File

@ -0,0 +1,27 @@
$OpenBSD: patch-src_rxvtperl_xs,v 1.1 2021/03/09 04:17:05 jcs Exp $
http://lists.schmorp.de/pipermail/rxvt-unicode/2020q2/002583.html
http://cvs.schmorp.de/rxvt-unicode/src/rxvtperl.xs?r1=1.246&r2=1.247
Index: src/rxvtperl.xs
--- src/rxvtperl.xs.orig
+++ src/rxvtperl.xs
@@ -372,6 +372,9 @@ struct rxvt_perl_interp rxvt_perl;
static PerlInterpreter *perl;
+#if 0 /* we are not a library anymore, so doing this is just not worth it */
+/*THINK/TODO: this has the side effect of, of course, not calling destructors. */
+/* but therse are not guaranteed anyway... */
rxvt_perl_interp::~rxvt_perl_interp ()
{
if (perl)
@@ -381,6 +384,7 @@ rxvt_perl_interp::~rxvt_perl_interp ()
PERL_SYS_TERM ();
}
}
+#endif
void
rxvt_perl_interp::init ()