Attachment #248682 for bug #276387




PORTNAME=	xvt
PORTVERSION=	3.0.6
PORTREVISION=	1
CATEGORIES+=	x11
MASTER_SITES=	https://codeberg.org/BSDforge/${PORTNAME}/archive/

MAINTAINER=	portmaster@BSDforge.com
COMMENT=	Xterm replacement, supporting color, transparency, and more, with less
WWW=		https://codeberg.org/BSDforge/xvt/

LICENSE=	BSD2CLAUSE GPLv2
LICENSE_COMB=	multi

USES=		libtool perl5 xorg
EXPIRATION_DATE=2024-02-29

PORTDOCS=	xvt.1.html xvtRef.html xvtRef.txt

USES=		libtool perl5 tar:xz xorg
USE_LDCONFIG=	yes
USE_PERL5=	build patch
USE_XORG=	x11 xpm
GNU_CONFIGURE=	yes

PORTDOCS=	README.xvt xvt.1.html xvtRef.html xvtRef.txt
WRKSRC=		${WRKDIR}/${PORTNAME}

DESKTOP_ENTRIES=	"xvt" \
			"xvt terminal emulator" \
			"${PREFIX}/share/pixmaps/xvt.png" \
			"xvt" \
			"GNOME;X-XFCE;X-Xfce-Toplevel;System;Utility;TerminalEmulator;" \
			false

OPTIONS_DEFINE=	256_COLOR BIG5 DOCS EUCJ GB GREEK KR LINESPACE MENUBAR NEXT \
		SJIS SMART TRANSPARENCY XGETDEFAULT XIM XTERM XVT

256_COLOR_DESC=		Build with 256-color support
BIG5_DESC=		Build with BIG5 support

XTERM_DESC=		Build with Xterm scrollbar
XGETDEFAULT_DESC=	Build with resources checking via XGetDefault

OPTIONS_DEFAULT=	256_COLOR DOCS GB LINESPACE MENUBAR NEXT SMART \
			TRANSPARENCY XIM XTERM XVT

CONFIGURE_ARGS=	--disable-wtmp \
		--enable-lastlog \
		--enable-mousewheel \
		--enable-shared \
		--enable-utmp \
		--enable-xpm-background \
		--with-xpm
LIBS+=		-lutil

# enable 256 color
256_COLOR_CONFIGURE_ON=		--enable-256-color
# enable big5 support
BIG5_CONFIGURE_ON=		--enable-languages \
				--with-encoding=big5
# enable euc japanese support
EUCJ_CONFIGURE_ON=		--enable-languages \
				--with-encoding=eucj
# enable gb support
GB_CONFIGURE_ON=		--enable-languages \
				--with-encoding=gb
# enable greek keyboard support
GREEK_CONFIGURE_ON=		--enable-greek
# enable euc korean support
KR_CONFIGURE_ON=		--enable-languages \
				--with-encoding=kr
# enable line-spacing
LINESPACE_CONFIGURE_ON=		--enable-linespace
# enable menubar
MENUBAR_CONFIGURE_ON=		--enable-menubar
# enable NeXT style scrollbar
NEXT_CONFIGURE_ON=		--enable-next-scroll
# enable xvt style scrollbar
XVT_CONFIGURE_ON=		--enable-xvt-scroll
# enable shift jis support
SJIS_CONFIGURE_ON=		--enable-languages \
				--with-encoding=sjis
# enable smart resize
SMART_CONFIGURE_ON=		--enable-smart-resize
# enable transparency support
TRANSPARENCY_CONFIGURE_ON=	--enable-transparency
# XIM (X Input Method) protocol support
XIM_CONFIGURE_ON=		--enable-xim
# enable Xterm style scrollbar
XTERM_CONFIGURE_ON=		--enable-xterm-scroll
# make resources checking via XGetDefault
XGETDEFAULT_CONFIGURE_ON=	--enable-xgetdefault


Lines 1-2 Link Here

(-)b/x11/xvt/distinfo (-2 / +3 lines)
1	SHA256 (xvt-3.0.1.tar.xz) = f218db092449eb183de540f6500aefbcca6f8f4e3a40110c728e578c27593e6d	1	TIMESTAMP = 1708633938
2	SIZE (xvt-3.0.1.tar.xz) = 431296	2	SHA256 (xvt-3.0.6.tar.gz) = c9eafb999841bc8843bd6fde2a100328f703106a4e06d4f6ece708760b4919ed
		3	SIZE (xvt-3.0.6.tar.gz) = 609999




