[arch-commits] Commit in vim/trunk (PKGBUILD urxvt-mouse.diff)
Eric Bélanger
eric at archlinux.org
Sun Jan 15 06:31:02 UTC 2012
Date: Sunday, January 15, 2012 @ 01:31:02
Author: eric
Revision: 146635
upgpkg: vim 7.3.401-1
Upstream update, Remove python3 support (close FS#27527), Remove old patch
Modified:
vim/trunk/PKGBUILD
Deleted:
vim/trunk/urxvt-mouse.diff
------------------+
PKGBUILD | 24 +++++++++++-------------
urxvt-mouse.diff | 35 -----------------------------------
2 files changed, 11 insertions(+), 48 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-01-14 21:51:54 UTC (rev 146634)
+++ PKGBUILD 2012-01-15 06:31:02 UTC (rev 146635)
@@ -6,24 +6,24 @@
pkgbase=vim
pkgname=('vim' 'gvim' 'vim-runtime')
_topver=7.3
-_patchlevel=353
-__hgrev=379a6398d462
+_patchlevel=401
+__hgrev=0dabc2ce136c
_versiondir="vim${_topver//./}"
pkgver=${_topver}.${_patchlevel}
-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')
-source=(ftp://ftp.archlinux.org/other/vim/${pkgname}-${pkgver}.tar.xz
+makedepends=('gpm' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua')
+source=(ftp://ftp.archlinux.org/other/vim/${pkgname}-${pkgver}.tar.xz{,.sig}
pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_id=10872
- vimrc archlinux.vim gvim.desktop urxvt-mouse.diff)
-sha1sums=('1713682c077d26ec3d3e8d0d18bad88a2a447fd5'
+ vimrc archlinux.vim gvim.desktop)
+sha1sums=('99498cb48c0c720ae9972a6cd33d4926bdf733b7'
+ '72e9e1eff158e8acceeeb96279085214cbefb3ac'
'4d9dcfb32874aa5467e6f06e418aeb4e675daaf2'
'3494baf53a63581ba69f86a81293640ff681c5c5'
'25dd3c2ce436e73a367c8f73b68f7f6889682437'
- '4a579cf66590d711f49c5dfb4a25e5df116ff7ba'
- '54d8edec6a450a529ba11bab45c5685b1e7c2e84')
+ '4a579cf66590d711f49c5dfb4a25e5df116ff7ba')
# source PKGBUILD && mksource
mksource() {
@@ -53,8 +53,6 @@
build() {
cd "${srcdir}"
- (cd ${pkgname}-${pkgver}; patch -p1 -i ../urxvt-mouse.diff)
-
cp -a ${pkgname}-${pkgver} vim-build
# define the place for the global (g)vimrc file (set to /etc/vimrc)
@@ -87,7 +85,7 @@
--enable-gpm --enable-acl --with-x=yes \
--enable-gui=gtk2 --enable-multibyte --enable-cscope \
--enable-netbeans --enable-perlinterp --enable-pythoninterp \
- --enable-python3interp --enable-rubyinterp --enable-luainterp
+ --disable-python3interp --enable-rubyinterp --enable-luainterp
make
}
@@ -122,7 +120,7 @@
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')
+ 'desktop-file-utils' 'gtk2' 'lua' 'python2')
provides=("vim=${pkgver}-${pkgrel}")
conflicts=('vim')
install=gvim.install
Deleted: urxvt-mouse.diff
===================================================================
--- urxvt-mouse.diff 2012-01-14 21:51:54 UTC (rev 146634)
+++ urxvt-mouse.diff 2012-01-15 06:31:02 UTC (rev 146635)
@@ -1,35 +0,0 @@
-diff --git a/src/term.c b/src/term.c
---- a/src/term.c
-+++ b/src/term.c
-@@ -1996,6 +1996,7 @@
- # define HMT_DEC 4
- # define HMT_JSBTERM 8
- # define HMT_PTERM 16
-+# define HMT_URXVT 32
- static int has_mouse_termcode = 0;
- # endif
-
-@@ -2031,6 +2032,11 @@
- has_mouse_termcode |= HMT_PTERM;
- else
- # endif
-+# ifdef FEAT_MOUSE_URXVT
-+ if (n == KS_URXVT_MOUSE)
-+ has_mouse_termcode |= HMT_URXVT;
-+ else
-+# endif
- has_mouse_termcode |= HMT_NORMAL;
- # endif
- }
-@@ -2068,6 +2074,11 @@
- has_mouse_termcode &= ~HMT_PTERM;
- else
- # endif
-+# ifdef FEAT_MOUSE_URXVT
-+ if (n == KS_URXVT_MOUSE)
-+ has_mouse_termcode &= ~HMT_URXVT;
-+ else
-+# endif
- has_mouse_termcode &= ~HMT_NORMAL;
- # endif
- }
More information about the arch-commits
mailing list