Diff below updates rxvt-unicode to 9.26, which contains a long list of
changes and fixes. Overview can be found at
http://dist.schmorp.de/rxvt-unicode/Changes.
Build and run tested on amd64. Also tested a couple of plugins.
Tests on other platforms would be appreciated.
Comments/OK?
diff --git Makefile Makefile
index 2c13e94a8ad..fad2a94fa7a 100644
--- Makefile
+++ Makefile
@@ -2,8 +2,7 @@
COMMENT = clone of rxvt with Unicode and Xft support
-DISTNAME = rxvt-unicode-9.22
-REVISION = 12
+DISTNAME = rxvt-unicode-9.26
CATEGORIES = x11
FIX_EXTRACT_PERMISSIONS = Yes
diff --git distinfo distinfo
index 68f320be2f9..c6d101a66dc 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (rxvt-unicode-9.22.tar.bz2) =
6UYo6bz6CtsRFdg2SfiY1u20us7UT11bdpwu64uVrd0=
-SIZE (rxvt-unicode-9.22.tar.bz2) = 931198
+SHA256 (rxvt-unicode-9.26.tar.bz2) =
ZDEWuaJdKa0p9IkBMXltQubS0hMSKCphPvZsgMW4yYs=
+SIZE (rxvt-unicode-9.26.tar.bz2) = 904950
diff --git patches/patch-configure patches/patch-configure
index 89bf27bfed7..d3ae22cf264 100644
--- patches/patch-configure
+++ patches/patch-configure
@@ -7,13 +7,13 @@ use libesupc++ but there is not much incentive to do so.
Index: configure
--- configure.orig
+++ configure
-@@ -4493,43 +4493,6 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
+@@ -4886,44 +4886,6 @@ if test "$ac_prog_cxx_stdcxx" != cxx11; then
+ fi
LINKER="$CXX"
-if test x$GCC = xyes && test x$GXX = xyes; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working
libsupc++" >&5
--$as_echo_n "checking for working libsupc++... " >&6; }
+- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working
libsupc++" >&5
+-printf %s "checking for working libsupc++... " >&6; }
- save_CXX="$CXX"
- save_LIBS="$LIBS"
- CXX="$CC"
@@ -23,26 +23,27 @@ Index: configure
-/* end confdefs.h. */
-struct test { }; void f() try { throw new test; } catch (...) { throw; }
-int
--main ()
+-main (void)
-{
-
- ;
- return 0;
-}
-_ACEOF
--if ac_fn_cxx_try_link "$LINENO"; then :
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
--$as_echo "ok" >&6; }
+-if ac_fn_cxx_try_link "$LINENO"
+-then :
+- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+-printf "%s\n" "ok" >&6; }
- LINKER="$CC"
--else
+-else $as_nop
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, making
everything bigger and slower" >&5
--$as_echo "no, making everything bigger and slower" >&6; }
+- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, making
everything bigger and slower" >&5
+-printf "%s\n" "no, making everything bigger and slower" >&6; }
- LIBS="$save_LIBS"
-
-
-fi
--rm -f core conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext conftest.beam \
- conftest$ac_exeext conftest.$ac_ext
- CXX="$save_CXX"
-fi
diff --git patches/patch-doc_rxvtd_1_man_in patches/patch-doc_rxvtd_1_man_in
index 07a0a06cce9..3589777f4b0 100644
--- patches/patch-doc_rxvtd_1_man_in
+++ patches/patch-doc_rxvtd_1_man_in
@@ -1,6 +1,7 @@
$OpenBSD: patch-doc_rxvtd_1_man_in,v 1.4 2015/01/05 16:09:51 dcoppa Exp $
---- doc/rxvtd.1.man.in.orig Wed Dec 31 08:37:40 2014
-+++ doc/rxvtd.1.man.in Mon Jan 5 09:14:22 2015
+Index: doc/rxvtd.1.man.in
+--- doc/rxvtd.1.man.in.orig
++++ doc/rxvtd.1.man.in
@@ -142,7 +142,7 @@
@@RXVT_NAME@@d \- @@RXVT_NAME@@ terminal daemon
.SH "SYNOPSIS"
@@ -16,7 +17,7 @@ $OpenBSD: patch-doc_rxvtd_1_man_in,v 1.4 2015/01/05 16:09:51
dcoppa Exp $
socket.
-.IP "\fB\-m\fR, \fB\-\-mlock\fR" 4
-.IX Item "-m, --mlock"
--This makes \fB@@RXVT_NAME@@d\fR call \fImlockall\fR\|(2) on itself. This locks
+-This makes \fB@@RXVT_NAME@@d\fR call \fBmlockall\fR\|(2) on itself. This locks
-\&\fB@@RXVT_NAME@@d\fR in \s-1RAM\s0 and prevents it from being swapped out
to disk,
-at the cost of consuming a lot more memory on most operating systems.
-.Sp
diff --git patches/patch-src_rxvtperl_h patches/patch-src_rxvtperl_h
deleted file mode 100644
index 41804fbb98b..00000000000
--- patches/patch-src_rxvtperl_h
+++ /dev/null
@@ -1,19 +0,0 @@
-$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);
diff --git patches/patch-src_rxvtperl_xs patches/patch-src_rxvtperl_xs
deleted file mode 100644
index c2664ccbc43..00000000000
--- patches/patch-src_rxvtperl_xs
+++ /dev/null
@@ -1,27 +0,0 @@
-$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 ()
diff --git pkg/PLIST pkg/PLIST
index e0e3b5db378..9a90ca7da09 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.12 2018/09/04 12:46:28 espie Exp $
+@bin bin/urclock
@mode 2555
@group utmp
@bin bin/urxvt