--- Makefile.in.orig	2024-02-21 00:18:50 UTC
+++ Makefile.in
@@ -9,7 +9,7 @@ dummy:
 first_rule: all
 dummy:
 
-subdirs = src doc rclock src/graphics src/test
+subdirs = src doc #rclock src/graphics src/test
 allsubdirs = W11 $(subdirs)
 
 DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
--- 9,15 ----
  first_rule: all
  dummy:
  
! subdirs = src doc #rclock src/graphics src/test
  allsubdirs = W11 $(subdirs)
  
  DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog

Lines 1-5 Link Here

(-)b/x11/xvt/files/patch-autoconf_config.h.in (-2 / +2 lines)
1	--- autoconf/config.h.in.orig 2014-12-09 14:01:13.000000000 -0800	1	--- autoconf/config.h.in.orig 2024-02-21 00:18:50 UTC
2	+++ autoconf/config.h.in 2014-12-09 14:01:19.000000000 -0800	2	+++ autoconf/config.h.in
3	@@ -313,13 +313,13 @@	3	@@ -313,13 +313,13 @@
4	#undef XVT_UTMPX_FILE	4	#undef XVT_UTMPX_FILE
5		5

Lines 1-6 Link Here

(-)b/x11/xvt/files/patch-doc_Makefile.in (-3 / +3 lines)
1	--- doc/Makefile.in.orig 2014-12-09 14:08:52.000000000 -0800	1	--- doc/Makefile.in.orig 2024-02-21 00:18:50 UTC
2	+++ doc/Makefile.in 2014-12-09 14:08:56.000000000 -0800	2	+++ doc/Makefile.in
3	@@ -40,9 +40,6 @@	3	@@ -40,9 +40,6 @@ all: xvt.1
4		4
5	all: xvt.1	5	all: xvt.1
6		6

Removed Link Here

(-)a/x11/xvt/files/patch-src__command.c (-11 lines)
1	--- src/command.c.orig 2014-12-09 12:06:57.000000000 -0800
2	+++ src/command.c 2014-12-09 12:07:41.000000000 -0800
3	@@ -3098,7 +3098,7 @@
4	unsigned char buf[256];
5
6	va_start(arg_ptr, fmt);
7	- vsprintf((char *)buf, fmt, arg_ptr);
8	+ vsnprintf((char *)buf, sizeof(buf), fmt, arg_ptr);
9	va_end(arg_ptr);
10	xvt_tt_write(r, buf, (unsigned int)STRLEN(buf));
11	}




--- src/init.c.orig	2014-12-09 12:50:59.000000000 -0800
+++ src/init.c	2014-12-09 12:54:55.000000000 -0800
@@ -1531,6 +1531,9 @@
 # ifdef VEOL2
     tio->c_cc[VEOL2] = VDISABLE;
 # endif
+# ifdef VERASE2
+    tio->c_cc[VERASE2] = CERASE2;
+# endif
 # ifdef VSWTC
     tio->c_cc[VSWTC] = VDISABLE;
 # endif
@@ -1651,6 +1654,9 @@
 # ifdef VEOL2
     FOO(VEOL2, "VEOL2");
 # endif
+# ifdef VERASE2
+    FOO(VERASE2, "VERASE2");
+# endif
 # ifdef VSWTC
     FOO(VSWTC, "VSWTC");
 # endif




--- src/screen.c.orig	2014-12-09 13:14:46.000000000 -0800
+++ src/screen.c	2014-12-09 13:14:57.000000000 -0800
@@ -3520,6 +3520,7 @@
     Atom32          target_list[3];
 #endif
     Atom            target;
+    Atom            property;
     XTextProperty   ct;
     XICCEncodingStyle style;
     char           *cl[2], dummy[1];
@@ -3532,6 +3533,15 @@
     ev.target = rq->target;
     ev.time = rq->time;
 
