From 4bec2947580153cde107ae91567721477f162a44 Mon Sep 17 00:00:00 2001
From: Carlo Landmeter <clandmeter@gmail.com>
Date: Mon, 31 Aug 2015 10:37:09 +0200
Subject: testing/xterm: upgrade to 320 and fix ptys

patch provided by dalias
---
 testing/xterm/APKBUILD         | 14 +++++++++-----
 testing/xterm/posix-ptys.patch | 21 +++++++++++++++++++++
 2 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 testing/xterm/posix-ptys.patch

(limited to 'testing/xterm')

diff --git a/testing/xterm/APKBUILD b/testing/xterm/APKBUILD
index 526a060e7e..32fcb215bc 100644
--- a/testing/xterm/APKBUILD
+++ b/testing/xterm/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer:
 pkgname=xterm
-pkgver=318
+pkgver=320
 pkgrel=0
 pkgdesc="X Terminal Emulator"
 url="http://invisible-island.net/xterm"
@@ -12,7 +12,8 @@ depends_dev="libxaw-dev libxft-dev ncurses-dev"
 makedepends="$depends_dev"
 install=""
 subpackages="$pkgname-doc"
-source="ftp://invisible-island.net/xterm/xterm-$pkgver.tgz"
+source="ftp://invisible-island.net/xterm/xterm-$pkgver.tgz
+	posix-ptys.patch"
 
 _builddir="$srcdir"/xterm-$pkgver
 prepare() {
@@ -68,6 +69,9 @@ package() {
 	rm -f "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="598d1122f501116fbfed8a642d8ea6c1  xterm-318.tgz"
-sha256sums="e71f2b0fb11d6c723c1f9af10fc01048b776f44c1636aa1b71e5eff77deb81d7  xterm-318.tgz"
-sha512sums="d1ff9b4359a49f47cc9e5e7d6311242b7beef57e554389fe3033f69263b871ad5ba89d74b428d79564f013efced2d2d36cfac987aed8ab873722fdeb8fd6abf6  xterm-318.tgz"
+md5sums="0d7f0e6390d132ae59876b3870e5783d  xterm-320.tgz
+cdb785aee3c4caf15479384035563a18  posix-ptys.patch"
+sha256sums="a60dbb574334c081425fa30f011cd9f571e3be7a91e2a84e252461798bce24a7  xterm-320.tgz
+5d362c0e4d0fa956fe77070f7a7ae5105c3a560a6a9bc5ee6faa0eb6c5f9d50e  posix-ptys.patch"
+sha512sums="6c234b5564ce1276136bc3ef8ef5d6703ed9dc3af3b0fd7c8c713c0876276fc4bb55cee7137f9a8c45df66531b6bd8eb778bd7660ea35c4aa8aa80ba17ba1263  xterm-320.tgz
+2730d369fde55f6ebe65c436da00cc65d0b948ae76b7f6f1b456a8ca428b9dd4853e933c800571b76f165b500b89b80eb8d8ed4aba8e62d64b84c3a315a530c0  posix-ptys.patch"
diff --git a/testing/xterm/posix-ptys.patch b/testing/xterm/posix-ptys.patch
new file mode 100644
index 0000000000..3e6d2160c8
--- /dev/null
+++ b/testing/xterm/posix-ptys.patch
@@ -0,0 +1,21 @@
+--- ./main.c.orig	2015-08-19 00:25:35.000000000 +0000
++++ ./main.c	2015-08-28 23:43:21.631378928 +0000
+@@ -2628,7 +2628,7 @@
+ 
+ #if defined(USE_OPENPTY)
+     result = openpty(pty, &opened_tty, ttydev, NULL, NULL);
+-#elif defined(HAVE_POSIX_OPENPT) && defined(HAVE_PTSNAME) && defined(HAVE_GRANTPT_PTY_ISATTY)
++#elif defined(HAVE_POSIX_OPENPT) && defined(HAVE_PTSNAME)
+     if ((*pty = posix_openpt(O_RDWR)) >= 0) {
+ 	char *name = ptsname(*pty);
+ 	if (name != 0) {
+@@ -3708,7 +3708,7 @@
+ 	    /*
+ 	     * now in child process
+ 	     */
+-#if defined(_POSIX_SOURCE) || defined(SVR4) || defined(__convex__) || defined(__SCO__) || defined(__QNX__)
++#if defined(_POSIX_VERSION) || defined(SVR4) || defined(__convex__) || defined(__SCO__) || defined(__QNX__)
+ 	    int pgrp = setsid();	/* variable may not be used... */
+ #else
+ 	    int pgrp = getpid();
+
-- 
cgit v1.2.3