diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2020-04-22 11:06:18 +0200 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2020-04-22 14:16:44 +0200 |
| commit | 35c433af44eb2c1bafe6dc285bfcf32125294ee1 (patch) | |
| tree | 991e3a0f17722796fd6df0d671a504dadffc4969 /community/drawterm | |
| parent | 6445e223938c6a6930217459c4c1f0809049f927 (diff) | |
| download | aports-35c433af44eb2c1bafe6dc285bfcf32125294ee1.tar.bz2 aports-35c433af44eb2c1bafe6dc285bfcf32125294ee1.tar.xz | |
community/drawterm: upgrade to 0_hg20200421
* Change version number scheme
* Remove fix-mips-build.patch as build is disabled on mips anyhow
Diffstat (limited to 'community/drawterm')
| -rw-r--r-- | community/drawterm/APKBUILD | 12 | ||||
| -rw-r--r-- | community/drawterm/fix-mips-build.patch | 37 | ||||
| -rw-r--r-- | community/drawterm/fix-off-by-one.patch | 14 |
3 files changed, 4 insertions, 59 deletions
diff --git a/community/drawterm/APKBUILD b/community/drawterm/APKBUILD index e52cd30b97..5bafd6a35f 100644 --- a/community/drawterm/APKBUILD +++ b/community/drawterm/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net> pkgname=drawterm -pkgver=20170119 -pkgrel=2 +pkgver=0_hg20200421 +pkgrel=0 pkgdesc="Connect to Plan 9 CPU servers from other operating systems" url="http://drawterm.9front.org/" arch="all !armhf !armv7 !aarch64 !s390x !mips !mips64" @@ -13,12 +13,10 @@ makedepends="linux-headers libx11-dev libxt-dev" install="" subpackages="$pkgname-dbg" source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.gz - fix-mips-build.patch - fix-off-by-one.patch respect-env.patch" _srcurl="https://code.9front.org/hg/$pkgname" -_srcrev="169f32a871c9" +_srcrev="62a48ddc800d" builddir="$srcdir"/$pkgname-$pkgver @@ -60,7 +58,5 @@ package() { "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } -sha512sums="fec2895bd01940cd91ed6c4b73fd13ec6a55c5a5b2241f48430a73af44e6e4c649819a2ee9feee1880d4bf27ab007a229c6b5170039b73f1f19f8b0e6d04c510 drawterm-20170119.tar.gz -45f4fa7dbc509748c06e292641bd4e30ec097c1e1d81bbf6f43e0d8c6b93a14a1f51cf683f2aba4a5945306d822bcf26ce39129169158217eca205015fed7967 fix-mips-build.patch -dc57264470e2ab583c7dfbb6451b9fcea47e37a24bdeb7e512ab50a0321f086b471dbe08b2d13514c7842e084f5fdf078f917a19e62bd6aaceb2e199e8169374 fix-off-by-one.patch +sha512sums="4fe571e9b4eee2965eef5bfa319767632ece6c8629b7068e6fbfee0bff8be5e6437be07c502042b2b2162e52f810f96cfd2014c84387764acb2306785e04b1a5 drawterm-0_hg20200421.tar.gz be42c27a550b49f13fa26cdd698fb4d8387d989141cae1a3671deceb82b9286c9f73772ec9731698c7ecef69949381f9eda8af1dc1d9957fa373752e52f809bb respect-env.patch" diff --git a/community/drawterm/fix-mips-build.patch b/community/drawterm/fix-mips-build.patch deleted file mode 100644 index 8efd801626..0000000000 --- a/community/drawterm/fix-mips-build.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/posix-mips/Makefile -+++ b/posix-mips/Makefile -@@ -15,4 +15,4 @@ - - tas.$O: tas.s - ln -sf tas.s tas.S -- $(CC) -c -o tas.$O -mips3 tas.S -+ $(CC) -c -o tas.$O tas.S ---- a/posix-mips/tas.s -+++ b/posix-mips/tas.s -@@ -1,19 +1,17 @@ --#include <machine/regdef.h> -- - .globl tas - .ent tas 2 - - tas: - .set noreorder - 1: -- ori t1, zero, 12345 /* t1 = 12345 */ -- ll t0, (a0) /* t0 = *a0 */ -- sc t1, (a0) /* *a0 = t1 if *a0 hasn't changed; t1=success */ -- beq t1, zero, 1b /* repeat if *a0 did change */ -- nop -+ li $t1, 12345 /* t1 = 12345 */ -+ ll $t0, ($a0) /* t0 = *a0 */ -+ sc $t1, ($a0) /* *a0 = t1 if *a0 hasn't changed; t1=success */ -+ beqz $t1, 1b /* repeat if *a0 did change */ -+ nop - -- j $31 /* return */ -- or v0, t0, zero /* set return value on way out */ -+ jr $ra /* return */ -+ move $v0, $t0 /* set return value on way out */ - - .set reorder - .end tas diff --git a/community/drawterm/fix-off-by-one.patch b/community/drawterm/fix-off-by-one.patch deleted file mode 100644 index a1b6d5dc33..0000000000 --- a/community/drawterm/fix-off-by-one.patch +++ /dev/null @@ -1,14 +0,0 @@ -upstream url: https://code.9front.org/hg/drawterm/rev/fbf56ef73faf - -diff -upr drawterm-20170119.orig/kern/devmouse.c drawterm-20170119/kern/devmouse.c ---- drawterm-20170119.orig/kern/devmouse.c 2017-01-30 09:18:21.250082979 +0100 -+++ drawterm-20170119/kern/devmouse.c 2017-01-30 09:18:40.093373597 +0100 -@@ -122,7 +122,7 @@ mouseclose(Chan *c) - long - mouseread(Chan *c, void *va, long n, vlong offset) - { -- char buf[4*12+1]; -+ char buf[1+4*12+1]; - Mousestate m; - uchar *p; - int b; |