From e10adef4c2a06f02cd4970f0f6459c27e840f772 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Wed, 14 Nov 2018 00:00:07 +0000 Subject: Wed Nov 14 00:00:07 UTC 2018 a/aaa_terminfo-6.1_20181110-x86_64-1.txz: Upgraded. a/kernel-generic-4.19.2-x86_64-1.txz: Upgraded. a/kernel-huge-4.19.2-x86_64-1.txz: Upgraded. a/kernel-modules-4.19.2-x86_64-1.txz: Upgraded. ap/vim-8.1.0526-x86_64-1.txz: Upgraded. Don't package .desktop files for the base vim package. Move the terminal-based vim.desktop (menu clutter) into the docs directory. d/kernel-headers-4.19.2-x86-1.txz: Upgraded. k/kernel-source-4.19.2-noarch-1.txz: Upgraded. l/librsvg-2.44.9-x86_64-1.txz: Upgraded. l/ncurses-6.1_20181110-x86_64-1.txz: Upgraded. The new kernel fixes the artifact on the virtual console, so the original linux terminal definition has been restored. xap/vim-gvim-8.1.0526-x86_64-1.txz: Upgraded. Let vim install its own icon and gvim.desktop files. Thanks to drumz. Don't include the terminal-based vim.desktop file. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt. --- source/l/ncurses/aaa_terminfo.SlackBuild | 2 +- source/l/ncurses/linux-no-bce.diff | 11 ---------- source/l/ncurses/ncurses.SlackBuild | 6 +----- source/l/ncurses/terminfo/linux-bce.README | 4 ---- source/l/ncurses/terminfo/linux-bce.terminfo | 32 ---------------------------- 5 files changed, 2 insertions(+), 53 deletions(-) delete mode 100644 source/l/ncurses/linux-no-bce.diff delete mode 100644 source/l/ncurses/terminfo/linux-bce.README delete mode 100644 source/l/ncurses/terminfo/linux-bce.terminfo (limited to 'source/l/ncurses') diff --git a/source/l/ncurses/aaa_terminfo.SlackBuild b/source/l/ncurses/aaa_terminfo.SlackBuild index d32322ffc..44ac1fc13 100755 --- a/source/l/ncurses/aaa_terminfo.SlackBuild +++ b/source/l/ncurses/aaa_terminfo.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=aaa_terminfo # Note the version of ncurses in use: VERSION=${VERSION:-$(PRINT_PACKAGE_NAME=yes ./ncurses.SlackBuild | cut -f 2 -d -)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} diff --git a/source/l/ncurses/linux-no-bce.diff b/source/l/ncurses/linux-no-bce.diff deleted file mode 100644 index a490c2635..000000000 --- a/source/l/ncurses/linux-no-bce.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./misc/terminfo.src.orig 2018-10-27 18:10:56.000000000 -0500 -+++ ./misc/terminfo.src 2018-11-06 18:51:34.708372527 -0600 -@@ -941,7 +941,7 @@ - # themselves; this entry assumes that capability. - # - linux-basic|linux console, -- am, bce, eo, mir, msgr, xenl, xon, -+ am, eo, mir, msgr, xenl, xon, - it#8, ncv#18, U8#1, - acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i - \316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u diff --git a/source/l/ncurses/ncurses.SlackBuild b/source/l/ncurses/ncurses.SlackBuild index 1eebb7987..7c6542a34 100755 --- a/source/l/ncurses/ncurses.SlackBuild +++ b/source/l/ncurses/ncurses.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ncurses VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -f 2- -d - | cut -f 1,2 -d .)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -118,10 +118,6 @@ chown -R root:root . zcat $CWD/ncurses.mkhashsize.diff.gz | patch -p1 --verbose || exit 1 -# BCE is broken with 4.19.0 and 4.19.1 kernels. Revert this ASAP, but use it -# for now to paper over the problem: -zcat $CWD/linux-no-bce.diff.gz | patch -p1 --verbose || exit 1 - # Configure/build/install to package the standard ncurses libraries: ncurses_configure || exit 1 make $NUMJOBS || exit 1 diff --git a/source/l/ncurses/terminfo/linux-bce.README b/source/l/ncurses/terminfo/linux-bce.README deleted file mode 100644 index 8957a730c..000000000 --- a/source/l/ncurses/terminfo/linux-bce.README +++ /dev/null @@ -1,4 +0,0 @@ -This is the original linux console definition with the BCE feature active. -BCE is broken so far in the 4.19.x kernels, but we're keeping this handy for -use with TERM=linux-bce so that we can easily test to see if the kernel has -been fixed. diff --git a/source/l/ncurses/terminfo/linux-bce.terminfo b/source/l/ncurses/terminfo/linux-bce.terminfo deleted file mode 100644 index 82e5a8905..000000000 --- a/source/l/ncurses/terminfo/linux-bce.terminfo +++ /dev/null @@ -1,32 +0,0 @@ -linux-bce|linux console with BCE feature, - am, bce, ccc, eo, mir, msgr, xenl, xon, - colors#8, it#8, ncv#18, pairs#64, - acsc=++\,\,--..00__``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}c~~, - bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l\E[?1c, - clear=\E[H\E[J, cnorm=\E[?25h\E[?0c, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - cvvis=\E[?25h\E[?8c, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, - dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, - el1=\E[1K, enacs=\E)0, flash=\E[?5h$<200/>\E[?5l, - home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, - ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n, - initc=\E]P%p1%x%p2%{255}%*%{1000}%/%02x%p3%{255}%*%{1000}%/%02x%p4%{255}%*%{1000}%/%02x, - kb2=\E[G, kbs=^?, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, - kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, kend=\E[4~, kf1=\E[[A, - kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, - kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, - kf18=\E[32~, kf19=\E[33~, kf2=\E[[B, kf20=\E[34~, - kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, - kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kich1=\E[2~, - kmous=\E[M, knp=\E[6~, kpp=\E[5~, kspd=^Z, nel=\r\n, oc=\E]R, - op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, - rmam=\E[?7l, rmir=\E[4l, rmpch=\E[10m, rmso=\E[27m, - rmul=\E[24m, rs1=\Ec\E]R, sc=\E7, setab=\E[4%p1%dm, - setaf=\E[3%p1%dm, - sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;m%?%p9%t\016%e\017%;, - sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h, - smpch=\E[11m, smso=\E[7m, smul=\E[4m, tbc=\E[3g, - u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?6c, u9=\E[c, - vpa=\E[%i%p1%dd, -- cgit v1.2.3