From 3aa532e77875fa1db18c7fcb938b16647031bcc1 Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Sun, 11 Sep 2016 12:44:18 +0200 Subject: community/xterm: move from testing xterm is a dependency of firetools --- community/xterm/APKBUILD | 64 ++++++++++++++++++++++++++++++++++++++++ community/xterm/posix-ptys.patch | 21 +++++++++++++ testing/xterm/APKBUILD | 64 ---------------------------------------- testing/xterm/posix-ptys.patch | 21 ------------- 4 files changed, 85 insertions(+), 85 deletions(-) create mode 100644 community/xterm/APKBUILD create mode 100644 community/xterm/posix-ptys.patch delete mode 100644 testing/xterm/APKBUILD delete mode 100644 testing/xterm/posix-ptys.patch diff --git a/community/xterm/APKBUILD b/community/xterm/APKBUILD new file mode 100644 index 0000000000..0a56c54456 --- /dev/null +++ b/community/xterm/APKBUILD @@ -0,0 +1,64 @@ +# Contributor: Carlo Landmeter +# Maintainer: Jakub Jirutka +pkgname=xterm +pkgver=325 +pkgrel=0 +pkgdesc="X Terminal Emulator" +url="http://invisible-island.net/xterm" +arch="all" +license="custom" +depends="" +makedepends="libxaw-dev libxft-dev ncurses-dev" +subpackages="$pkgname-doc" +source="ftp://invisible-island.net/$pkgname/$pkgname-$pkgver.tgz + posix-ptys.patch" +builddir="$srcdir/$pkgname-$pkgver" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + --with-x \ + --disable-full-tgetent \ + --disable-imake \ + --enable-ansi-color \ + --enable-88-color \ + --enable-256-color \ + --enable-broken-osc \ + --enable-broken-st \ + --enable-load-vt-fonts \ + --enable-i18n \ + --enable-wide-chars \ + --enable-doublechars \ + --enable-warnings \ + --enable-tcap-query \ + --enable-logging \ + --enable-dabbrev \ + --enable-freetype \ + --enable-luit \ + --enable-mini-luit \ + --enable-narrowproto \ + --enable-exec-xterm \ + --with-tty-group=tty \ + --with-utempter \ + || return 1 + make || return 1 +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install || return 1 +} + +md5sums="e78a0bbc4d5fa3780917e447ae8ebc6b xterm-325.tgz +9a6939a624949287671ca076f5b92543 posix-ptys.patch" +sha256sums="3b31b07a0c40427e9330ec3be9d1a748c72808f945953cea9e526e48be315f1b xterm-325.tgz +c90d715cb7667ac91fd2697caaf1abce70e46ca0cf14eabf5e17dc305e3cb84c posix-ptys.patch" +sha512sums="7049a013967cb90eb196684e7d6d0664cd0d7c86154fba318493d9249e973a4bf591861cbbc051a80184ef427aad75774b15d79cb571d3f82482c1b51e7a99f4 xterm-325.tgz +03722dc3ebe8067a1edf4673ce2e5132832e52818f4e122bfbd3846a4ebf0ca25bea999d98455b87ec572931becbbb0432e22c75b0fb5371a81c8acf0c4e9f98 posix-ptys.patch" diff --git a/community/xterm/posix-ptys.patch b/community/xterm/posix-ptys.patch new file mode 100644 index 0000000000..596699fde2 --- /dev/null +++ b/community/xterm/posix-ptys.patch @@ -0,0 +1,21 @@ +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) { +@@ -3735,7 +3735,7 @@ spawnXTerm(XtermWidget xw) + /* + * 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(); diff --git a/testing/xterm/APKBUILD b/testing/xterm/APKBUILD deleted file mode 100644 index 0a56c54456..0000000000 --- a/testing/xterm/APKBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# Contributor: Carlo Landmeter -# Maintainer: Jakub Jirutka -pkgname=xterm -pkgver=325 -pkgrel=0 -pkgdesc="X Terminal Emulator" -url="http://invisible-island.net/xterm" -arch="all" -license="custom" -depends="" -makedepends="libxaw-dev libxft-dev ncurses-dev" -subpackages="$pkgname-doc" -source="ftp://invisible-island.net/$pkgname/$pkgname-$pkgver.tgz - posix-ptys.patch" -builddir="$srcdir/$pkgname-$pkgver" - -build() { - cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --localstatedir=/var \ - --with-x \ - --disable-full-tgetent \ - --disable-imake \ - --enable-ansi-color \ - --enable-88-color \ - --enable-256-color \ - --enable-broken-osc \ - --enable-broken-st \ - --enable-load-vt-fonts \ - --enable-i18n \ - --enable-wide-chars \ - --enable-doublechars \ - --enable-warnings \ - --enable-tcap-query \ - --enable-logging \ - --enable-dabbrev \ - --enable-freetype \ - --enable-luit \ - --enable-mini-luit \ - --enable-narrowproto \ - --enable-exec-xterm \ - --with-tty-group=tty \ - --with-utempter \ - || return 1 - make || return 1 -} - -package() { - cd "$builddir" - make DESTDIR="$pkgdir" install || return 1 -} - -md5sums="e78a0bbc4d5fa3780917e447ae8ebc6b xterm-325.tgz -9a6939a624949287671ca076f5b92543 posix-ptys.patch" -sha256sums="3b31b07a0c40427e9330ec3be9d1a748c72808f945953cea9e526e48be315f1b xterm-325.tgz -c90d715cb7667ac91fd2697caaf1abce70e46ca0cf14eabf5e17dc305e3cb84c posix-ptys.patch" -sha512sums="7049a013967cb90eb196684e7d6d0664cd0d7c86154fba318493d9249e973a4bf591861cbbc051a80184ef427aad75774b15d79cb571d3f82482c1b51e7a99f4 xterm-325.tgz -03722dc3ebe8067a1edf4673ce2e5132832e52818f4e122bfbd3846a4ebf0ca25bea999d98455b87ec572931becbbb0432e22c75b0fb5371a81c8acf0c4e9f98 posix-ptys.patch" diff --git a/testing/xterm/posix-ptys.patch b/testing/xterm/posix-ptys.patch deleted file mode 100644 index 596699fde2..0000000000 --- a/testing/xterm/posix-ptys.patch +++ /dev/null @@ -1,21 +0,0 @@ -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) { -@@ -3735,7 +3735,7 @@ spawnXTerm(XtermWidget xw) - /* - * 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