On Mon, 08 Mar 2021 at 21:47:25 -0600, joshua stein wrote: > From upstream, see > http://lists.schmorp.de/pipermail/rxvt-unicode/2020q2/002583.html
Not sure what happened with the one patch that got doubled, but here's a proper version: Index: Makefile =================================================================== RCS file: /cvs/ports/x11/rxvt-unicode/Makefile,v retrieving revision 1.49 diff -u -p -u -p -r1.49 Makefile --- Makefile 23 Dec 2020 13:31:18 -0000 1.49 +++ Makefile 9 Mar 2021 03:49:27 -0000 @@ -3,7 +3,7 @@ COMMENT = clone of rxvt with Unicode and Xft support DISTNAME = rxvt-unicode-9.22 -REVISION = 11 +REVISION = 12 CATEGORIES = x11 FIX_EXTRACT_PERMISSIONS = Yes Index: patches/patch-src_rxvtperl_h =================================================================== RCS file: patches/patch-src_rxvtperl_h diff -N patches/patch-src_rxvtperl_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_rxvtperl_h 9 Mar 2021 03:49:27 -0000 @@ -0,0 +1,19 @@ +$OpenBSD$ + +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); Index: patches/patch-src_rxvtperl_xs =================================================================== RCS file: patches/patch-src_rxvtperl_xs diff -N patches/patch-src_rxvtperl_xs --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_rxvtperl_xs 9 Mar 2021 03:49:27 -0000 @@ -0,0 +1,27 @@ +$OpenBSD$ + +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 ()