+	/* ICCCM: 2.2. Responsibilities of the Selection Owner
+	 * SelectionRequest:
+	 * If the specified property is None , the requestor
+	 * an obsolete client. Owners are encouraged
+	 * to support these clients by using the specified
+	 * target atom as the property name to be used for
+	 * the reply.
+	 */
+	property = (rq->property == 0) ? rq->target : rq->property;
     if (rq->target == r->h->xa[XA_TARGETS]) {
 	target_list[0] = (Atom32) r->h->xa[XA_TARGETS];
 	target_list[1] = (Atom32) XA_STRING;
@@ -3539,7 +3549,7 @@
 #ifdef USE_XIM
 	target_list[3] = (Atom32) r->h->xa[XA_COMPOUND_TEXT];
 #endif
-	XChangeProperty(r->Xdisplay, rq->requestor, rq->property, XA_ATOM,
+	XChangeProperty(r->Xdisplay, rq->requestor, property, XA_ATOM,
 			(8 * sizeof(target_list[0])), PropModeReplace,
 			(unsigned char *)target_list,
 			(sizeof(target_list) / sizeof(target_list[0])));
@@ -3547,10 +3557,10 @@
     } else if (rq->target == r->h->xa[XA_MULTIPLE]) {
 	/* TODO: Handle MULTIPLE */
     } else if (rq->target == r->h->xa[XA_TIMESTAMP] && r->selection.text) {
-	XChangeProperty(r->Xdisplay, rq->requestor, rq->property, XA_INTEGER,
-			(8 * sizeof(Time)), PropModeReplace,
+	XChangeProperty(r->Xdisplay, rq->requestor, property, XA_INTEGER,
+			32, PropModeReplace,
 			(unsigned char *)&r->h->selection_time, 1);
-	ev.property = rq->property;
+	ev.property = property;
     } else if (rq->target == XA_STRING
 	       || rq->target == r->h->xa[XA_COMPOUND_TEXT]
 	       || rq->target == r->h->xa[XA_TEXT]) {
@@ -3588,10 +3598,10 @@
 	    ct.value = (unsigned char *)cl[0];
 	    ct.nitems = selectlen;
 	}
-	XChangeProperty(r->Xdisplay, rq->requestor, rq->property,
+	XChangeProperty(r->Xdisplay, rq->requestor, property,
 			target, 8, PropModeReplace,
 			ct.value, (int)ct.nitems);
-	ev.property = rq->property;
+	ev.property = property;
 #ifdef USE_XIM
 	if (freect)
 	    XFree(ct.value);

Removed Link Here

(-)a/x11/xvt/files/patch-src__xvt.h (-11 lines)
1	--- src/xvt.h.orig 2014-12-09 12:59:35.000000000 -0800
2	+++ src/xvt.h 2014-12-09 12:59:39.000000000 -0800
3	@@ -804,7 +804,7 @@
4	#define xvt_Gr_ButtonRelease(x,y) xvt_Gr_ButtonReport (r, 'R',(x),(y))
5
6	#ifdef UTMP_SUPPORT
7	-# if !defined(XVT_UTMPX_FILE) \|\| !defined(HAVE_STRUCT_UTMPX)
8	+# if !defined(HAVE_STRUCT_UTMPX)
9	# undef HAVE_UTMPX_H
10	# undef HAVE_STRUCT_UTMPX
11	# endif




--- src/logging.c.orig	2014-12-09 13:47:18.000000000 -0800
+++ src/logging.c	2014-12-09 13:47:35.000000000 -0800
@@ -82,7 +82,8 @@
     else if (sscanf(pty, "pts/%d", &i) == 1)
 	sprintf(ut_id, "vt%02x", (i & 0xff));	/* sysv naming */
 #endif
-    else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3)) {
+    else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3) &&
+		STRNCMP(pty, "pts/", 4)) {
 	xvt_print_error("can't parse tty name \"%s\"", pty);
 	return;
     }
@@ -137,7 +138,9 @@
     STRNCPY(utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
 	    sizeof(utx->ut_user));
     STRNCPY(utx->ut_id, ut_id, sizeof(utx->ut_id));
+#if 0
     utx->ut_session = getsid(0);
+#endif
     utx->ut_tv.tv_sec = time(NULL);
     utx->ut_tv.tv_usec = 0;
     utx->ut_pid = r->h->cmd_pid;
@@ -202,7 +205,7 @@
 	xvt_update_wtmp(XVT_WTMP_FILE, ut);
 #  endif
 # endif
