wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-07 23:53:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vim: update to 8.1.1578.

Browse source 
Fixed the files conflict between gvim and gvim-huge.

Close #12609
This commit is contained in:
Juan RP 2019-06-21 20:24:39 +02:00
parent 16107b8ada
commit ad20ae9b64
No known key found for this signature in database
GPG key ID: AF19F6CB482F9368
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
srcpkgs/vim/template
View file

@ -1,6 +1,6 @@
# Template file for 'vim' # Template file for 'vim'
pkgname=vim pkgname=vim
version=8.1.1551 version=8.1.1578
revision=1 revision=1
hostmakedepends="glib-devel pkg-config" hostmakedepends="glib-devel pkg-config"
makedepends="acl-devel gtk+-devel libXt-devel lua-devel ncurses-devel makedepends="acl-devel gtk+-devel libXt-devel lua-devel ncurses-devel
@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@voidlinux.org>"
license="Vim" license="Vim"
homepage="https://www.vim.org" homepage="https://www.vim.org"
distfiles="https://github.com/vim/vim/archive/v${version}.tar.gz" distfiles="https://github.com/vim/vim/archive/v${version}.tar.gz"
checksum=e9de8d1efaff3f7b43de27f4bc017313cd249aa73c310b7fce55d64ad36ff309 checksum=cd9ce1a1b661c344b3b87e382ac60357a938e7e389537481afe127714634e32d
subpackages="xxd vim-common vim-x11 gvim" subpackages="xxd vim-common vim-x11 gvim"
# XXX vim-huge cannot be cross compiled for now. # XXX vim-huge cannot be cross compiled for now.
@ -104,6 +104,14 @@ do_install() {
cd ${DESTDIR}/usr/bin cd ${DESTDIR}/usr/bin
ln -sf vim vim-ex ln -sf vim vim-ex
rm -f ${DESTDIR}/usr/bin/{ex,view} rm -f ${DESTDIR}/usr/bin/{ex,view}
# install gvim icons
cd ${wrksrc}/gvim
sed -i "s|/locolor|/hicolor|g" src/Makefile
for d in 16 32 48; do
vmkdir usr/share/icons/hicolor/${d}x${d}/apps
done
make -C src DESTDIR=${DESTDIR} install-icons
} }
vim-common_package() { vim-common_package() {
@ -119,6 +127,7 @@ vim-common_package() {
vi:view.1:/usr/share/man/man1/vim.1 vi:view.1:/usr/share/man/man1/vim.1
" "
pkg_install() { pkg_install() {
vmove usr/share/icons
vmove usr/bin/rvim vmove usr/bin/rvim
vmove usr/bin/vim-ex vmove usr/bin/vim-ex
vmove usr/bin/vimdiff vmove usr/bin/vimdiff
@ -146,13 +155,7 @@ gvim_package() {
alternatives="vim:vim:/usr/bin/gvim" alternatives="vim:vim:/usr/bin/gvim"
pkg_install() { pkg_install() {
cd $wrksrc/gvim cd $wrksrc/gvim
sed -i "s|/locolor|/hicolor|g" src/Makefile make -C src DESTDIR=${PKGDESTDIR} installvimbin
for d in 16 32 48; do
install -d ${PKGDESTDIR}/usr/share/icons/hicolor/${d}x${d}/apps
done
make -C src DESTDIR=${PKGDESTDIR} installvimbin install-icons
vmove usr/share/applications/gvim.desktop
rm "$PKGDESTDIR"/usr/share/applications/vim.desktop
} }
} }
gvim-huge_package() { gvim-huge_package() {
@ -162,12 +165,7 @@ gvim-huge_package() {
alternatives="vim:vim:/usr/bin/gvim-huge" alternatives="vim:vim:/usr/bin/gvim-huge"
pkg_install() { pkg_install() {
cd $wrksrc/gvim-huge cd $wrksrc/gvim-huge
sed -i "s|/locolor|/hicolor|g" src/Makefile make -C src DESTDIR=${PKGDESTDIR} installvimbin
for d in 16 32 48; do
install -d ${PKGDESTDIR}/usr/share/icons/hicolor/${d}x${d}/apps
done
make -C src DESTDIR=${PKGDESTDIR} installvimbin install-icons
vmove usr/share/applications/*.desktop
} }
} }
vim-huge_package() { vim-huge_package() {