summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2020-01-30 03:23:46 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2020-01-30 03:23:46 +0000
commitb1a0c8423a302218357011639d1f47cf23dc4e50 (patch)
treed47c66bb9a5ecdb7688f47d2f4dc8917c6b42353 /system
parentc79bb2413a81f20ce59fe5051c18ae4b2bfa75b0 (diff)
parentb4b33230209fc5c7c1936f8491a3b402574ae9a2 (diff)
downloadpackages-b1a0c8423a302218357011639d1f47cf23dc4e50.tar.gz
packages-b1a0c8423a302218357011639d1f47cf23dc4e50.tar.bz2
packages-b1a0c8423a302218357011639d1f47cf23dc4e50.tar.xz
packages-b1a0c8423a302218357011639d1f47cf23dc4e50.zip
Merge branch 'bumps.aerdan.20200123' into 'master'
Bumps.aerdan.20200123 See merge request adelie/packages!396
Diffstat (limited to 'system')
-rw-r--r--system/file/APKBUILD4
-rw-r--r--system/vim/APKBUILD8
2 files changed, 7 insertions, 5 deletions
diff --git a/system/file/APKBUILD b/system/file/APKBUILD
index 0e093ec4b..57cf3346b 100644
--- a/system/file/APKBUILD
+++ b/system/file/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=file
-pkgver=5.37
+pkgver=5.38
pkgrel=0
pkgdesc="File type identification utility"
url="http://www.darwinsys.com/file/"
@@ -41,4 +41,4 @@ libmagic() {
mv "$pkgdir"/usr/lib "$pkgdir"/usr/share "$subpkgdir"/usr
}
-sha512sums="9b6ae3dd910a03d2161c91ebc75ac91eb7dbd279563462b77daf902d9ae9f0a70de12c37a498b20c6357d6594059d01841bfd104592107b65c08d8343fca19d2 file-5.37.tar.gz"
+sha512sums="b8920b0b886600b50ef83d949028972e99830d5ac2e9545a5ff7177e5f4c3db20bfc00884d6b6961e4707a920f0290c59ae89439a02cd8cc2a8673284c4100c4 file-5.38.tar.gz"
diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD
index 80698a759..41a9c5100 100644
--- a/system/vim/APKBUILD
+++ b/system/vim/APKBUILD
@@ -4,7 +4,9 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=vim
-pkgver=8.1.2311
+pkgver=8.2.0177
+_pkgver=${pkgver%.*.*}${pkgver#*.}
+_pkgver=${_pkgver%.*}
pkgrel=0
pkgdesc="advanced text editor"
url="https://www.vim.org"
@@ -65,7 +67,7 @@ package() {
# the following properly belong to gvim.
rm -r "$pkgdir"/usr/share/applications
- rm "$pkgdir"/usr/share/vim/vim81/gvimrc_example.vim
+ rm "$pkgdir"/usr/share/vim/vim$_pkgver/gvimrc_example.vim
rm -r "$pkgdir"/usr/share/icons
}
@@ -77,5 +79,5 @@ vimdiff() {
mv "$pkgdir"/usr/bin/vimdiff "$subpkgdir"/usr/bin
}
-sha512sums="2784acb4ac45ae5b653beaf3907d769e7acfa1c8a8f3acce3152c01d7f6672e9c175c8805da3b64302f779b64100e937bdf67709018595f6f63f40ec14e017d5 vim-8.1.2311.tar.gz
+sha512sums="c404d36a1b3ed2500d5ac02ca3e052689f3cdcc51fe71f583f89190ca5f06972595e83fb6f559ba7a1125f065bf4ea109555e0d76d8143d3da5ff2ec05dd7533 vim-8.2.0177.tar.gz
12ee3f96c94d74215159fba379ed61907ec5982a9f1643575dcb7c3d5e30824665d683de95f97b5067718b3f2a1238fb7534a70803bc170614498ad026f352d8 vimrc"