Fix segfault on exit

3 files changed, 43 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a3c18c87eb2e..9aaaf81e60b1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = rxvt-unicode-intensityfix
 	pkgdesc = A unicode enabled rxvt-clone terminal emulator (urxvt) (opinionated build)
 	pkgver = 9.22
-	pkgrel = 14
+	pkgrel = 15
 	url = http://software.schmorp.de/pkg/rxvt-unicode.html
 	arch = i686
 	arch = x86_64
@@ -22,6 +22,7 @@ pkgbase = rxvt-unicode-intensityfix
 	source = sgr-mouse-mode.patch
 	source = 256color.patch
 	source = enable-wide-glyphs.patch
+	source = perl-segfault.patch
 	md5sums = 93782dec27494eb079467dacf6e48185
 	md5sums = 9e2ccfa07aafa6aeaf1dbdd005437af7
 	md5sums = d8377a6ec47a7913636fbc368aded94b
@@ -30,6 +31,7 @@ pkgbase = rxvt-unicode-intensityfix
 	md5sums = f8325b0a33999db4d5d1eeac4f320156
 	md5sums = fb78c2ecf87626962734320cc2bb7ab1
 	md5sums = fa7e51d6a521605ff1b18470510156b0
+	md5sums = 688e82954aaf0663356330c61f505ef4
 
 pkgname = rxvt-unicode-intensityfix
 
diff --git a/PKGBUILD b/PKGBUILD
index ffe0b875cd1f..8089f5c02abf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _pkgname=rxvt-unicode
 pkgname=rxvt-unicode-intensityfix
 pkgver=9.22
-pkgrel=14
+pkgrel=15
 pkgdesc='A unicode enabled rxvt-clone terminal emulator (urxvt) (opinionated build)'
 arch=('i686' 'x86_64')
 url='http://software.schmorp.de/pkg/rxvt-unicode.html'
@@ -20,6 +20,7 @@ source=(
   'sgr-mouse-mode.patch'
   '256color.patch'
   'enable-wide-glyphs.patch'
+  'perl-segfault.patch'
 )
 md5sums=('93782dec27494eb079467dacf6e48185'
          '9e2ccfa07aafa6aeaf1dbdd005437af7'
@@ -28,7 +29,8 @@ md5sums=('93782dec27494eb079467dacf6e48185'
          '9f3248bc397ee76b008375f2ab0f201a'
          'f8325b0a33999db4d5d1eeac4f320156'
          'fb78c2ecf87626962734320cc2bb7ab1'
-         'fa7e51d6a521605ff1b18470510156b0')
+         'fa7e51d6a521605ff1b18470510156b0'
+         '688e82954aaf0663356330c61f505ef4')
 
 prepare() {
   cd $_pkgname-$pkgver
@@ -46,6 +48,9 @@ prepare() {
 
   # from https://aur.archlinux.org/packages/rxvt-unicode-cvs-patched-wideglyphs/
   patch -p1 -i ../enable-wide-glyphs.patch
+
+  # https://bugs.archlinux.org/task/67691
+  patch -p1 -i ../perl-segfault.patch
 }
 
 build() {
diff --git a/perl-segfault.patch b/perl-segfault.patch
new file mode 100644
index 000000000000..c7a4cc927cee
--- /dev/null
+++ b/perl-segfault.patch
@@ -0,0 +1,33 @@
+--- rxvt-unicode/src/rxvtperl.xs	2020/01/20 09:35:12	1.246
++++ rxvt-unicode/src/rxvtperl.xs	2020/06/30 07:31:24	1.247
+@@ -372,6 +372,9 @@
+ 
+ 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 @@
+       PERL_SYS_TERM ();
+     }
+ }
++#endif
+ 
+ void
+ rxvt_perl_interp::init ()
+
+--- rxvt-unicode/src/rxvtperl.h	2012/06/12 10:45:53	1.28
++++ rxvt-unicode/src/rxvtperl.h	2020/06/30 07:31:24	1.29
+@@ -51,7 +51,9 @@
+ {
+   char **perl_environ;
+ 
++  #if 0 // see rxvtperl.xs
+   ~rxvt_perl_interp ();
++  #endif
+ 
+   void init ();
+   void init (rxvt_term *term);