-# ifdef HAVE_STRUCT_UTMPX
+# if 0
 	updwtmpx(XVT_WTMPX_FILE, utx);
 # endif
     }
@@ -254,7 +257,9 @@
     if ((tmputx = getutxid(utx)))	/* position to entry in utmp file */
 	utx = tmputx;
     utx->ut_type = DEAD_PROCESS;
+#if 0
     utx->ut_session = getsid(0);
+#endif
     utx->ut_tv.tv_sec = time(NULL);
     utx->ut_tv.tv_usec = 0;
 #endif
@@ -274,7 +279,7 @@
 	xvt_update_wtmp(XVT_WTMP_FILE, ut);
 #  endif
 # endif
-# ifdef HAVE_STRUCT_UTMPX
+# if 0
 	updwtmpx(XVT_WTMPX_FILE, utx);
 # endif
     }

Lines 1-6 Link Here

(-)b/x11/xvt/pkg-plist (-1 / +1 lines)
1	@mode 4711	1	@mode 4711
2	bin/xvt	2	bin/xvt
3	bin/xvt-3.0.1	3	bin/xvt-3.0.6
4	@mode	4	@mode
5	include/xvtlib.h	5	include/xvtlib.h
6	lib/libxvt.a	6	lib/libxvt.a

Return to bug 276387

Lines 1-34 Link Here

(-)b/x11/xvt/Makefile (-35 / +42 lines)
1	PORTNAME= xvt	1	PORTNAME= xvt
2	PORTVERSION= 3.0.1	2	PORTVERSION= 3.0.6
3	PORTREVISION= 1
4	CATEGORIES+= x11	3	CATEGORIES+= x11
5	MASTER_SITES= https://BSDforge.com/projects/source/x11/xvt/	4	MASTER_SITES= https://codeberg.org/BSDforge/${PORTNAME}/archive/
6		5
7	MAINTAINER= ports@FreeBSD.org	6	MAINTAINER= portmaster@BSDforge.com
8	COMMENT= Xterm replacement, supporting color, transparency, and more, with less	7	COMMENT= Xterm replacement, supporting color, transparency, and more, with less
9	WWW= https://BSDforge.com/projects/x11/xvt/	8	WWW= https://codeberg.org/BSDforge/xvt/
10		9
11	LICENSE= BSD2CLAUSE GPLv2	10	LICENSE= BSD2CLAUSE GPLv2
12	LICENSE_COMB= multi	11	LICENSE_COMB= multi
13		12
14	DEPRECATED= Deprecated in favour of various forks, consider using x11/rxvt-unicode	13	USES= libtool perl5 xorg
15	EXPIRATION_DATE=2024-02-29
16
17	PORTDOCS= xvt.1.html xvtRef.html xvtRef.txt
18
19	USES= libtool perl5 tar:xz xorg
20	USE_LDCONFIG= yes	14	USE_LDCONFIG= yes
21	USE_PERL5= build patch	15	USE_PERL5= build patch
22	USE_XORG= x11 xpm	16	USE_XORG= x11 xpm
23	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
24		18
25	DESKTOP_ENTRIES= "xvt" "xvt terminal emulator" \	19	PORTDOCS= README.xvt xvt.1.html xvtRef.html xvtRef.txt
		20	WRKSRC= ${WRKDIR}/${PORTNAME}
		21
		22	DESKTOP_ENTRIES= "xvt" \
		23	"xvt terminal emulator" \
26	"${PREFIX}/share/pixmaps/xvt.png" \	24	"${PREFIX}/share/pixmaps/xvt.png" \
27	"xvt" "GNOME;X-XFCE;X-Xfce-Toplevel;System;Utility;TerminalEmulator;" \	25	"xvt" \
		26	"GNOME;X-XFCE;X-Xfce-Toplevel;System;Utility;TerminalEmulator;" \
