[arch-commits] Commit in vim/trunk (PKGBUILD gvim.desktop)
Anatol Pomozov
anatolik at archlinux.org
Wed Jan 6 18:40:45 UTC 2016
Date: Wednesday, January 6, 2016 @ 19:40:44
Author: anatolik
Revision: 257582
FS#47500: merge python3 support into {g,}vim package
Now {g,}vim supports both python2 and python3 languages
Modified:
vim/trunk/PKGBUILD
Deleted:
vim/trunk/gvim.desktop
--------------+
PKGBUILD | 143 +++++++--------------------------------------------------
gvim.desktop | 63 -------------------------
2 files changed, 20 insertions(+), 186 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-01-06 18:23:55 UTC (rev 257581)
+++ PKGBUILD 2016-01-06 18:40:44 UTC (rev 257582)
@@ -6,22 +6,20 @@
# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
pkgbase=vim
-pkgname=(vim-minimal vim vim-python3 gvim gvim-python3 vim-runtime)
-pkgver=7.4.944
+pkgname=(vim-minimal vim gvim vim-runtime)
+pkgver=7.4.1054
_versiondir=74
-pkgrel=2
+pkgrel=1
arch=(i686 x86_64)
license=('custom:vim')
url='http://www.vim.org'
-makedepends=(gpm python2 python ruby libxt desktop-file-utils gtk2 lua)
+makedepends=(gpm python2 python ruby libxt desktop-file-utils gtk2 lua gawk)
source=(vim-$pkgver.tar.gz::http://github.com/vim/vim/archive/v$pkgver.tar.gz
vimrc
- archlinux.vim
- gvim.desktop)
-sha1sums=('a670bd0a8417363d757341e1435474b42dd3ca75'
+ archlinux.vim)
+sha1sums=('0c99d00e1afdf6ee6c4b982a44c46e5ed64ce5b3'
'15ebf3f48693f1f219fe2d8edb7643683139eb6b'
- '94f7bb87b5d06bace86bc4b3ef1372813b4eedf2'
- '4a579cf66590d711f49c5dfb4a25e5df116ff7ba')
+ '94f7bb87b5d06bace86bc4b3ef1372813b4eedf2')
prepare() {
cd vim-$pkgver
@@ -102,28 +100,6 @@
--enable-netbeans \
--enable-perlinterp \
--enable-pythoninterp \
- --disable-python3interp \
- --enable-rubyinterp \
- --enable-luainterp
-
- make
-
- cd "${srcdir}"/vim-python3-build
-
- ./configure \
- --prefix=/usr \
- --localstatedir=/var/lib/vim \
- --with-features=huge \
- --with-compiledby='Arch Linux' \
- --enable-gpm \
- --enable-acl \
- --with-x=no \
- --disable-gui \
- --enable-multibyte \
- --enable-cscope \
- --enable-netbeans \
- --enable-perlinterp \
- --disable-pythoninterp \
--enable-python3interp \
--enable-rubyinterp \
--enable-luainterp
@@ -146,28 +122,6 @@
--enable-netbeans \
--enable-perlinterp \
--enable-pythoninterp \
- --disable-python3interp \
- --enable-rubyinterp \
- --enable-luainterp
-
- make
-
- cd "${srcdir}"/gvim-python3-build
-
- ./configure \
- --prefix=/usr \
- --localstatedir=/var/lib/vim \
- --with-features=huge \
- --with-compiledby='Arch Linux' \
- --enable-gpm \
- --enable-acl \
- --with-x=yes \
- --enable-gui=gtk2 \
- --enable-multibyte \
- --enable-cscope \
- --enable-netbeans \
- --enable-perlinterp \
- --disable-pythoninterp \
--enable-python3interp \
--enable-rubyinterp \
--enable-luainterp
@@ -187,7 +141,7 @@
package_vim-minimal() {
pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with a minimal set of dependencies)'
depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'acl')
- conflicts=('vim' 'vim-python3' 'gvim' 'gvim-python3')
+ conflicts=('vim' 'gvim')
provides=("vim=${pkgver}-${pkgrel}" "xxd")
cd "${srcdir}"/vim-minimal-build
@@ -214,9 +168,12 @@
package_vim() {
pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with support for additional scripting languages)'
- depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'lua' 'python2' 'acl')
- conflicts=('vim-minimal' 'vim-python3' 'gvim' 'gvim-python3')
- provides=("xxd")
+ depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'lua' 'acl')
+ optdepends=('python2: Python 2 language support'
+ 'python: Python 3 language support')
+ conflicts=('vim-minimal' 'gvim')
+ provides=('xxd')
+ replaces=('vim-python3')
cd "${srcdir}"/vim-build
make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
@@ -240,40 +197,15 @@
"${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
}
-package_vim-python3() {
- pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with support for additional scripting languages)'
- depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'lua' 'python' 'acl')
- conflicts=('vim-minimal' 'vim' 'gvim' 'gvim-python3')
- provides=("vim=${pkgver}-${pkgrel}" "xxd")
-
- cd "${srcdir}"/vim-python3-build
- make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
-
- # provided by (n)vi in core
- rm "${pkgdir}"/usr/bin/{ex,view}
-
- # delete some manpages
- find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \
- while read _mandir; do
- cd ${_mandir}
- rm -f ex.1 view.1 # provided by (n)vi
- rm -f evim.1 # this does not make sense if we have no GUI
- done
-
- # Runtime provided by runtime package
- rm -r "${pkgdir}"/usr/share/vim
-
- # license
- install -Dm644 runtime/doc/uganda.txt \
- "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
-}
-
package_gvim() {
pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI)'
depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'libxt'
- 'desktop-file-utils' 'gtk2' 'lua' 'python2')
+ 'desktop-file-utils' 'gtk2' 'lua')
+ optdepends=('python2: Python 2 language support'
+ 'python: Python 3 language support')
provides=("vim=${pkgver}-${pkgrel}" "xxd")
- conflicts=('vim-minimal' 'vim' 'vim-python3' 'gvim-python3')
+ conflicts=('vim-minimal' 'vim')
+ replaces=('gvim-python3')
install=gvim.install
cd "${srcdir}"/gvim-build
@@ -293,8 +225,7 @@
rm -r "${pkgdir}"/usr/share/vim
# freedesktop links
- install -Dm644 "${srcdir}"/gvim.desktop \
- "${pkgdir}"/usr/share/applications/gvim.desktop
+ install -Dm644 runtime/gvim.desktop "${pkgdir}"/usr/share/applications/gvim.desktop
install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png
# license
@@ -302,40 +233,6 @@
"${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
}
-package_gvim-python3() {
- pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI) with python 3 support'
- depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'libxt'
- 'desktop-file-utils' 'gtk2' 'lua' 'python')
- provides=("vim=${pkgver}-${pkgrel}" "gvim=${pkgver}-${pkgrel}" "xxd")
- conflicts=('vim-minimal' 'vim' 'vim-python3' 'gvim')
- install=gvim.install
-
- cd "${srcdir}"/gvim-python3-build
- make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
-
- # provided by (n)vi in core
- rm "${pkgdir}"/usr/bin/{ex,view}
-
- # delete some manpages
- find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \
- while read _mandir; do
- cd ${_mandir}
- rm -f ex.1 view.1 # provided by (n)vi
- done
-
- # need to remove since this is provided by vim-runtime
- rm -r "${pkgdir}"/usr/share/vim
-
- # freedesktop links
- install -Dm644 "${srcdir}"/gvim.desktop \
- "${pkgdir}"/usr/share/applications/gvim.desktop
- install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png
-
- # license
- install -Dm644 runtime/doc/uganda.txt \
- "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
-}
-
package_vim-runtime() {
pkgdesc='Runtime for vim and gvim'
depends=('perl' 'gawk')
Deleted: gvim.desktop
===================================================================
--- gvim.desktop 2016-01-06 18:23:55 UTC (rev 257581)
+++ gvim.desktop 2016-01-06 18:40:44 UTC (rev 257582)
@@ -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;
More information about the arch-commits
mailing list