cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to rxvt-unicode-9.26

Browse Source 
Changes: http://dist.schmorp.de/rxvt-unicode/Changes

Feedback and OK from sthen@
This commit is contained in:
bket 2021-05-21 17:43:41 +00:00
parent 8f82c2092a
commit a598ec1933
8 changed files with 48 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x11/rxvt-unicode/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.50 2021/03/09 04:17:05 jcs Exp $
# $OpenBSD: Makefile,v 1.51 2021/05/21 17:43:41 bket Exp $
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
@ -30,7 +29,8 @@ LIB_DEPENDS = devel/gettext,-runtime \
FAKE_FLAGS = INSTALL_DATA="${INSTALL_DATA}" \
INSTALL_PROGRAM="${INSTALL_PROGRAM}"
CONFIGURE_STYLE = gnu
CONFIGURE_STYLE = autoconf
AUTOCONF_VERSION = 2.71
CONFIGURE_ARGS = --enable-256-color \
--enable-perl \
--enable-pixbuf \

4
x11/rxvt-unicode/distinfo
View File

@ -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

53
x11/rxvt-unicode/patches/patch-configure
View File

@ -1,53 +0,0 @@
$OpenBSD: patch-configure,v 1.1 2019/04/24 18:39:06 cwen Exp $
Don't use gcc specific flags, because it causes various undefined
reference errors with ports-gcc>=6 when -lsupc++ is used. We could
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
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; }
- save_CXX="$CXX"
- save_LIBS="$LIBS"
- CXX="$CC"
- LIBS="$LIBS -lsupc++"
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-struct test { }; void f() try { throw new test; } catch (...) { throw; }
-int
-main ()
-{
-
- ;
- 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; }
- LINKER="$CC"
-else
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, making everything bigger and slower" >&5
-$as_echo "no, making everything bigger and slower" >&6; }
- LIBS="$save_LIBS"
-
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- CXX="$save_CXX"
-fi
-LINKER=$LINKER
-
if test -z "$orig_CXXFLAGS"; then
if test x$GCC = xyes && test "x$GXX" = xyes; then

35
x11/rxvt-unicode/patches/patch-configure_ac Normal file
View File

@ -0,0 +1,35 @@
$OpenBSD: patch-configure_ac,v 1.3 2021/05/21 17:43:41 bket Exp $
Don't use gcc specific flags, because it causes various undefined
reference errors with ports-gcc>=6 when -lsupc++ is used. We could
use libesupc++ but there is not much incentive to do so.
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -36,25 +36,6 @@ if test "$ac_prog_cxx_stdcxx" != cxx11; then
fi
LINKER="$CXX"
-dnl check whether we can link with gcc -lsupc++
-if test x$GCC = xyes && test x$GXX = xyes; then
- dnl FreeBSD (at least up to 5.3) has a broken GCC, workaround it
- AC_MSG_CHECKING([for working libsupc++])
- save_CXX="$CXX"
- save_LIBS="$LIBS"
- CXX="$CC"
- LIBS="$LIBS -lsupc++"
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])],
- [AC_MSG_RESULT(ok)
- LINKER="$CC"],
- [
- AC_MSG_RESULT([no, making everything bigger and slower])
- LIBS="$save_LIBS"
- ]
- )
- CXX="$save_CXX"
-fi
AC_SUBST(LINKER,[$LINKER])
dnl# --------------------------------------------------------------------------

9
x11/rxvt-unicode/patches/patch-doc_rxvtd_1_man_in
View File

@ -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
$OpenBSD: patch-doc_rxvtd_1_man_in,v 1.5 2021/05/21 17:43:41 bket Exp $
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

19
x11/rxvt-unicode/patches/patch-src_rxvtperl_h
View File

@ -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);

27
x11/rxvt-unicode/patches/patch-src_rxvtperl_xs
View File

@ -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 ()

3
x11/rxvt-unicode/pkg/PLIST
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.12 2018/09/04 12:46:28 espie Exp $
@comment $OpenBSD: PLIST,v 1.13 2021/05/21 17:43:41 bket Exp $
@bin bin/urclock
@mode 2555
@group utmp
@bin bin/urxvt