28	false	27	false
29		28
30	OPTIONS_DEFINE= 256_COLOR BIG5 EUCJ GB GREEK KR LINESPACE MENUBAR NEXT XVT \	29	OPTIONS_DEFINE= 256_COLOR BIG5 DOCS EUCJ GB GREEK KR LINESPACE MENUBAR NEXT \
31	SJIS SMART TRANSPARENCY XIM XTERM DOCS XGETDEFAULT	30	SJIS SMART TRANSPARENCY XGETDEFAULT XIM XTERM XVT
32		31
33	256_COLOR_DESC= Build with 256-color support	32	256_COLOR_DESC= Build with 256-color support
34	BIG5_DESC= Build with BIG5 support	33	BIG5_DESC= Build with BIG5 support
Lines 47-91 XIM_DESC= Build with XIM support Link Here
47	XTERM_DESC= Build with Xterm scrollbar	46	XTERM_DESC= Build with Xterm scrollbar
48	XGETDEFAULT_DESC= Build with resources checking via XGetDefault	47	XGETDEFAULT_DESC= Build with resources checking via XGetDefault
49		48
50	OPTIONS_DEFAULT=256_COLOR GB LINESPACE MENUBAR NEXT XVT SMART TRANSPARENCY \	49	OPTIONS_DEFAULT= 256_COLOR DOCS GB LINESPACE MENUBAR NEXT SMART \
51	XIM XTERM DOCS	50	TRANSPARENCY XIM XTERM XVT
52		51
53	CONFIGURE_ARGS= --enable-utmp --enable-lastlog \	52	CONFIGURE_ARGS= --disable-wtmp \
54	--with-xpm --enable-xpm-background --enable-shared \	53	--enable-lastlog \
55	--enable-mousewheel --disable-languages \	54	--enable-mousewheel \
56	--disable-wtmp	55	--enable-shared \
		56	--enable-utmp \
		57	--enable-xpm-background \
		58	--with-xpm
57	LIBS+= -lutil	59	LIBS+= -lutil
58		60
59	# enable 256 color	61	# enable 256 color
60	256_COLOR_CONFIGURE_ON= --enable-256-color	62	256_COLOR_CONFIGURE_ON= --enable-256-color
61	# enable big5 support	63	# enable big5 support
62	BIG5_CONFIGURE_ON= --with-encoding=big5 --enable-languages	64	BIG5_CONFIGURE_ON= --enable-languages \
		65	--with-encoding=big5
63	# enable euc japanese support	66	# enable euc japanese support
64	EUCJ_CONFIGURE_ON= --with-encoding=eucj --enable-languages	67	EUCJ_CONFIGURE_ON= --enable-languages \
		68	--with-encoding=eucj
65	# enable gb support	69	# enable gb support
66	GB_CONFIGURE_ON= --with-encoding=gb --enable-languages	70	GB_CONFIGURE_ON= --enable-languages \
		71	--with-encoding=gb
67	# enable greek keyboard support	72	# enable greek keyboard support
68	GREEK_CONFIGURE_ON= --enable-greek	73	GREEK_CONFIGURE_ON= --enable-greek
69	# enable euc korean support	74	# enable euc korean support
70	KR_CONFIGURE_ON= --with-encoding=kr --enable-languages	75	KR_CONFIGURE_ON= --enable-languages \
		76	--with-encoding=kr
71	# enable line-spacing	77	# enable line-spacing
72	LINESPACE_CONFIGURE_ON= --enable-linespace	78	LINESPACE_CONFIGURE_ON= --enable-linespace
73	# enable menubar	79	# enable menubar
74	MENUBAR_CONFIGURE_ON= --enable-menubar	80	MENUBAR_CONFIGURE_ON= --enable-menubar
75	# enable NeXT style scrollbar	81	# enable NeXT style scrollbar
76	NEXT_CONFIGURE_ON= --enable-next-scroll	82	NEXT_CONFIGURE_ON= --enable-next-scroll
77	# enable xvt style scrollbar	83	# enable xvt style scrollbar
78	XVT_CONFIGURE_ON= --enable-xvt-scroll	84	XVT_CONFIGURE_ON= --enable-xvt-scroll
79	# enable shift jis support	85	# enable shift jis support
80	SJIS_CONFIGURE_ON= --with-encoding=sjis --enable-languages	86	SJIS_CONFIGURE_ON= --enable-languages \
		87	--with-encoding=sjis
