From 05410457bdc7eb003b12e74a7f75dc08e17a7698 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Wed, 9 Mar 2016 15:34:15 +0100
Subject: [PATCH] testing/xterm: ugprade to 323
---
testing/xterm/APKBUILD | 38 ++++++++++++++--------------------
testing/xterm/musl-fixes.patch | 15 ++++++++++++++
testing/xterm/posix-ptys.patch | 16 +++++++-------
3 files changed, 39 insertions(+), 30 deletions(-)
create mode 100644 testing/xterm/musl-fixes.patch
diff --git a/testing/xterm/APKBUILD b/testing/xterm/APKBUILD
index d75bab4a266b..276d41146f89 100644
--- a/testing/xterm/APKBUILD
+++ b/testing/xterm/APKBUILD
@@ -1,31 +1,22 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer:
pkgname=xterm
-pkgver=320
+pkgver=323
pkgrel=0
pkgdesc="X Terminal Emulator"
url="http://invisible-island.net/xterm"
arch="all"
license="custom"
depends=""
-depends_dev="libxaw-dev libxft-dev ncurses-dev"
-makedepends="$depends_dev"
+depends_dev=""
+makedepends="libxaw-dev libxft-dev ncurses-dev"
install=""
subpackages="$pkgname-doc"
-source="ftp://invisible-island.net/xterm/xterm-$pkgver.tgz
- posix-ptys.patch"
-
-_builddir="$srcdir"/xterm-$pkgver
-prepare() {
- local i
- cd "$_builddir"
- for i in $source; do
- case $i in
- *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
- esac
- done
-}
+source="ftp://invisible-island.net/$pkgname/$pkgname-$pkgver.tgz
+ posix-ptys.patch
+ musl-fixes.patch"
+_builddir="$srcdir"/$pkgname-$pkgver
build() {
cd "$_builddir"
./configure \
@@ -68,9 +59,12 @@ package() {
make DESTDIR="$pkgdir" install || return 1
}
-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"
+md5sums="ab5b6067a777b5107fdc40aa14759871 xterm-323.tgz
+9a6939a624949287671ca076f5b92543 posix-ptys.patch
+b8eb4a5be930e7b047c4006c6a0652c8 musl-fixes.patch"
+sha256sums="e39f7469910ecc92bd53496037770d4b572d33486a4ba97188e64459f25658bf xterm-323.tgz
+c90d715cb7667ac91fd2697caaf1abce70e46ca0cf14eabf5e17dc305e3cb84c posix-ptys.patch
+7de307bf9816ac7ee0dda1a109cd9a7b4e3599966a6f4bea6b08e77a02a975f6 musl-fixes.patch"
+sha512sums="f70cb33fb0dfdcdf79560de6fc9d35a443a83f2b20d086d3cdd14f20bbf1b2da524479672701d0c298e1a06dae7f7a48ccdc0f04fbeb6cc0d5e673dd4df9ccd2 xterm-323.tgz
+03722dc3ebe8067a1edf4673ce2e5132832e52818f4e122bfbd3846a4ebf0ca25bea999d98455b87ec572931becbbb0432e22c75b0fb5371a81c8acf0c4e9f98 posix-ptys.patch
+3ac4716cd6721f441554dff001e1cef1db95528fd4d1572e70370e240a8e4ad3e49750870780318007c82a67ca4c68f5bd5177f9eb50048b06c2c3ba549a4cb6 musl-fixes.patch"
diff --git a/testing/xterm/musl-fixes.patch b/testing/xterm/musl-fixes.patch
new file mode 100644
index 000000000000..8612a2158a4b
--- /dev/null
+++ b/testing/xterm/musl-fixes.patch
@@ -0,0 +1,15 @@
+diff -upr xterm-323.orig/Tekproc.c xterm-323/Tekproc.c
+--- xterm-323.orig/Tekproc.c 2016-03-09 15:33:04.900639959 +0100
++++ xterm-323/Tekproc.c 2016-03-09 15:33:14.412994110 +0100
+@@ -253,9 +253,9 @@ static Dimension defOne = 1;
+ static XtResource resources[] =
+ {
+ {XtNwidth, XtCWidth, XtRDimension, sizeof(Dimension),
+- XtOffsetOf(CoreRec, core.width), XtRDimension, (caddr_t) & defOne},
++ XtOffsetOf(CoreRec, core.width), XtRDimension, (void*) & defOne},
+ {XtNheight, XtCHeight, XtRDimension, sizeof(Dimension),
+- XtOffsetOf(CoreRec, core.height), XtRDimension, (caddr_t) & defOne},
++ XtOffsetOf(CoreRec, core.height), XtRDimension, (void*) & defOne},
+ Fres("fontLarge", XtCFont, tek.Tfont[TEK_FONT_LARGE], "9x15"),
+ Fres("font2", XtCFont, tek.Tfont[TEK_FONT_2], "6x13"),
+ Fres("font3", XtCFont, tek.Tfont[TEK_FONT_3], "8x13"),
diff --git a/testing/xterm/posix-ptys.patch b/testing/xterm/posix-ptys.patch
index 3e6d2160c8e6..596699fde2f1 100644
--- a/testing/xterm/posix-ptys.patch
+++ b/testing/xterm/posix-ptys.patch
@@ -1,15 +1,16 @@
---- ./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);
+diff -upr xterm-323.orig/main.c xterm-323/main.c
+--- xterm-323.orig/main.c 2016-03-09 15:30:51.191053881 +0100
++++ xterm-323/main.c 2016-03-09 15:31:17.961635229 +0100
+@@ -2654,7 +2654,7 @@ get_pty(int *pty, char *from GCC_UNUSED)
+ close(opened_tty);
+ opened_tty = -1;
+ }
-#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 @@
+@@ -3735,7 +3735,7 @@ spawnXTerm(XtermWidget xw)
/*
* now in child process
*/
@@ -18,4 +19,3 @@
int pgrp = setsid(); /* variable may not be used... */
#else
int pgrp = getpid();
-
--
GitLab