diff options
| -rw-r--r-- | system/musl/APKBUILD | 10 | ||||
| -rw-r--r-- | system/musl/powerpc-wchar_t.patch | 26 | ||||
| -rw-r--r-- | system/musl/x87-math.patch | 157 | ||||
| -rw-r--r-- | system/zsh/APKBUILD | 4 | ||||
| -rw-r--r-- | system/zsh/skel | 2 | ||||
| -rw-r--r-- | user/lcov/APKBUILD | 27 | ||||
| -rw-r--r-- | user/os-prober/APKBUILD | 50 | ||||
| -rw-r--r-- | user/tmux/APKBUILD | 8 | ||||
| -rw-r--r-- | user/tmux/xterm-DECLRMM.patch | 23 |
9 files changed, 112 insertions, 195 deletions
diff --git a/system/musl/APKBUILD b/system/musl/APKBUILD index 5c95298d1..1cc77301b 100644 --- a/system/musl/APKBUILD +++ b/system/musl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=musl -pkgver=1.1.23 -pkgrel=2 +pkgver=1.1.24 +pkgrel=0 pkgdesc="System library (libc) implementation" url="https://www.musl-libc.org/" arch="all" @@ -26,9 +26,7 @@ source="https://www.musl-libc.org/releases/musl-$pkgver.tar.gz 3001-make-real-lastlog-h.patch handle-aux-at_base.patch fgetspent_r.patch - powerpc-wchar_t.patch strftime-add-l-support.patch - x87-math.patch ldconfig getent.c @@ -119,14 +117,12 @@ utils() { install -D -m755 "$srcdir"/ldconfig "$subpkgdir"/sbin } -sha512sums="a2278de9903852b08352d3e734a39d4616caa602496997ba843e8fea0e1c481761776745faf04536a149d1c4af416b68df681b6fbc9ae2de8794e18c2e853b09 musl-1.1.23.tar.gz +sha512sums="8987f1e194ea616f34f4f21fe9def28fb7f81d7060e38619206c6349f79db3bbb76bae8b711f5f9b8ed038799c9aea1a4cbec69e0bc4131e246203e133149e77 musl-1.1.24.tar.gz ef532aebeaa89b3274f7f75f1adaa4d1eea60f4e2822a6711c748768cc3a65a77ebd218d7a8ab41157684f7855dd4c5c2cdea7461b7569264d3517deba0ef9b2 amalgamation.patch 88ae443dbb8e0a4368235bdc3a1c5c7b718495afa75e06deb8e01becc76cb1f0d6964589e2204fc749c9c1b3190b8b9ac1ae2c0099cab8e2ce3ec877103d4332 3001-make-real-lastlog-h.patch 6a7ff16d95b5d1be77e0a0fbb245491817db192176496a57b22ab037637d97a185ea0b0d19da687da66c2a2f5578e4343d230f399d49fe377d8f008410974238 handle-aux-at_base.patch ded41235148930f8cf781538f7d63ecb0c65ea4e8ce792565f3649ee2523592a76b2a166785f0b145fc79f5852fd1fb1729a7a09110b3b8f85cba3912e790807 fgetspent_r.patch -fda015fad0d0a65efb192c08d201b2f5b2bfff18c43b551855b119a1d63213bd417a93a6b2965e68243884c5b17b34a585795cc4cace603788d37149e933cfb1 powerpc-wchar_t.patch 7ed6c620a5ea5585c323936b1ff01eb7f01a1192240706a0d0470b661a7a03ea10ed17507c59678aaedce51b7a5ea839c2f528f19f12de02119bf4e47f7c3998 strftime-add-l-support.patch -e3c98f64e901ac08a4a7dfbb7c46fb6ecc1cc7e825a8f4834b5a9dd1cafaa2e8ee1ccf6c55c7f07cc4ede9c54cd039e61dec41df6b973fac1ad42e7d3faa1932 x87-math.patch cb71d29a87f334c75ecbc911becde7be825ab30d8f39fa6d64cb53812a7c9abaf91d9804c72540e5be3ddd3c84cfe7fd9632274309005cb8bcdf9a9b09b4b923 ldconfig 378d70e65bcc65bb4e1415354cecfa54b0c1146dfb24474b69e418cdbf7ad730472cd09f6f103e1c99ba6c324c9560bccdf287f5889bbc3ef0bdf0e08da47413 getent.c 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf iconv.c" diff --git a/system/musl/powerpc-wchar_t.patch b/system/musl/powerpc-wchar_t.patch deleted file mode 100644 index 62b24a5f1..000000000 --- a/system/musl/powerpc-wchar_t.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0da9cc40f861293db7baba3854b44d73658b168d Mon Sep 17 00:00:00 2001 -From: q66 <daniel@octaforge.org> -Date: Wed, 22 May 2019 13:18:53 +0200 -Subject: [PATCH] properly deal with wchar_t definition on 32-bit powerpc - -Clang defines it to be int, gcc defines it to be long. The old -code results in conflicts when building things with clang. This -same change is already incorporated for i386 in musl upstream, -so apply it to powerpc as well. - -diff --git a/arch/powerpc/bits/alltypes.h.in b/arch/powerpc/bits/alltypes.h.in ---- a/arch/powerpc/bits/alltypes.h.in -+++ b/arch/powerpc/bits/alltypes.h.in -@@ -6,8 +6,12 @@ TYPEDEF __builtin_va_list va_list; - TYPEDEF __builtin_va_list __isoc_va_list; - - #ifndef __cplusplus -+#ifdef __WCHAR_TYPE__ -+TYPEDEF __WCHAR_TYPE__ wchar_t; -+#else - TYPEDEF long wchar_t; - #endif -+#endif - - TYPEDEF float float_t; - TYPEDEF double double_t; diff --git a/system/musl/x87-math.patch b/system/musl/x87-math.patch deleted file mode 100644 index d21be43b3..000000000 --- a/system/musl/x87-math.patch +++ /dev/null @@ -1,157 +0,0 @@ -diff --git a/src/math/i386/asin.s b/src/math/i386/asin.s -index a9f691bf..920d967a 100644 ---- a/src/math/i386/asin.s -+++ b/src/math/i386/asin.s -@@ -7,13 +7,10 @@ asinf: - cmp $0x01000000,%eax - jae 1f - # subnormal x, return x with underflow -- fnstsw %ax -- and $16,%ax -- jnz 2f - fld %st(0) - fmul %st(1) - fstps 4(%esp) --2: ret -+ ret - - .global asinl - .type asinl,@function -@@ -30,11 +27,8 @@ asin: - cmp $0x00200000,%eax - jae 1f - # subnormal x, return x with underflow -- fnstsw %ax -- and $16,%ax -- jnz 2f - fsts 4(%esp) --2: ret -+ ret - 1: fld %st(0) - fld1 - fsub %st(0),%st(1) -diff --git a/src/math/i386/atan.s b/src/math/i386/atan.s -index d73137b2..a26feae1 100644 ---- a/src/math/i386/atan.s -+++ b/src/math/i386/atan.s -@@ -10,8 +10,5 @@ atan: - fpatan - ret - # subnormal x, return x with underflow --1: fnstsw %ax -- and $16,%ax -- jnz 2f -- fsts 4(%esp) --2: ret -+1: fsts 4(%esp) -+ ret -diff --git a/src/math/i386/atan2.s b/src/math/i386/atan2.s -index a7d2979b..76b95f31 100644 ---- a/src/math/i386/atan2.s -+++ b/src/math/i386/atan2.s -@@ -10,8 +10,5 @@ atan2: - cmp $0x00200000,%eax - jae 1f - # subnormal x, return x with underflow -- fnstsw %ax -- and $16,%ax -- jnz 1f - fsts 4(%esp) - 1: ret -diff --git a/src/math/i386/atan2f.s b/src/math/i386/atan2f.s -index 14b88ce5..c9408a90 100644 ---- a/src/math/i386/atan2f.s -+++ b/src/math/i386/atan2f.s -@@ -10,9 +10,6 @@ atan2f: - cmp $0x01000000,%eax - jae 1f - # subnormal x, return x with underflow -- fnstsw %ax -- and $16,%ax -- jnz 1f - fld %st(0) - fmul %st(1) - fstps 4(%esp) -diff --git a/src/math/i386/atanf.s b/src/math/i386/atanf.s -index 8caddefa..893beac5 100644 ---- a/src/math/i386/atanf.s -+++ b/src/math/i386/atanf.s -@@ -10,10 +10,7 @@ atanf: - fpatan - ret - # subnormal x, return x with underflow --1: fnstsw %ax -- and $16,%ax -- jnz 2f -- fld %st(0) -+1: fld %st(0) - fmul %st(1) - fstps 4(%esp) --2: ret -+ ret -diff --git a/src/math/i386/exp.s b/src/math/i386/exp.s -index c7aa5b6e..df87c497 100644 ---- a/src/math/i386/exp.s -+++ b/src/math/i386/exp.s -@@ -7,13 +7,10 @@ expm1f: - cmp $0x01000000,%eax - jae 1f - # subnormal x, return x with underflow -- fnstsw %ax -- and $16,%ax -- jnz 2f - fld %st(0) - fmul %st(1) - fstps 4(%esp) --2: ret -+ ret - - .global expm1l - .type expm1l,@function -@@ -30,11 +27,8 @@ expm1: - cmp $0x00200000,%eax - jae 1f - # subnormal x, return x with underflow -- fnstsw %ax -- and $16,%ax -- jnz 2f - fsts 4(%esp) --2: ret -+ ret - 1: fldl2e - fmulp - mov $0xc2820000,%eax -diff --git a/src/math/i386/log1p.s b/src/math/i386/log1p.s -index 6b6929c7..354f391a 100644 ---- a/src/math/i386/log1p.s -+++ b/src/math/i386/log1p.s -@@ -16,9 +16,6 @@ log1p: - fyl2x - ret - # subnormal x, return x with underflow --2: fnstsw %ax -- and $16,%ax -- jnz 1f -- fsts 4(%esp) -+2: fsts 4(%esp) - fstp %st(1) --1: ret -+ ret -diff --git a/src/math/i386/log1pf.s b/src/math/i386/log1pf.s -index c0bcd30f..4d3484cd 100644 ---- a/src/math/i386/log1pf.s -+++ b/src/math/i386/log1pf.s -@@ -16,10 +16,7 @@ log1pf: - fyl2x - ret - # subnormal x, return x with underflow --2: fnstsw %ax -- and $16,%ax -- jnz 1f -- fxch -+2: fxch - fmul %st(1) - fstps 4(%esp) --1: ret -+ ret - diff --git a/system/zsh/APKBUILD b/system/zsh/APKBUILD index 695a26a1d..a85083fc4 100644 --- a/system/zsh/APKBUILD +++ b/system/zsh/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=zsh pkgver=5.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="A very advanced and programmable command interpreter (shell)" url="https://www.zsh.org/" arch="all" @@ -178,6 +178,6 @@ _submv() { } sha512sums="a6aa88e1955a80229a4784a128866e325f79a8b5f73c922ab480048411036f1835cbb31daa30ab38bd16ab2a50040eda8f4f1f64704b21b6acc3051b1dbf18d0 zsh-5.7.1.tar.xz -7d46b958a3402214a1982a4fbb71b9916b385e295593202e2cc4893f278b4faec6950c02b9924551687e3f6e53c727d5b6f2a8d39bc0e7abe33bedc0110f96ac skel +d820fcf65bb3c52f23e968110b5df1188fc0b64079312f64d22ffe35de3b4f3055d4d629b3b0f97a1bfaddf62dbc80676af31c3a1a79645632082abfc854cf97 skel e90723eb790581419498f3ab86fb5d6cab4aaede8c87eb79ead7047d259b643cfb47f4d1beb06d03e038cfda3a20ef9dd4c1b417270ab55c688e166fe30ef4f6 zprofile 1675e016f97333cad89b587f4292d81b6bc10e27b75482e3e0c3808539c95bd49b907b6579fb98d817f77f2f2384c0df5afa3e2b6f43b6ae9b466925cd9ccffc zshrc" diff --git a/system/zsh/skel b/system/zsh/skel index e3ddddf99..92bd52b7b 100644 --- a/system/zsh/skel +++ b/system/zsh/skel @@ -1,4 +1,6 @@ # Lines configured by zsh-newuser-install HISTFILE=~/.histfile +HISTSIZE=1000 +SAVEHIST=1000 setopt appendhistory extendedglob # End of lines configured by zsh-newuser-install diff --git a/user/lcov/APKBUILD b/user/lcov/APKBUILD new file mode 100644 index 000000000..94bc30eb5 --- /dev/null +++ b/user/lcov/APKBUILD @@ -0,0 +1,27 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=lcov +pkgver=1.14 +pkgrel=0 +pkgdesc="Graphical frontend for GCC GCov" +url="http://ltp.sourceforge.net/coverage/lcov.php" +arch="noarch" +license="GPL-2.0+" +depends="perl" +makedepends="" +subpackages="$pkgname-doc" +source="https://downloads.sourceforge.net/ltp/lcov-$pkgver.tar.gz" + +build() { + make +} + +check() { + make test +} + +package() { + GIT_DIR= make PREFIX=/usr DESTDIR="$pkgdir" install +} + +sha512sums="2d60c3a63e300dda96171c432fe304840acc76bf6275f60934d08e80765f9f85671e8b77bfed758fc45842a80156586dc0d67c42c9f215f4f163840fc5cf65bc lcov-1.14.tar.gz" diff --git a/user/os-prober/APKBUILD b/user/os-prober/APKBUILD new file mode 100644 index 000000000..65ff5061b --- /dev/null +++ b/user/os-prober/APKBUILD @@ -0,0 +1,50 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=os-prober +pkgver=1.77 +pkgrel=0 +pkgdesc="Utility to detect operating systems on hard drives" +url="http://joeyh.name/code/os-prober/" +arch="all" +options="!check" # No test suite. +license="GPL-2.0+ AND GPL-1.0+" +depends="/bin/sh" +makedepends="" +subpackages="" +source="http://deb.debian.org/debian/pool/main/o/os-prober/os-prober_$pkgver.tar.xz" + +build() { + make +} + +package() { + case $CTARGET_ARCH in + i486|i586|pmmx|x86*) + PROBE_ARCH=x86;; + ppc*) + PROBE_ARCH=powerpc;; + sparc*) + PROBE_ARCH=sparc;; + *) + PROBE_ARCH=$CTARGET_ARCH;; + esac + for probes in os-probes os-probes/mounted os-probes/init \ + linux-boot-probes linux-boot-probes/mounted; do + mkdir -p "$pkgdir/usr/lib/$probes" + for file in $probes/common/*; do + install -Dm644 $file "$pkgdir/usr/lib/$probes" + done + if [ -e "$probes/${PROBE_ARCH}" ]; then + install -Dm644 $probes/${PROBE_ARCH}/* \ + "$pkgdir/usr/lib/$probes" + fi + done + mkdir -p "$pkgdir"/usr/lib/os-prober "$pkgdir"/usr/bin + mkdir -p "$pkgdir"/usr/share/os-prober + install -Dm755 newns "$pkgdir"/usr/lib/os-prober/ + install -Dm755 os-prober "$pkgdir"/usr/bin/ + install -Dm755 linux-boot-prober "$pkgdir"/usr/bin/ + install -Dm644 common.sh "$pkgdir"/usr/share/os-prober/ +} + +sha512sums="4d9c22ccc4d950644a06a17ec4424aca5ff82aeb20052dc389dd451b6b9a1799c5a9438644a29093153730af42066abbbbb78f593f2564314c9adbd43f60e39b os-prober_1.77.tar.xz" diff --git a/user/tmux/APKBUILD b/user/tmux/APKBUILD index 12caf643d..eed2ea5e2 100644 --- a/user/tmux/APKBUILD +++ b/user/tmux/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=tmux pkgver=2.9a -pkgrel=0 +pkgrel=1 pkgdesc="Tool to control multiple terminals from a single terminal" url="https://tmux.github.io/" arch="all" @@ -10,7 +10,8 @@ license="MIT" depends="ncurses-terminfo" makedepends="bsd-compat-headers libevent-dev libutempter-dev ncurses-dev" subpackages="$pkgname-doc" -source="https://github.com/tmux/tmux/releases/download/$pkgver/$pkgname-$pkgver.tar.gz" +source="https://github.com/tmux/tmux/releases/download/$pkgver/$pkgname-$pkgver.tar.gz + xterm-DECLRMM.patch" build() { ./configure \ @@ -37,4 +38,5 @@ package() { done } -sha512sums="aca6882688727c10c5647443fdd18bbd6c0f80b7a3bf9667903d1b89d523e604cd715f176f33f2e5673258f00e626a6dc273f80fe97ae4f91621814d89985713 tmux-2.9a.tar.gz" +sha512sums="aca6882688727c10c5647443fdd18bbd6c0f80b7a3bf9667903d1b89d523e604cd715f176f33f2e5673258f00e626a6dc273f80fe97ae4f91621814d89985713 tmux-2.9a.tar.gz +7fb006f8f24d60614fcaeadace933c2ad6674d2476980736a830f63a40d7110638942478322336849d47707c99ab7de0cb01ff39806a4c9144650daf2f666773 xterm-DECLRMM.patch" diff --git a/user/tmux/xterm-DECLRMM.patch b/user/tmux/xterm-DECLRMM.patch new file mode 100644 index 000000000..b9bef3455 --- /dev/null +++ b/user/tmux/xterm-DECLRMM.patch @@ -0,0 +1,23 @@ +From 26f274011096b9eacfd2753d8f7afcb63e796ab9 Mon Sep 17 00:00:00 2001 +From: nicm <nicm> +Date: Thu, 1 Aug 2019 11:45:34 +0000 +Subject: [PATCH] xterm 348 now disables margins when resized, so send DECLRMM + again. + +--- + tty.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tty.c b/tty.c +index ab1da9fd3..024aef271 100644 +--- a/tty.c ++++ b/tty.c +@@ -1879,6 +1879,8 @@ tty_invalidate(struct tty *tty) + tty->rlower = tty->rright = UINT_MAX; + + if (tty->flags & TTY_STARTED) { ++ if (tty_use_margin(tty)) ++ tty_puts(tty, "\033[?69h"); /* DECLRMM */ + tty_putcode(tty, TTYC_SGR0); + + tty->mode = ALL_MODES; |