summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2019-01-27 20:30:55 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2019-01-27 20:30:55 +0000
commit20ed702c35ad049d359ddb5a0407269c619ae884 (patch)
tree8992ff130c1895176bf25da3ba1a1ce1fed20389 /system
parent8179d35ff1daa7f0e079a13cba05b041515d489d (diff)
parent2cb0d9b4f32974ef48f8098d1ff692e813a62f15 (diff)
downloadpackages-20ed702c35ad049d359ddb5a0407269c619ae884.tar.gz
packages-20ed702c35ad049d359ddb5a0407269c619ae884.tar.bz2
packages-20ed702c35ad049d359ddb5a0407269c619ae884.tar.xz
packages-20ed702c35ad049d359ddb5a0407269c619ae884.zip
Merge branch 'bump.aerdan.20190127' into 'master'
Bump a bunch of software, holy crap See merge request !155
Diffstat (limited to 'system')
-rw-r--r--system/perl-json/APKBUILD4
-rw-r--r--system/perl-module-scandeps/APKBUILD4
-rw-r--r--system/perl-test-simple/APKBUILD4
-rw-r--r--system/vim/APKBUILD8
-rw-r--r--system/vim/no-default-mouse.patch16
-rw-r--r--system/vim/vimrc2
6 files changed, 27 insertions, 11 deletions
diff --git a/system/perl-json/APKBUILD b/system/perl-json/APKBUILD
index d2d7c2789..68819a602 100644
--- a/system/perl-json/APKBUILD
+++ b/system/perl-json/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-json
_pkgreal=JSON
-pkgver=2.97001
+pkgver=4.01
pkgrel=0
pkgdesc="Perl module implementing a JSON encoder/decoder"
url="https://metacpan.org/release/JSON"
@@ -32,4 +32,4 @@ package() {
find "$pkgdir" -name .packlist -delete
}
-sha512sums="42fe08c1d7b8f689592a28c17dd7853a90c4236e64a9be175a635af005da48e06c436e80dac905893e2232ca8efee3832f6ad51992fd4ca851f8f0fd796860df JSON-2.97001.tar.gz"
+sha512sums="95d38b994fc0452ad2a111cf640e0860f028039fa19c636b0c8facfd9a42851ec7f1917a2bef6a2b27d0990513329f6051ad7b85ecbe02b755200762c7331088 JSON-4.01.tar.gz"
diff --git a/system/perl-module-scandeps/APKBUILD b/system/perl-module-scandeps/APKBUILD
index 776899508..e94e31579 100644
--- a/system/perl-module-scandeps/APKBUILD
+++ b/system/perl-module-scandeps/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-module-scandeps
_pkgreal=Module-ScanDeps
-pkgver=1.26
+pkgver=1.27
pkgrel=0
pkgdesc="Recursively scan Perl code for dependencies"
url="https://metacpan.org/release/Module-ScanDeps"
@@ -42,4 +42,4 @@ check() {
make test
}
-sha512sums="b4b54813f55b82c20073ede9be90ab3680a636c3c8743ae03ccd0d7a26097f3d05b3e55d8b0d7d414e4156eaa686dc6eec0541ebe6c89a5c896dcd98845eb10f Module-ScanDeps-1.26.tar.gz"
+sha512sums="ab5625f497a9dc9133960c7c9a5867f27f6f0061fa954225cfc53fda39d9b657743ee66a7a96cc1485bba57532fc0447c3b245dd81cf6e6c39522fdd2e308411 Module-ScanDeps-1.27.tar.gz"
diff --git a/system/perl-test-simple/APKBUILD b/system/perl-test-simple/APKBUILD
index d9bcfd0cf..1462197f8 100644
--- a/system/perl-test-simple/APKBUILD
+++ b/system/perl-test-simple/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-test-simple
_pkgreal=Test-Simple
-pkgver=1.302156
+pkgver=1.302160
pkgrel=0
pkgdesc="Basic utilities for writing Perl tests"
url="https://metacpan.org/release/Test-Simple"
@@ -47,4 +47,4 @@ doc() {
replaces="perl-doc"
}
-sha512sums="a969ca9870a492167b92adce97c68b522f9af8a82b99bc98c1eff8fe7fda74be85a8d194836f5a1d25bd95bb34057c7e2de25ba0e0163e908ad6f1985c071376 Test-Simple-1.302156.tar.gz"
+sha512sums="3df744efbf5e2bf1b03849f35bec32f0b0546efbe968e38ed55a472d92f2b2f5a7cf63e82d6fda7ec2406c403c053a32285d29dcf21d28030a924bc751e16548 Test-Simple-1.302160.tar.gz"
diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD
index 7f62e86bd..13dff8ef9 100644
--- a/system/vim/APKBUILD
+++ b/system/vim/APKBUILD
@@ -4,7 +4,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
pkgname=vim
-pkgver=8.1.0712
+pkgver=8.1.0829
pkgrel=0
pkgdesc="advanced text editor"
url="http://www.vim.org"
@@ -17,6 +17,7 @@ makedepends_host="acl-dev ncurses-dev"
subpackages="$pkgname-doc ${pkgname}diff::noarch"
source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz
vimrc
+ no-default-mouse.patch
"
builddir="$srcdir/$pkgname-$pkgver"
@@ -80,5 +81,6 @@ vimdiff() {
mv "$pkgdir"/usr/bin/vimdiff "$subpkgdir"/usr/bin
}
-sha512sums="087d9d26898db718a0eb7a2bbaacfa87f4f907f2a89a21aff51688f5fd8a58284b075ba7f597c9c39f252e7b9aab8bc93f7bc9f2d67e486c17498be35443d10f vim-8.1.0712.tar.gz
-3a6c9bc187a6f45fd78e91dcc44d4d661c1ae1f2655e3a66bb36245ad1dc41e8d0e6061ec3aee6d323f96058b4a5501a87e3327e539cfd026f68cf81d455d721 vimrc"
+sha512sums="c5ae44a6ad45092abc1079b0543af3c34d49823a95f96bbb8dbe3f5426556ee9dbf78d2bda747286527977dafef7e6051a670d0095456263e853d424ddb2466c vim-8.1.0829.tar.gz
+12ee3f96c94d74215159fba379ed61907ec5982a9f1643575dcb7c3d5e30824665d683de95f97b5067718b3f2a1238fb7534a70803bc170614498ad026f352d8 vimrc
+16026a3ed3e080b3f8281948579ab678e9acd724ad594463279712fbf1024bcd923155a133bd08118848d2c6cdf11c69489d85b1c7438f60b4c279094714d181 no-default-mouse.patch"
diff --git a/system/vim/no-default-mouse.patch b/system/vim/no-default-mouse.patch
new file mode 100644
index 000000000..c34b9cae7
--- /dev/null
+++ b/system/vim/no-default-mouse.patch
@@ -0,0 +1,16 @@
+diff -Nurd vim-8.1.0712/runtime/defaults.vim vim-8.1.0712.new/runtime/defaults.vim
+--- vim-8.1.0712/runtime/defaults.vim 2019-01-09 16:02:43.000000000 -0600
++++ vim-8.1.0712.new/runtime/defaults.vim 2019-01-27 01:18:04.196123398 -0600
+@@ -73,12 +73,6 @@
+ " Revert with ":iunmap <C-U>".
+ inoremap <C-U> <C-G>u<C-U>
+
+-" In many terminal emulators the mouse works just fine. By enabling it you
+-" can position the cursor, Visually select and scroll with the mouse.
+-if has('mouse')
+- set mouse=a
+-endif
+-
+ " Switch syntax highlighting on when the terminal has colors or when using the
+ " GUI (which always has colors).
+ if &t_Co > 2 || has("gui_running")
diff --git a/system/vim/vimrc b/system/vim/vimrc
index 66b72282c..df08a4866 100644
--- a/system/vim/vimrc
+++ b/system/vim/vimrc
@@ -4,8 +4,6 @@ set ai " Always set auto-indenting on
set history=50 " keep 50 lines of command history
set ruler " Show the cursor position all the time
-set mouse="" " Use Vim 7 default of no mouse movements by default
-
" Don't use Ex mode, use Q for formatting
map Q gq