From 5718e95047da8898abfd97684529cfc77a2295fd Mon Sep 17 00:00:00 2001
From: Michael Gehring <mg@ebfe.org>
Date: Thu, 8 Sep 2016 23:56:36 +0200
Subject: [PATCH] vim: update to 7.4.2347.

Also fix .desktop file conflicts.
---
 srcpkgs/vim/files/gvim.desktop | 63 ----------------------------------
 srcpkgs/vim/template           |  7 ++--
 2 files changed, 4 insertions(+), 66 deletions(-)
 delete mode 100644 srcpkgs/vim/files/gvim.desktop

diff --git a/srcpkgs/vim/files/gvim.desktop b/srcpkgs/vim/files/gvim.desktop
deleted file mode 100644
index 675357da59..0000000000
--- a/srcpkgs/vim/files/gvim.desktop
+++ /dev/null
@@ -1,63 +0,0 @@
-[Desktop Entry]
-Name=Vi IMproved
-Name[bg]=Vi Ðåäàêòîð
-Name[ca]=Vi Millorat
-Name[da]=Vi forbedret
-Name[eo]=VIM
-Name[et]=Täiustatud Vi (vim)
-Name[fr]=Vi étendu (VIM)
-Name[he]=רפושמ Vi
-Name[hu]=Vi
-Name[is]=Vi IMproved ritillinn
-Name[it]=Vi iMproved
-Name[no]=Vi IMproved (forbedret VI)
-Name[pl]=Poprawiony VI (vim)
-Name[ro]=VIM
-Name[ru]=Улучшенный VI
-Name[sk]=Vi IMpreved
-Name[sl]=Izboljšani vi (vim)
-Name[sv]=Förbättrad Vi
-Name[zh_CN.GB2312]=改进的 Vi
-Comment=Powerful text editor with scripting functions and macro recorder
-Comment[bg]=Ðåäàêòîð ñ ìíîãî âúçìîæíîñòè
-Comment[ca]=Editor vi potent
-Comment[cs]=Mocný textový editor vi
-Comment[da]=En kraftig vi tekstbehandler
-Comment[de]=Ein leistungsfähiger vi-Editor
-Comment[el]=Πανίσχυρος διορθωτής vi
-Comment[eo]=VIM similas al redaktilo "vi", sed havas aldonajn ecojn
-Comment[es]=Una versión mejorada del editor vi
-Comment[et]=Võimas tekstiredaktor vi
-Comment[fi]=Tehokas vi-tekstieditori
-Comment[fr]=Éditeur vi puissant
-Comment[gl]=Potente editor vi
-Comment[he]=Vi המצועה בר ךרועה
-Comment[hr]=Napredni vi uređivač
-Comment[hu]=Vi szövegszerkesztő
-Comment[is]=Öflug útgáfa vi ritilsins
-Comment[it]=Un editor vi potenziato
-Comment[ja]=強力なViエディタ
-Comment[lt]=Galingas vi redaktorius
-Comment[mk]=Моќен VI уредувач
-Comment[nl]=Krachtige vi-editor
-Comment[no]=En kraftig vi-redigerer
-Comment[no_NY]=Kraftig vi-tekstredigeringsprogram
-Comment[pl]=Edytor vi
-Comment[pt]=Um poderoso editor de texto
-Comment[ro]=Un editor de texte VI, puternic
-Comment[ru]=Мощный текстовый редактор vi
-Comment[sk]=Silný textový procesor vi
-Comment[sl]=Zmogljivi urejevalnik vi
-Comment[sr]=Moćni vi editor
-Comment[sv]=En kraftfull texteditor
-Comment[ta]=ºì¾¢Å¡öó¾ vi ¦¾¡ÌôÀ¡Ç÷
-Comment[tr]=Güçlü vi düzenleyicisi
-Comment[uk]=Потужний редактор vi
-Comment[zh_CN.GB2312]=功能强大的 vi 编辑器
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-Exec=gvim -f %F
-Icon=gvim
-Type=Application
-Terminal=false
-X-XClassHintResName=VIM
-Categories=Utility;TextEditor;
diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index d1d69dffb2..82a81d86d5 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -1,6 +1,6 @@
 # Template file for 'vim'
 pkgname=vim
-version=7.4.2342
+version=7.4.2347
 revision=1
 hostmakedepends="pkg-config glib-devel"
 makedepends="ncurses-devel acl-devel libXt-devel gtk+-devel perl
@@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.vim.org"
 license="Vim"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8db47b329231d07c62b30b1bd8bdaa15fa7fac00e704cad8edbe0155a65469da
+checksum=bdb839502aac6c3ef99443bdfff90b899d3b0be831a4a8953d6782717a85fe66
 
 subpackages="xxd vim-common vim-x11 gvim"
 # XXX vim-huge cannot be cross compiled for now.
@@ -143,7 +143,8 @@ gvim_package() {
 			install -d ${PKGDESTDIR}/usr/share/icons/hicolor/${d}x${d}/apps
 		done
 		make -C src DESTDIR=${PKGDESTDIR} installvimbin install-icons
-		vinstall ${FILESDIR}/gvim.desktop 644 usr/share/applications
+		vmove usr/share/applications/gvim.desktop
+		rm "$PKGDESTDIR"/usr/share/applications/vim.desktop
 	}
 }
 vim-huge_package() {