From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- x11-terms/xvt/Manifest | 10 +++++ x11-terms/xvt/files/xvt-int-main.patch | 23 ++++++++++ x11-terms/xvt/files/xvt-makefile.patch | 20 +++++++++ x11-terms/xvt/files/xvt-pts.patch | 12 ++++++ x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff | 63 ++++++++++++++++++++++++++++ x11-terms/xvt/metadata.xml | 8 ++++ x11-terms/xvt/xvt-2.1-r3.ebuild | 47 +++++++++++++++++++++ 7 files changed, 183 insertions(+) create mode 100644 x11-terms/xvt/Manifest create mode 100644 x11-terms/xvt/files/xvt-int-main.patch create mode 100644 x11-terms/xvt/files/xvt-makefile.patch create mode 100644 x11-terms/xvt/files/xvt-pts.patch create mode 100644 x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff create mode 100644 x11-terms/xvt/metadata.xml create mode 100644 x11-terms/xvt/xvt-2.1-r3.ebuild (limited to 'x11-terms/xvt') diff --git a/x11-terms/xvt/Manifest b/x11-terms/xvt/Manifest new file mode 100644 index 000000000000..ca10687bf934 --- /dev/null +++ b/x11-terms/xvt/Manifest @@ -0,0 +1,10 @@ +AUX xvt-int-main.patch 458 SHA256 11e20ebf19b334ae4e1237147c56298ce6b6995a30de0dcd5695c435fc75d716 SHA512 511525c6016974951c3157a817bbd6c23e630de53f412f275112303bd01ca5b865412d5a2f69d2b2e38e02e1989dca25681707477298f39e501a20a9d8e6cc22 WHIRLPOOL 691c5765ef9bba66a43f61d58a0e3bb8a0d5cb3e46f663a002fca402c6c2b42a569ae50fd9abe140783a99c81142dca1338f06ebf2996d7a221a33ea98d97c4d +AUX xvt-makefile.patch 583 SHA256 b5dcc3f2806d85085e215a844624b099bbf3f94b8bc8ba5defbf1c61f4e82992 SHA512 8c68862bc02a7646e4288a07b40bf703c3acb94ebb29725ed87c734643b4f039b828a65bd3c4745d69bb81ac4b358ca12b12e95ba51c453c8610a6cceaa7d146 WHIRLPOOL 0af7800dd3bab2fc953fdfc3975c86af5d7215d0adc06f9d9275c4c37884b40e4c0350de48141ce8342ec0f82d57728eb1baf6663ef8fba61589de63470121d5 +AUX xvt-pts.patch 211 SHA256 77d7dbfd2a2ed6d1341234b859337a4696ebea557a182c605dcd31f35b70efce SHA512 ba3f910018d7e5efaf788ff9d5fe5c7ec74a088522a04c46702f83f9a60455004310e3a32547b3a2feb679056c08af07ace19ad73ddbdbc93a797da7482b420d WHIRLPOOL 6679583a85c4845a6bedbce0133c22ba919bf8593c1e1bbff303bd9cb5ed1515ffc49e0272e9278871ce5dcabdb00ddae7c63816639dcbe2db68cf962b02f688 +AUX xvt-ttyinit-svr4pty.diff 1380 SHA256 9723dce5d6609a8fddaed166bf6143faeb1b84765bdd7818b4eec33bb8d2371c SHA512 790b97e5f05738bfc912af030733db4ee0b419844f1b9d4d6655b3dc3cf225d513fa3e3aed0f877a68bda9530fcd463fa0bb75bd34e38c3ba4eeccb4b8ff7da4 WHIRLPOOL bd14ede0578d143557a2e7d8d7132029ba72d4bc91ce290b5e0344eee3b1fa8bbda5a7e24c4773e30833747292c06bc5cad79d5a50c8a3e3cd42d56e1ab7ca8f +DIST xvt-1.0.tar.Z 59445 SHA256 399013beff538467a307d8a5f132e47ea4f5e18d60aba62c4d438f3ae1f086a1 SHA512 671fdc931526821e9228c327d2231e0f241997c632b0f084b2be02b99296ececa64f2de2769e92c3682c0aa2e9cf8dc61ac561ffd1d10136256029d24f872a1b WHIRLPOOL 31bec7b379c44c691f9a56c9052bf7b45a6df763f06750494d2bb5b747b7cb515e681f9e215de85f1173f1da31121e826a41ed49b7e7b1fc32e2b132c7d6d636 +DIST xvt-2.1.diff.gz 39941 SHA256 c51e0b1ea281ce83138d6a3f724c21b65c6257cf5438d8d0d5c34a8006348607 SHA512 c229cb98ef3de7b4ab76b81ae888fc3a59ff9fcf5807ecdc58f8e5b634f9c2e618d2b3c17b4cd6410903004a712aac1c1d329751a48f05d605a7eb23dd58d612 WHIRLPOOL 9c0dcf583100a0637cd6dc126c2eb34c278b13399405c6a49adc2f2e3f964ca67a2743b83cf4958bc97f1ff3d48d2660d44f20e6d018596139240375b60084f2 +EBUILD xvt-2.1-r3.ebuild 965 SHA256 1bf86719f99169f788164f027d6bedaeaeb9f517259e76969ee8b2f7d2bc98a7 SHA512 3e6bbfa0293664fd218a21c0ce72ab7229b8f13b98a9519fdf9ea6c1564f938825045d7b118319681f82a390b814e76b416f1524f12bb05b301e3de8ccc943e9 WHIRLPOOL fab1b4ed2117140e3aee9c9e961d793f646a02737064fccabd55619c9edf28f39d170730e507e4bf43fc30a2ca895d0d7b88d5f91f3f19753a5cb92bf16cc108 +MISC ChangeLog 2624 SHA256 b2d06b30c6b14628fe1532e4dc3e94bff8c52f7521381b8ebc7e2e744eef44ef SHA512 45c92e84f0ba6411747a14cd9fb556ea3c8095d2a69576f9ffd46278b3a3a26339f811aa7ce24c9bf84da8337a23638abbfa994463e08fe9fd561bcd8e1ee834 WHIRLPOOL 3553d4d9665463686b4d8a39f89a1dd2526b144dbff6c072e3f3426a10cb9c49670e034c75da6cbd84b332fe0fb56e6b4939117ebdd6732f0141907f5c29f2e0 +MISC ChangeLog-2015 2768 SHA256 59f0a6303c8d19fadf48dfb95ef14a671fe83d119be4b9179bef32bf303522c8 SHA512 62d7d798014600926363226d08dc7fd52db1052d96a98a2af962581be7e6232ac76c05bdf1a2e0157aa1de53ffa995e01bfe555147b9e430f4c6bd96f2529d56 WHIRLPOOL 280f8b6732d48977e4f89fecbc7e8407ee5d97cabfec95b3db557beeb8fc8c563fad2e3eccaaba1899ad8ff39d587c363230e2177b21d63a2b4b7d41dee4e18c +MISC metadata.xml 256 SHA256 41f0660fc66ddd75eb62be043243821841b42538deb7d153b186888b666790e5 SHA512 954fbecba4916b2b5e4b353a55a7c4ae6bd9be7190f6550ae4eb003f4037698a4576aee03847d4def6a5ca6dfbb9d145749a6fdb44b8a77477f726c92968643b WHIRLPOOL 08cd48931de8a40cc55417886a97fe47b16deba1fd8bd6713c27d6e68aee377de9cd306706a4c2aa992fcfebc3e28129f30f1c6052655047994e66a6c6489b12 diff --git a/x11-terms/xvt/files/xvt-int-main.patch b/x11-terms/xvt/files/xvt-int-main.patch new file mode 100644 index 000000000000..81baa76ce5e0 --- /dev/null +++ b/x11-terms/xvt/files/xvt-int-main.patch @@ -0,0 +1,23 @@ +--- xvt-1.0/xvt.c.orig 2009-09-04 15:49:13.000000000 +0200 ++++ xvt-1.0/xvt.c 2009-09-04 15:49:13.000000000 +0200 +@@ -41,9 +41,9 @@ + #endif /* UKC_LOCATIONS */ + + #ifdef __STDC__ +-void main(int,char **); ++int main(int,char **); + #else +-void main(); ++int main(); + #endif + + extern int debugging; +@@ -67,7 +67,7 @@ + * master end of the pseudo-teletype pair with the command talking to + * the slave. + */ +-void ++int + main(argc,argv) + int argc; + char **argv; diff --git a/x11-terms/xvt/files/xvt-makefile.patch b/x11-terms/xvt/files/xvt-makefile.patch new file mode 100644 index 000000000000..368fdeeb00be --- /dev/null +++ b/x11-terms/xvt/files/xvt-makefile.patch @@ -0,0 +1,20 @@ +--- xvt-1.0/Makefile.orig 2009-09-04 15:45:08.000000000 +0200 ++++ xvt-1.0/Makefile 2009-09-04 15:46:00.000000000 +0200 +@@ -27,7 +27,7 @@ + #ARCH=AIX3 + #ARCH=ULTRIX + #ARCH=HPUX +-#ARCH=LINUX ++ARCH=LINUX + # + # + # If this line is uncommented then `Make config' will unclude several options +@@ -107,7 +107,7 @@ + OBJ=xvt.o xsetup.o command.o screen.o sbar.o ttyinit.o + SRC=xvt.c xsetup.c command.c screen.c sbar.c ttyinit.c + # +-CFLAGS=-O $(INCLUDE) $(OPTIONS) $(DEFS) -D$(ARCH) ++CFLAGS+= $(INCLUDE) $(OPTIONS) $(DEFS) -D$(ARCH) + # + xvt: $(OBJ) + $(CC) $(LDFLAGS) -o xvt $(OBJ) $(LIB) -lX11 diff --git a/x11-terms/xvt/files/xvt-pts.patch b/x11-terms/xvt/files/xvt-pts.patch new file mode 100644 index 000000000000..a86504ad29e5 --- /dev/null +++ b/x11-terms/xvt/files/xvt-pts.patch @@ -0,0 +1,12 @@ +--- a/ttyinit.c ++++ b/ttyinit.c +@@ -25,6 +25,9 @@ + + char xvt_ttyinit_c_sccsid[] = "@(#)ttyinit.c 1.3 11/1/94 (UKC)"; + ++#ifdef LINUX ++#define _XOPEN_SOURCE ++#endif + #ifdef __STDC__ + #include + #else diff --git a/x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff b/x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff new file mode 100644 index 000000000000..a858250c1d8a --- /dev/null +++ b/x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff @@ -0,0 +1,63 @@ +--- ttyinit.c 2004-08-24 18:51:18.510722064 +0100 ++++ ttyinit.c.new 2004-08-24 18:50:30.539014872 +0100 +@@ -46,6 +46,7 @@ + #include + #include + #include ++#include + #include "xvt.h" + #include "token.h" + #include "command.h" +@@ -410,44 +411,6 @@ + get_pseudo_tty(pmaster,pslave) + int *pmaster, *pslave; + { +-#ifdef BSD_PTY +- int mfd, sfd; +- char *s3, *s4; +- static char ptyc3[] = "pqrstuvwxyz"; +- static char ptyc4[] = "0123456789abcdef"; +- static char ptynam[] = "/dev/ptyxx"; +- static char ttynam[] = "/dev/ttyxx"; +- +- /* First find a master pty that we can open. +- */ +- mfd = -1; +- for (s3 = ptyc3; *s3 != 0; s3++) { +- for (s4 = ptyc4; *s4 != 0; s4++) { +- ptynam[8] = ttynam[8] = *s3; +- ptynam[9] = ttynam[9] = *s4; +- if ((mfd = open(ptynam,O_RDWR)) >= 0) { +- if (geteuid() == 0 || access(ttynam,R_OK|W_OK) == 0) +- break; +- else { +- close(mfd); +- mfd = -1; +- } +- } +- } +- if (mfd >= 0) +- break; +- } +- if (mfd < 0) { +- error("Can't open a pseudo teletype"); +- return(NULL); +- } +- if ((sfd = open(ttynam,O_RDWR)) < 0) { +- error("could not open slave tty %s",ttynam); +- return(NULL); +- } +-#endif /* BSD_PTY */ +- +-#ifdef SVR4_PTY + char *ttynam; + int mfd, sfd; + +@@ -464,7 +427,6 @@ + } + ioctl(sfd,I_PUSH,"ptem"); + ioctl(sfd,I_PUSH,"ldterm"); +-#endif /* SVR4_PTY */ + + *pslave = sfd; + *pmaster = mfd; diff --git a/x11-terms/xvt/metadata.xml b/x11-terms/xvt/metadata.xml new file mode 100644 index 000000000000..41c6dfc7341b --- /dev/null +++ b/x11-terms/xvt/metadata.xml @@ -0,0 +1,8 @@ + + + + + + A tiny vt100 terminal emulator for X. + + diff --git a/x11-terms/xvt/xvt-2.1-r3.ebuild b/x11-terms/xvt/xvt-2.1-r3.ebuild new file mode 100644 index 000000000000..2720588b12f7 --- /dev/null +++ b/x11-terms/xvt/xvt-2.1-r3.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="2" + +inherit eutils flag-o-matic toolchain-funcs + +DESCRIPTION="A tiny vt100 terminal emulator for X" +HOMEPAGE="ftp://ftp.x.org/R5contrib/xvt-1.0.README" +SRC_URI="ftp://ftp.x.org/R5contrib/xvt-1.0.tar.Z + mirror://gentoo/xvt-2.1.diff.gz" + +LICENSE="xvt" +SLOT="0" +KEYWORDS="alpha amd64 ppc x86" +IUSE="" + +RDEPEND="x11-libs/libX11" +DEPEND="${RDEPEND} + x11-proto/xproto" + +S=${WORKDIR}/${PN}-1.0 + +src_prepare() { + # this brings the distribution upto version 2.1 + epatch "${WORKDIR}"/${P}.diff + + # fix #61393 + epatch "${FILESDIR}/${PN}-ttyinit-svr4pty.diff" + + # CFLAGS, CC #241554 + epatch "${FILESDIR}/${PN}-makefile.patch" + + # int main, not void main + epatch "${FILESDIR}/${PN}-int-main.patch" + + # fix segfault (bug #363883) + epatch "${FILESDIR}/${PN}-pts.patch" + + tc-export CC +} + +src_install() { + dobin xvt || die "dobin failed" + doman xvt.1 + dodoc README +} -- cgit v1.2.3