Attachment 232551 Details for Bug 262641 – Fix screen build: remove upsetreamed patch and drop showenc option

[patch] Fix screen build: remove upsetreamed patch and drop showenc option

sysutils_screen_fix.patch (text/plain), 1.90 KB, created by Oleg Sidorkin on 2022-03-18 12:26:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oleg Sidorkin

Created: 2022-03-18 12:26:26 UTC

Size: 1.90 KB

patch

obsolete

>diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile
>index e0cd0e7b650a..4eba556b287d 100644
>--- a/sysutils/screen/Makefile
>+++ b/sysutils/screen/Makefile
>@@ -17,7 +17,7 @@ COMMENT=	Multi-screen window manager
> 
> LICENSE=	GPLv3
> 
>-OPTIONS_DEFINE=		INFO NETHACK XTERM_256 SHOWENC SYSTEM_SCREENRC
>+OPTIONS_DEFINE=		INFO NETHACK XTERM_256 SYSTEM_SCREENRC
> OPTIONS_DEFAULT=	INFO NETHACK XTERM_256 SOCKETS SYSTEM_SCREENRC \
> 			NCURSES_DEFAULT
> OPTIONS_SINGLE=		IPC NCURSES
>@@ -25,7 +25,6 @@ OPTIONS_SINGLE_IPC=	SOCKETS NAMED_PIPES
> OPTIONS_SINGLE_NCURSES=	NCURSES_DEFAULT NCURSES_BASE NCURSES_PORT
> NETHACK_DESC=		Enable nethack-style messages
> XTERM_256_DESC=		Enable support for 256 colour xterm
>-SHOWENC_DESC=		Show encoding on the status line
> SOCKETS_DESC=		Use new (4.2.1+) sockets for IPC (default)
> NAMED_PIPES_DESC=	Use legacy (4.0.3) named pipes for IPC (override)
> SYSTEM_SCREENRC_DESC=	Install system screenrc with helpful status line
>@@ -73,11 +72,6 @@ CFLAGS+=	-DCOLORS256
> CFLAGS+=	-DNONETHACK
> .endif
> 
>-# show encoding on the status line via option "showenc"
>-.if ${PORT_OPTIONS:MSHOWENC}
>-EXTRA_PATCHES+=	${FILESDIR}/opt-showencoding
>-.endif
>-
> post-patch:
> 	@${RM} ${WRKSRC}/doc/screen.info*
> 
>diff --git a/sysutils/screen/files/opt-showencoding b/sysutils/screen/files/opt-showencoding
>deleted file mode 100644
>index b931f0d67292..000000000000
>--- a/sysutils/screen/files/opt-showencoding
>+++ /dev/null
>@@ -1,21 +0,0 @@
>---- screen.c.orig	2017-01-17 11:28:29.397404660 -0800
>-+++ screen.c	2017-01-18 12:24:40.855402000 -0800
>-@@ -2760,6 +2760,18 @@
>-       }
>-       p += strlen(p) - 1;
>-       break;
>-+#ifdef ENCODINGS
>-+	case 'e':
>-+	  *p = 0;
>-+	  D_encoding = nwin_options.encoding > 0 ? nwin_options.encoding : 0;
>-+	  if (win && win->w_encoding)
>-+	    {
>-+	      *p++ = ' ';
>-+	      strcpy(p, EncodingName(win->w_encoding));
>-+	    }
>-+	  p += strlen(p) - 1;
>-+	  break;
>-+#endif
>- 
>-     case '{':
>-     {

Actions: View | Diff

Attachments on bug 262641: 232548 | 232550 | 232551