Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/percona-server/PKGBUILD
	community/qdevelop/PKGBUILD
	core/openssh/PKGBUILD
	extra/colord/PKGBUILD
	extra/enblend-enfuse/PKGBUILD
	extra/mesa/PKGBUILD
	extra/telepathy-kde-contact-list/PKGBUILD
	extra/vim/PKGBUILD
	multilib/lib32-mesa/PKGBUILD

2 files changed, 51 insertions, 13 deletions

diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index cd83d4046..3949b9d97 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 142404 2011-11-09 04:16:54Z eric $
+# $Id: PKGBUILD 143639 2011-11-27 23:44:53Z eric $
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Maintainer: tobias [ tobias at archlinux org ]
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -10,19 +10,20 @@ _patchlevel=353
 __hgrev=379a6398d462
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 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
         pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_id=10872
-        vimrc archlinux.vim gvim.desktop)
-md5sums=('3a7fb107699b741a7a1a86ff5ec3b83e'
-         '6e7adfbd5d26c1d161030ec203a7f243'
-         'e57777374891063b9ca48a1fe392ac05'
-         '10353a61aadc3f276692d0e17db1478e'
-         'd90413bd21f400313a785bb4010120cd')
+        vimrc archlinux.vim gvim.desktop urxvt-mouse.diff)
+sha1sums=('1713682c077d26ec3d3e8d0d18bad88a2a447fd5'
+          '4d9dcfb32874aa5467e6f06e418aeb4e675daaf2'
+          '3494baf53a63581ba69f86a81293640ff681c5c5'
+          '25dd3c2ce436e73a367c8f73b68f7f6889682437'
+          '4a579cf66590d711f49c5dfb4a25e5df116ff7ba'
+          '54d8edec6a450a529ba11bab45c5685b1e7c2e84')
 
 # source PKGBUILD && mksource
 mksource() {
@@ -52,6 +53,8 @@ mksource() {
 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)
@@ -69,19 +72,19 @@ build() {
   cd "${srcdir}"/vim-build
 
   ./configure --prefix=/usr --localstatedir=/var/lib/vim \
-    --mandir=/usr/share/man --with-compiledby=ArchLinux \
-    --with-features=big --enable-gpm --enable-acl --with-x=no \
+    --with-features=big --with-compiledby=ArchLinux \
+    --enable-gpm --enable-acl --with-x=no \
     --disable-gui --enable-multibyte --enable-cscope \
     --disable-netbeans --enable-perlinterp --disable-pythoninterp \
-    --disable-rubyinterp --disable-luainterp
+    --disable-python3interp --disable-rubyinterp --disable-luainterp
 
   make
 
   cd "${srcdir}"/gvim-build
 
   ./configure --prefix=/usr --localstatedir=/var/lib/vim \
-    --mandir=/usr/share/man --with-compiledby=ArchLinux \
-    --with-features=big --enable-gpm --enable-acl --with-x=yes \
+    --with-features=big --with-compiledby=ArchLinux \
+    --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
diff --git a/extra/vim/urxvt-mouse.diff b/extra/vim/urxvt-mouse.diff
new file mode 100644
index 000000000..9112e7ffd
--- /dev/null
+++ b/extra/vim/urxvt-mouse.diff
@@ -0,0 +1,35 @@
+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
+ }