81	# enable smart resize	88	# enable smart resize
82	SMART_CONFIGURE_ON= --enable-smart-resize	89	SMART_CONFIGURE_ON= --enable-smart-resize
83	# enable transparency support	90	# enable transparency support
84	TRANSPARENCY_CONFIGURE_ON= --enable-transparency	91	TRANSPARENCY_CONFIGURE_ON= --enable-transparency
85	# XIM (X Input Method) protocol support	92	# XIM (X Input Method) protocol support
86	XIM_CONFIGURE_ON= --enable-xim	93	XIM_CONFIGURE_ON= --enable-xim
87	# enable Xterm style scrollbar	94	# enable Xterm style scrollbar
88	XTERM_CONFIGURE_ON= --enable-xterm-scroll	95	XTERM_CONFIGURE_ON= --enable-xterm-scroll
89	# make resources checking via XGetDefault	96	# make resources checking via XGetDefault
90	XGETDEFAULT_CONFIGURE_ON= --enable-xgetdefault	97	XGETDEFAULT_CONFIGURE_ON= --enable-xgetdefault
91		98

Lines 1-19 Link Here

(-)b/x11/xvt/files/patch-Makefile.in (-19 / +11 lines)
1	*** Makefile.in.orig Sat Aug 9 15:44:33 2003	1	--- Makefile.in.orig 2024-02-21 00:18:50 UTC
2	--- Makefile.in Sat Aug 9 15:44:39 2003	2	+++ Makefile.in
3	***************	3	@@ -9,7 +9,7 @@ dummy:
4	* 9,15 **	4	first_rule: all
5	first_rule: all	5	dummy:
6	dummy:	6
7		7	-subdirs = src doc rclock src/graphics src/test
8	! subdirs = src doc rclock src/graphics src/test	8	+subdirs = src doc #rclock src/graphics src/test
9	allsubdirs = W11 $(subdirs)	9	allsubdirs = W11 $(subdirs)
10		10
11	DIST = INSTALL README.configure configure Makefile Makefile.in ChangeLog	11	DIST = INSTALL README.configure configure Makefile Makefile.in ChangeLog
12	--- 9,15 ----
13	first_rule: all
14	dummy:
15
16	! subdirs = src doc #rclock src/graphics src/test
17	allsubdirs = W11 $(subdirs)
18
19	DIST = INSTALL README.configure configure Makefile Makefile.in ChangeLog

Removed Link Here

(-)a/x11/xvt/files/patch-src__init.c (-22 lines)
1	--- src/init.c.orig 2014-12-09 12:50:59.000000000 -0800
2	+++ src/init.c 2014-12-09 12:54:55.000000000 -0800
3	@@ -1531,6 +1531,9 @@
4	# ifdef VEOL2
5	tio->c_cc[VEOL2] = VDISABLE;
6	# endif
7	+# ifdef VERASE2
8	+ tio->c_cc[VERASE2] = CERASE2;
9	+# endif
10	# ifdef VSWTC
11	tio->c_cc[VSWTC] = VDISABLE;
12	# endif
13	@@ -1651,6 +1654,9 @@
14	# ifdef VEOL2
15	FOO(VEOL2, "VEOL2");
16	# endif
17	+# ifdef VERASE2
18	+ FOO(VERASE2, "VERASE2");
19	+# endif
20	# ifdef VSWTC
21	FOO(VSWTC, "VSWTC");
22	# endif

Removed Link Here

