Use icons and desktop entry file provided by upstream

3 files changed, 11 insertions, 80 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 09780a5fcceb..32feab80beb3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Jun 30 12:48:23 UTC 2016
+# Sun Feb 19 20:55:41 UTC 2017
 pkgbase = gvim-git
 	pkgdesc = Vim the editor. CLI version and GTK2 GUI providing majority of features.
-	pkgver = 7.4.1967
-	pkgrel = 2
+	pkgver = 8.0.0342
+	pkgrel = 1
 	url = http://www.vim.org
 	arch = i686
 	arch = x86_64
@@ -31,9 +31,7 @@ pkgbase = gvim-git
 	conflicts = gvim
 	conflicts = gvim-python3
 	source = git+https://github.com/vim/vim.git
-	source = gvim.desktop
 	sha256sums = SKIP
-	sha256sums = 97e94c3ca5825d6ab50096eb8449adf1b05c88ad13e60e6a99be8daacc797eac
 
 pkgname = gvim-git
 
diff --git a/PKGBUILD b/PKGBUILD
index f33b672b13e6..e8ccd7dcbf44 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 
 _pkgname=vim
 pkgname="gvim-git"
-pkgver=7.4.1967
-pkgrel=2
+pkgver=8.0.0342
+pkgrel=1
 pkgdesc='Vim the editor. CLI version and GTK2 GUI providing majority of features.'
 arch=('i686' 'x86_64')
 url='http://www.vim.org'
@@ -18,10 +18,8 @@ optdepends=('lua: Lua interpreter' 'perl: Perl interpreter' 'python: Python 3 in
 makedepends=('git' 'lua' 'python' 'python2' 'ruby')
 provides=('gvim' 'xxd')
 conflicts=("vim-minimal"{,-git} "vim"{,-git} 'vim-python3' "gvim"{,-python3})
-source=("git+https://github.com/$_pkgname/$_pkgname.git"
-        "gvim.desktop")
-sha256sums=("SKIP"
-            "97e94c3ca5825d6ab50096eb8449adf1b05c88ad13e60e6a99be8daacc797eac")
+source=("git+https://github.com/$_pkgname/$_pkgname.git")
+sha256sums=("SKIP")
 
 pkgver() {
     cd $_pkgname
@@ -61,11 +59,9 @@ package() {
     cd $_pkgname
     make DESTDIR=$pkgdir install
 
-    # desktop entry file and corresponding icon
-    install -D -m644 ../gvim.desktop      $pkgdir/usr/share/applications/gvim.desktop
-    install -D -m644 runtime/vim48x48.png $pkgdir/usr/share/icons/hicolor/48x48/apps/gvim.png
+    # remove components provided by other packages
 
-    # remove ex/view and man pages (normally provided by package 'vi' on Arch Linux)
+    # ex/view and man pages (normally provided by package 'vi' on Arch Linux)
     cd $pkgdir/usr/bin ; rm ex view
     find $pkgdir/usr/share/man -type d -name 'man1' 2>/dev/null | \
       while read _mandir; do
@@ -73,9 +69,9 @@ package() {
         rm -f ex.1 view.1
       done
 
-    # remove components provided by vim-runtime-git
+    # components provided by vim-runtime-git
     cd $pkgdir
-    rm -R usr/share/vim
+    rm -R usr/share/{icons,vim} usr/share/applications/vim.desktop
 
     # add license
     install -D -m644 $srcdir/$_pkgname/runtime/doc/uganda.txt \
diff --git a/gvim.desktop b/gvim.desktop
deleted file mode 100644
index 675357da59eb..000000000000
--- a/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;