summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/ap/vim/gvim.desktop119
-rwxr-xr-xsource/ap/vim/vim-gvim.SlackBuild9
-rwxr-xr-xsource/ap/vim/vim.SlackBuild12
-rw-r--r--source/k/kernel-configs/config-generic-4.19.2 (renamed from source/k/kernel-configs/config-generic-4.19.1)3
-rw-r--r--source/k/kernel-configs/config-generic-4.19.2.x64 (renamed from source/k/kernel-configs/config-generic-4.19.1.x64)3
-rw-r--r--source/k/kernel-configs/config-generic-smp-4.19.2-smp (renamed from source/k/kernel-configs/config-generic-smp-4.19.1-smp)3
-rw-r--r--source/k/kernel-configs/config-huge-4.19.2 (renamed from source/k/kernel-configs/config-huge-4.19.1)3
-rw-r--r--source/k/kernel-configs/config-huge-4.19.2.x64 (renamed from source/k/kernel-configs/config-huge-4.19.1.x64)3
-rw-r--r--source/k/kernel-configs/config-huge-smp-4.19.2-smp (renamed from source/k/kernel-configs/config-huge-smp-4.19.1-smp)3
-rwxr-xr-xsource/l/ncurses/aaa_terminfo.SlackBuild2
-rw-r--r--source/l/ncurses/linux-no-bce.diff11
-rwxr-xr-xsource/l/ncurses/ncurses.SlackBuild6
-rw-r--r--source/l/ncurses/terminfo/linux-bce.README4
-rw-r--r--source/l/ncurses/terminfo/linux-bce.terminfo32
14 files changed, 22 insertions, 191 deletions
diff --git a/source/ap/vim/gvim.desktop b/source/ap/vim/gvim.desktop
deleted file mode 100644
index 60a71d15..00000000
--- a/source/ap/vim/gvim.desktop
+++ /dev/null
@@ -1,119 +0,0 @@
-[Desktop Entry]
-Name=Vi IMproved
-Name[af]=Vi Verbeterde
-Name[ar]=في.أي المحسن
-Name[bn]=ভি-আই উন্নত
-Name[br]=Vi gwellaet
-Name[ca]=Vi millorat
-Name[cy]=VIM (Vi wedi'i wella)
-Name[da]=Vi IMproved (Vi forbedret)
-Name[eo]=VIM
-Name[fa]=Vi پیشرفت کرده VIM
-Name[hi]=वीआई इम्प्रूव्ड
-Name[hu]=VIM
-Name[is]=Vi endurbættur (vim)
-Name[it]=Vi iMproved
-Name[ko]=더 나은 Vi
-Name[mn]=Сайжирсан Vi
-Name[nso]=KAonafaditswe ka Vi
-Name[oc]=VI aMillorat
-Name[pl]=Poprawiony VI (vim)
-Name[pt_BR]=Vi melhorado
-Name[ru]=Улучшенный vi
-Name[rw]=Vi Ivuguruwe
-Name[sl]=Izboljšani vi (vim)
-Name[sv]=Förbättrad Vi
-Name[ta]=Vi மேம்படுத்தப்பட்ட
-Name[tg]=Vi пешрафт кардаи VIM
-Name[th]=VI IMprove
-Name[uz]=Яхшиланган Vi
-Name[ven]=Vi Khwinifhadzhwa
-Name[vi]=Vi Cải tiến
-Name[wa]=VIM
-Name[zh_CN]=改进的 VI (VIM)
-Name[zh_TW]=VIM
-Name[zu]=I-Vi yenziwe ngcono
-GenericName=Text Editor
-GenericName[af]=Teks Redigeerder
-GenericName[ar]=محرر نصوص
-GenericName[az]=Mətn Editoru
-GenericName[be]=Тэкставы рэдактар
-GenericName[bg]=Текстов редактор
-GenericName[bn]=টেক্সট সম্পাদক
-GenericName[br]=Aozer skrid
-GenericName[bs]=Tekst editor
-GenericName[ca]=Editor de text
-GenericName[cs]=Textový editor
-GenericName[cy]=Golygydd Testun
-GenericName[da]= Teksteditor
-GenericName[de]=Texteditor
-GenericName[el]=Επεξεργαστής κειμένου
-GenericName[eo]=Tekstredaktilo
-GenericName[es]=Editor de texto
-GenericName[et]=Tekstiredaktor
-GenericName[eu]=Testu editorea
-GenericName[fa]=ویرایشگر متن
-GenericName[fi]=Tekstieditori
-GenericName[fo]=Tekstritil
-GenericName[fr]=Éditeur de texte
-GenericName[fy]=Tekst Bewurker
-GenericName[ga]=Eagarthóir Téacs
-GenericName[gl]=Editor de Textos
-GenericName[he]=עורך טקסט
-GenericName[hi]=पाठ संपादक
-GenericName[hr]=Uređivač teksta
-GenericName[hsb]=Wobdźěłar tekstow
-GenericName[hu]=Szövegszerkesztő
-GenericName[is]=Textaritill
-GenericName[it]=Editor di testi
-GenericName[ja]=テキストエディタ
-GenericName[km]=កម្មវិធី​វាយ​អត្ថបទ
-GenericName[ko]=글월 편집기
-GenericName[lo]=ເຄື່ອງມືແກ້ໄຂຂໍ້ຄວາມ
-GenericName[lt]=Teksto rengyklė
-GenericName[lv]=Teksta Redaktors
-GenericName[mk]=Уредувач на текст
-GenericName[mn]=Текст боловсруулагч
-GenericName[ms]=Penyunting Teks
-GenericName[mt]=Editur tat-test
-GenericName[nb]=Skriveprogram
-GenericName[nds]=Texteditor
-GenericName[nl]=Teksteditor
-GenericName[nn]=Skriveprogram
-GenericName[nso]=Mofetosi wa Sengwalwana
-GenericName[pa]=ਪਾਠ ਸੰਪਾਦਕ
-GenericName[pl]=Edytor tekstu
-GenericName[pt]=Editor de Texto
-GenericName[pt_BR]=Editor de Texto
-GenericName[ro]=Editor de text
-GenericName[ru]=Текстовый редактор
-GenericName[rw]=Muhinduzi Umwandiko
-GenericName[se]=Čállinprográmma
-GenericName[sk]=Textový editor
-GenericName[sl]=Urejevalnik besedil
-GenericName[sr]=Уређивач текста
-GenericName[sr@Latn]=Uređivač teksta
-GenericName[ss]=Sihleli sembhalo
-GenericName[sv]=Texteditor
-GenericName[ta]=உரை தொகுப்பாளர்
-GenericName[tg]=Муҳаррири матн
-GenericName[th]=โปรแกรมแก้ไขข้อความ
-GenericName[tr]=Metin Düzenleyici
-GenericName[tt]=Mäten Tözätkeçe
-GenericName[uk]=Редактор текстів
-GenericName[uz]=Матн таҳрирчи
-GenericName[ven]=Musengulusi wa Manwalwa
-GenericName[vi]=Trình soạn văn bản
-GenericName[wa]=Aspougneu di tecse
-GenericName[xh]=Umhleli Wombhalo
-GenericName[zh_CN]=文本编辑器
-GenericName[zh_TW]=文字編輯器
-GenericName[zu]=Umlungisi wombhalo
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-Exec=gvim -f %f
-Icon=gvim
-Type=Application
-Terminal=false
-X-KDE-StartupNotify=true
-X-KDE-AuthorizeAction=shell_access
-Categories=Utility;TextEditor;
diff --git a/source/ap/vim/vim-gvim.SlackBuild b/source/ap/vim/vim-gvim.SlackBuild
index f990bdfa..8fdffc86 100755
--- a/source/ap/vim/vim-gvim.SlackBuild
+++ b/source/ap/vim/vim-gvim.SlackBuild
@@ -191,13 +191,8 @@ rm -r $PKG/vim/install
# Finally, reference purge:
rm -rf $PKG/vim
-# Perhaps we would be better off without this - forcing folks to run kappfinder
-# or something. It seems better than starting with nothing, but might force
-# people into defaults they don't want. Another nifty catch-22...
-mkdir -p $PKG/usr/share/applications
-cp -a $CWD/gvim.desktop $PKG/usr/share/applications
-mkdir -p $PKG/usr/share/pixmaps
-cp -a $CWD/gvim.png $PKG/usr/share/pixmaps
+# Get rid of the terminal-based vim.desktop file:
+rm -f $PKG/usr/share/applications/vim.desktop
# Remove empty directories:
find $PKG -type d -exec rmdir -p {} \; 2> /dev/null
diff --git a/source/ap/vim/vim.SlackBuild b/source/ap/vim/vim.SlackBuild
index f9a57901..b6b712bd 100755
--- a/source/ap/vim/vim.SlackBuild
+++ b/source/ap/vim/vim.SlackBuild
@@ -156,6 +156,18 @@ zcat $CWD/vim.vimrc.diff.gz | patch -p1 --verbose || exit 1
# Add patched vimrc to the package:
cat runtime/vimrc.new > $PKG/usr/share/vim/vimrc.new
+# Don't package gvim.desktop - it will be included in the vim-gvim package:
+rm -f $PKG/usr/share/applications/gvim.desktop
+
+# Move the vim.desktop into the docs directory. There's really not much use
+# for this .desktop file. It's easy enough to just open a terminal and run
+# vim in it without this.
+mkdir -p $PKG/usr/doc/vim-$VERSION
+mv $PKG/usr/share/applications/vim.desktop $PKG/usr/doc/vim-$VERSION
+
+# Remove empty directory:
+rmdir $PKG/usr/share/applications
+
# Fix manpage symlinks:
if [ -d $PKG/usr/man ]; then
( cd $PKG/usr/man
diff --git a/source/k/kernel-configs/config-generic-4.19.1 b/source/k/kernel-configs/config-generic-4.19.2
index 938f4db3..d34ff5bf 100644
--- a/source/k/kernel-configs/config-generic-4.19.1
+++ b/source/k/kernel-configs/config-generic-4.19.2
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.1 Kernel Configuration
+# Linux/x86 4.19.2 Kernel Configuration
#
#
@@ -7840,7 +7840,6 @@ CONFIG_CRYPTO_SEED=y
CONFIG_CRYPTO_SERPENT=y
CONFIG_CRYPTO_SERPENT_SSE2_586=m
CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SPECK=m
CONFIG_CRYPTO_TEA=y
CONFIG_CRYPTO_TWOFISH=y
CONFIG_CRYPTO_TWOFISH_COMMON=y
diff --git a/source/k/kernel-configs/config-generic-4.19.1.x64 b/source/k/kernel-configs/config-generic-4.19.2.x64
index 65292079..f1ef1540 100644
--- a/source/k/kernel-configs/config-generic-4.19.1.x64
+++ b/source/k/kernel-configs/config-generic-4.19.2.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.1 Kernel Configuration
+# Linux/x86 4.19.2 Kernel Configuration
#
#
@@ -7817,7 +7817,6 @@ CONFIG_CRYPTO_SERPENT_SSE2_X86_64=y
CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SPECK=m
CONFIG_CRYPTO_TEA=y
CONFIG_CRYPTO_TWOFISH=y
CONFIG_CRYPTO_TWOFISH_COMMON=y
diff --git a/source/k/kernel-configs/config-generic-smp-4.19.1-smp b/source/k/kernel-configs/config-generic-smp-4.19.2-smp
index 5d00957d..521ed20b 100644
--- a/source/k/kernel-configs/config-generic-smp-4.19.1-smp
+++ b/source/k/kernel-configs/config-generic-smp-4.19.2-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.1 Kernel Configuration
+# Linux/x86 4.19.2 Kernel Configuration
#
#
@@ -7895,7 +7895,6 @@ CONFIG_CRYPTO_SEED=y
CONFIG_CRYPTO_SERPENT=y
CONFIG_CRYPTO_SERPENT_SSE2_586=m
CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SPECK=m
CONFIG_CRYPTO_TEA=y
CONFIG_CRYPTO_TWOFISH=y
CONFIG_CRYPTO_TWOFISH_COMMON=y
diff --git a/source/k/kernel-configs/config-huge-4.19.1 b/source/k/kernel-configs/config-huge-4.19.2
index 2204e818..e02117e5 100644
--- a/source/k/kernel-configs/config-huge-4.19.1
+++ b/source/k/kernel-configs/config-huge-4.19.2
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.1 Kernel Configuration
+# Linux/x86 4.19.2 Kernel Configuration
#
#
@@ -7840,7 +7840,6 @@ CONFIG_CRYPTO_SEED=y
CONFIG_CRYPTO_SERPENT=y
CONFIG_CRYPTO_SERPENT_SSE2_586=m
CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SPECK=m
CONFIG_CRYPTO_TEA=y
CONFIG_CRYPTO_TWOFISH=y
CONFIG_CRYPTO_TWOFISH_COMMON=y
diff --git a/source/k/kernel-configs/config-huge-4.19.1.x64 b/source/k/kernel-configs/config-huge-4.19.2.x64
index a72dade4..6293522a 100644
--- a/source/k/kernel-configs/config-huge-4.19.1.x64
+++ b/source/k/kernel-configs/config-huge-4.19.2.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.1 Kernel Configuration
+# Linux/x86 4.19.2 Kernel Configuration
#
#
@@ -7817,7 +7817,6 @@ CONFIG_CRYPTO_SERPENT_SSE2_X86_64=y
CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SPECK=m
CONFIG_CRYPTO_TEA=y
CONFIG_CRYPTO_TWOFISH=y
CONFIG_CRYPTO_TWOFISH_COMMON=y
diff --git a/source/k/kernel-configs/config-huge-smp-4.19.1-smp b/source/k/kernel-configs/config-huge-smp-4.19.2-smp
index d4535f16..2ac204fe 100644
--- a/source/k/kernel-configs/config-huge-smp-4.19.1-smp
+++ b/source/k/kernel-configs/config-huge-smp-4.19.2-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.1 Kernel Configuration
+# Linux/x86 4.19.2 Kernel Configuration
#
#
@@ -7895,7 +7895,6 @@ CONFIG_CRYPTO_SEED=y
CONFIG_CRYPTO_SERPENT=y
CONFIG_CRYPTO_SERPENT_SSE2_586=m
CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SPECK=m
CONFIG_CRYPTO_TEA=y
CONFIG_CRYPTO_TWOFISH=y
CONFIG_CRYPTO_TWOFISH_COMMON=y
diff --git a/source/l/ncurses/aaa_terminfo.SlackBuild b/source/l/ncurses/aaa_terminfo.SlackBuild
index d32322ff..44ac1fc1 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 a490c263..00000000
--- 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 1eebb798..7c6542a3 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 8957a730..00000000
--- 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 82e5a890..00000000
--- 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,