(-)a/x11/xvt/files/patch-src__screen.c (-62 lines)
1	--- src/screen.c.orig 2014-12-09 13:14:46.000000000 -0800
2	+++ src/screen.c 2014-12-09 13:14:57.000000000 -0800
3	@@ -3520,6 +3520,7 @@
4	Atom32 target_list[3];
5	#endif
6	Atom target;
7	+ Atom property;
8	XTextProperty ct;
9	XICCEncodingStyle style;
10	char *cl[2], dummy[1];
11	@@ -3532,6 +3533,15 @@
12	ev.target = rq->target;
13	ev.time = rq->time;
14
15	+ /* ICCCM: 2.2. Responsibilities of the Selection Owner
16	+ * SelectionRequest:
17	+ * If the specified property is None , the requestor
18	+ * an obsolete client. Owners are encouraged
19	+ * to support these clients by using the specified
20	+ * target atom as the property name to be used for
21	+ * the reply.
22	+ */
23	+ property = (rq->property == 0) ? rq->target : rq->property;
24	if (rq->target == r->h->xa[XA_TARGETS]) {
25	target_list[0] = (Atom32) r->h->xa[XA_TARGETS];
26	target_list[1] = (Atom32) XA_STRING;
27	@@ -3539,7 +3549,7 @@
28	#ifdef USE_XIM
29	target_list[3] = (Atom32) r->h->xa[XA_COMPOUND_TEXT];
30	#endif
31	- XChangeProperty(r->Xdisplay, rq->requestor, rq->property, XA_ATOM,
32	+ XChangeProperty(r->Xdisplay, rq->requestor, property, XA_ATOM,
33	(8 * sizeof(target_list[0])), PropModeReplace,
34	(unsigned char *)target_list,
35	(sizeof(target_list) / sizeof(target_list[0])));
36	@@ -3547,10 +3557,10 @@
37	} else if (rq->target == r->h->xa[XA_MULTIPLE]) {
38	/* TODO: Handle MULTIPLE */
39	} else if (rq->target == r->h->xa[XA_TIMESTAMP] && r->selection.text) {
40	- XChangeProperty(r->Xdisplay, rq->requestor, rq->property, XA_INTEGER,
41	- (8 * sizeof(Time)), PropModeReplace,
42	+ XChangeProperty(r->Xdisplay, rq->requestor, property, XA_INTEGER,
43	+ 32, PropModeReplace,
44	(unsigned char *)&r->h->selection_time, 1);
45	- ev.property = rq->property;
46	+ ev.property = property;
47	} else if (rq->target == XA_STRING
48	\|\| rq->target == r->h->xa[XA_COMPOUND_TEXT]
49	\|\| rq->target == r->h->xa[XA_TEXT]) {
50	@@ -3588,10 +3598,10 @@
51	ct.value = (unsigned char *)cl[0];
52	ct.nitems = selectlen;
53	}
54	- XChangeProperty(r->Xdisplay, rq->requestor, rq->property,
55	+ XChangeProperty(r->Xdisplay, rq->requestor, property,
56	target, 8, PropModeReplace,
57	ct.value, (int)ct.nitems);
58	- ev.property = rq->property;
59	+ ev.property = property;
60	#ifdef USE_XIM
61	if (freect)
62	XFree(ct.value);

Removed Link Here

(-)a/x11/xvt/files/patch-src_logging.c (-50 lines)
1	--- src/logging.c.orig 2014-12-09 13:47:18.000000000 -0800
2	+++ src/logging.c 2014-12-09 13:47:35.000000000 -0800
3	@@ -82,7 +82,8 @@
4	else if (sscanf(pty, "pts/%d", &i) == 1)
5	sprintf(ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
6	#endif
7	- else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3)) {
8	+ else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3) &&
9	+ STRNCMP(pty, "pts/", 4)) {
10	xvt_print_error("can't parse tty name \"%s\"", pty);
11	return;
12	}
13	@@ -137,7 +138,9 @@
14	STRNCPY(utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
15	sizeof(utx->ut_user));
16	STRNCPY(utx->ut_id, ut_id, sizeof(utx->ut_id));
17	+#if 0
18	utx->ut_session = getsid(0);
19	+#endif
20	utx->ut_tv.tv_sec = time(NULL);
21	utx->ut_tv.tv_usec = 0;
22	utx->ut_pid = r->h->cmd_pid;
23	@@ -202,7 +205,7 @@
24	xvt_update_wtmp(XVT_WTMP_FILE, ut);
25	# endif
26	# endif
27	-# ifdef HAVE_STRUCT_UTMPX
28	+# if 0
29	updwtmpx(XVT_WTMPX_FILE, utx);
30	# endif
31	}
32	@@ -254,7 +257,9 @@
33	if ((tmputx = getutxid(utx))) /* position to entry in utmp file */
34	utx = tmputx;
35	utx->ut_type = DEAD_PROCESS;
36	+#if 0
37	utx->ut_session = getsid(0);
38	+#endif
39	utx->ut_tv.tv_sec = time(NULL);
40	utx->ut_tv.tv_usec = 0;
41	#endif
42	@@ -274,7 +279,7 @@
43	xvt_update_wtmp(XVT_WTMP_FILE, ut);
44	# endif
45	# endif
46	-# ifdef HAVE_STRUCT_UTMPX
47	+# if 0
48	updwtmpx(XVT_WTMPX_FILE, utx);
49	# endif
50	}