diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-04-23 09:18:18 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-04-23 09:55:44 +0000 |
| commit | 18639a94e1d9d1b6cb43fa11ff3df47517e0e64f (patch) | |
| tree | 42e9a3a5dff25d6d0ac55a8ffe5e35482be039c1 /main/vim | |
| parent | d188813d74dfea21266a5b7e9c248e48173fe8f7 (diff) | |
| download | aports-18639a94e1d9d1b6cb43fa11ff3df47517e0e64f.tar.bz2 aports-18639a94e1d9d1b6cb43fa11ff3df47517e0e64f.tar.xz | |
main/vim: upgrade to 7.4.712
Diffstat (limited to 'main/vim')
| -rw-r--r-- | main/vim/APKBUILD | 23 | ||||
| -rw-r--r-- | main/vim/vim-gcc47.patch | 13 |
2 files changed, 9 insertions, 27 deletions
diff --git a/main/vim/APKBUILD b/main/vim/APKBUILD index b227bff97..42f15cef7 100644 --- a/main/vim/APKBUILD +++ b/main/vim/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=vim -pkgver=7.4 +pkgver=7.4.712 _srcver=${pkgver%.*} _patchver=${pkgver##*.} -pkgrel=3 +pkgrel=0 pkgdesc="advanced text editor" url="http://www.vim.org" arch="all" @@ -11,17 +11,15 @@ license='GPL' depends= makedepends="ncurses-dev lua5.2-dev" subpackages="$pkgname-doc ${pkgname}diff" -#source="http://dev.alpinelinux.org/archive/vim/vim-$pkgver.tar.xz -source="ftp://ftp.vim.org/pub/vim/unix/vim-$pkgver.tar.bz2 - vim-gcc47.patch +# hg clone https://vim.googlecode.com/archive/v${pkgver//./-}.tar.gz +#source="vim-$pkgver.tar.gz::https://vim.googlecode.com/archive/v${pkgver//./-}.tar.gz +source="http://dev.alpinelinux.org/archive/vim/vim-$pkgver.tar.gz vimrc " -_builddir="$srcdir"/${pkgname}${pkgver/./} +_builddir="$srcdir"/vim-v${pkgver//./-} prepare() { cd "$_builddir" - patch -p0 -i "$srcdir"/vim-gcc47.patch || return 1 - # Read vimrc from /etc/vim echo '#define SYS_VIMRC_FILE "/etc/vim/vimrc"' >> src/feature.h } @@ -57,12 +55,9 @@ vimdiff() { mv "$pkgdir"/usr/bin/vimdiff "$subpkgdir"/usr/bin } -md5sums="607e135c559be642f210094ad023dc65 vim-7.4.tar.bz2 -a2e71b09d38921d43d2a552d4f0bd1aa vim-gcc47.patch +md5sums="ad8543cadbadb7f3a71d35296ce3612f vim-7.4.712.tar.gz 97aecde2ab504e543a96bec84b3b5638 vimrc" -sha256sums="d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade vim-7.4.tar.bz2 -9997f5a3c36e5b41008ac2d84165dda4d20124043cbc033d1d69e5d884fb4334 vim-gcc47.patch +sha256sums="7fe2a9cb24b258a725c5a95f052b62f341aac122aab1243a9a270eff722a37e3 vim-7.4.712.tar.gz 7ac7e5fd75fe315fd8b3ca4172056ebb9f06df0b5985d3ff88133dfcdd87076b vimrc" -sha512sums="65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e vim-7.4.tar.bz2 -a212404de5e4bf70bd584e3f46a22c3e246f206cf995c5771a020be9eb7b6bc71d422788b309eb677b2822df94266854704c29802f2f8e47cea6905d68833460 vim-gcc47.patch +sha512sums="db0e20b3b43ec4033aa057a2676d2a294d12139ecfa7be2403a54e2b0d869e5ba6a606f7dd964752c802129c6e95afee7da2e48f5605c7f64041aa8fb2354aa7 vim-7.4.712.tar.gz d9586b777881973cb5e48e18750336a522ed72c3127b2d6b6991e2b943468ca5b694476e7fa39ab469178c1375fc8f52627484e0fe377aea5811a513e35a7b02 vimrc" diff --git a/main/vim/vim-gcc47.patch b/main/vim/vim-gcc47.patch deleted file mode 100644 index 4d15c4e30..000000000 --- a/main/vim/vim-gcc47.patch +++ /dev/null @@ -1,13 +0,0 @@ -*** runtime/compiler/gcc.vim 2012-06-07 04:42:38.000000000 +0400 ---- runtime/compiler/gcc.vim 2012-06-20 18:30:57.298165106 +0400 -*************** -*** 16,21 **** ---- 16,23 ---- - \%*[^\"]\"%f\"%*\\D%l:\ %m, - \\"%f\"%*\\D%l:%c:\ %m, - \\"%f\"%*\\D%l:\ %m, -+ \%-G%f:%l:%c:\ note:\ each\ undeclared\ identifier\ is\ reported\ only\ once -+ \\ for\ each\ function\ it\ appears\ in, - \%-G%f:%l:\ %trror:\ (Each\ undeclared\ identifier\ is\ reported\ only\ once, - \%-G%f:%l:\ %trror:\ for\ each\ function\ it\ appears\ in.), - \%f:%l:%c:\ %trror:\ %m, |