aboutsummaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2016-03-13 20:50:15 +0100
committerSören Tempel <soeren+git@soeren-tempel.net>2016-03-13 20:50:15 +0100
commit1d0c588a4326d946d9132308979540985918582b (patch)
tree26eded3dfc039b5a99f01b1afc6757982ecc4075 /testing
parent11dd11533410b991f8b93a0c759359856ab8ab5b (diff)
downloadaports-1d0c588a4326d946d9132308979540985918582b.tar.bz2
aports-1d0c588a4326d946d9132308979540985918582b.tar.xz
testing/xterm: upgrade to 324
Diffstat (limited to 'testing')
-rw-r--r--testing/xterm/APKBUILD20
-rw-r--r--testing/xterm/musl-fixes.patch15
2 files changed, 8 insertions, 27 deletions
diff --git a/testing/xterm/APKBUILD b/testing/xterm/APKBUILD
index 276d41146f..1cdfe20228 100644
--- a/testing/xterm/APKBUILD
+++ b/testing/xterm/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer:
pkgname=xterm
-pkgver=323
+pkgver=324
pkgrel=0
pkgdesc="X Terminal Emulator"
url="http://invisible-island.net/xterm"
@@ -13,8 +13,7 @@ makedepends="libxaw-dev libxft-dev ncurses-dev"
install=""
subpackages="$pkgname-doc"
source="ftp://invisible-island.net/$pkgname/$pkgname-$pkgver.tgz
- posix-ptys.patch
- musl-fixes.patch"
+ posix-ptys.patch"
_builddir="$srcdir"/$pkgname-$pkgver
build() {
@@ -59,12 +58,9 @@ package() {
make DESTDIR="$pkgdir" install || return 1
}
-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"
+md5sums="7c325c29d67637cf7ff8e904a23c222e xterm-324.tgz
+9a6939a624949287671ca076f5b92543 posix-ptys.patch"
+sha256sums="70ecbec8d27789248e8ae2dc2cf159a2e189c152a6559a2b3df7f4838da36092 xterm-324.tgz
+c90d715cb7667ac91fd2697caaf1abce70e46ca0cf14eabf5e17dc305e3cb84c posix-ptys.patch"
+sha512sums="f6f2518a11eec6e41afb10ca4ec298c566b1fc5c3b3c4c4d533311b3f64ec04c2bc692798e75bbd34382cb64eca9b21ee4b05438c4d18486046d3c710c586626 xterm-324.tgz
+03722dc3ebe8067a1edf4673ce2e5132832e52818f4e122bfbd3846a4ebf0ca25bea999d98455b87ec572931becbbb0432e22c75b0fb5371a81c8acf0c4e9f98 posix-ptys.patch"
diff --git a/testing/xterm/musl-fixes.patch b/testing/xterm/musl-fixes.patch
deleted file mode 100644
index 8612a2158a..0000000000
--- a/testing/xterm/musl-fixes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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"),