wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-04-22 17:17:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vim: fixed the file conflicts properly.

Browse source
This commit is contained in:
Juan RP 2019-06-21 20:48:14 +02:00
parent ceab3addab
commit e022fa1045
No known key found for this signature in database
GPG key ID: AF19F6CB482F9368
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
srcpkgs/vim/template
View file

@ -112,6 +112,7 @@ do_install() {
vmkdir usr/share/icons/hicolor/${d}x${d}/apps
done
make -C src DESTDIR=${DESTDIR} install-icons
rm -rf $DESTDIR/usr/share/applications
}
vim-common_package() {
@ -155,7 +156,9 @@ gvim_package() {
alternatives="vim:vim:/usr/bin/gvim"
pkg_install() {
cd $wrksrc/gvim
make -C src DESTDIR=${PKGDESTDIR} installvimbin
make -C src DESTDIR=${PKGDESTDIR} installvimbin install-icons
rm -f ${PKGDESTDIR}/usr/share/applications/vim.desktop
rm -rf ${PKGDESTDIR}/usr/share/icons
}
}
gvim-huge_package() {
@ -165,7 +168,11 @@ gvim-huge_package() {
alternatives="vim:vim:/usr/bin/gvim-huge"
pkg_install() {
cd $wrksrc/gvim-huge
make -C src DESTDIR=${PKGDESTDIR} installvimbin
make -C src DESTDIR=${PKGDESTDIR} installvimbin install-icons
rm -f ${PKGDESTDIR}/usr/share/applications/vim.desktop
mv ${PKGDESTDIR}/usr/share/applications/{gvim,gvim-huge}.desktop
vsed -i 's,Exec=gvim,Exec=gvim-huge,g' ${PKGDESTDIR}/usr/share/applications/gvim-huge.desktop
rm -rf ${PKGDESTDIR}/usr/share/icons
}
}
vim-huge_package() {