aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD78
-rw-r--r--remove_ro_delay.patch11
3 files changed, 55 insertions, 36 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1e8aa20..1332bb6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -24,8 +24,10 @@ pkgbase = gvim-hg
conflicts = vim-runtime
source = vim::hg+https://vim.googlecode.com/hg/
source = gvim.desktop
+ source = remove_ro_delay.patch
md5sums = SKIP
md5sums = 6e11c556ba3f2ce7dc05d9908188d604
+ md5sums = 0e2d8ef1e98a58614d441b24f2242b98
pkgname = gvim-hg
diff --git a/PKGBUILD b/PKGBUILD
index 93b83ac..a06f521 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,52 +16,58 @@ conflicts=('vim' 'gvim' 'vim-runtime')
provides=('vim' 'gvim' 'vim-runtime')
source=('vim'::'hg+https://vim.googlecode.com/hg/'
- 'gvim.desktop')
+ 'gvim.desktop'
+ 'remove_ro_delay.patch')
md5sums=('SKIP'
- '6e11c556ba3f2ce7dc05d9908188d604')
+ '6e11c556ba3f2ce7dc05d9908188d604'
+ '0e2d8ef1e98a58614d441b24f2242b98')
pkgver() {
- cd vim
- hg log -r "." --template "{sub('-', '.', strip(latesttag, 'v'))}.r{latesttagdistance}.{node|short}"
+ cd vim
+ hg log -r "." --template "{sub('-', '.', strip(latesttag, 'v'))}.r{latesttagdistance}.{node|short}"
+}
+
+prepare(){
+ cd vim
+ patch -Np1 -i "$srcdir"/remove_ro_delay.patch
}
build() {
- cd vim
- ./configure \
- --enable-acl \
- --disable-gpm \
- --with-x=yes \
- --prefix=/usr \
- --enable-cscope \
- --enable-gui=gtk2 \
- --enable-luainterp \
- --enable-multibyte \
- --disable-netbeans \
- --enable-perlinterp \
- --enable-rubyinterp \
- --with-features=huge \
- --disable-pythoninterp \
- --enable-python3interp \
- --localstatedir=/var/lib/vim \
- --with-compiledby='Arch Linux'
- make
+ cd vim
+ ./configure \
+ --enable-acl \
+ --disable-gpm \
+ --with-x=yes \
+ --prefix=/usr \
+ --enable-cscope \
+ --enable-gui=gtk2 \
+ --enable-luainterp \
+ --enable-multibyte \
+ --disable-netbeans \
+ --enable-perlinterp \
+ --enable-rubyinterp \
+ --with-features=huge \
+ --disable-pythoninterp \
+ --enable-python3interp \
+ --localstatedir=/var/lib/vim \
+ --with-compiledby='Arch Linux'
+ make
}
package() {
- cd vim
- make DESTDIR="$pkgdir" install
+ cd vim
+ make DESTDIR="$pkgdir" install
- rm "$pkgdir"/usr/bin/ex
- rm "$pkgdir"/usr/bin/view
+ rm "$pkgdir"/usr/bin/ex
+ rm "$pkgdir"/usr/bin/view
- # Not sure why globstar isn't enabled in makepkg
- shopt -s globstar
- rm "$pkgdir"/usr/share/man/**/ex.1*
- rm "$pkgdir"/usr/share/man/**/view.1*
- shopt -u globstar
+ # Not sure why globstar isn't enabled in makepkg
+ shopt -s globstar
+ rm "$pkgdir"/usr/share/man/**/ex.1*
+ rm "$pkgdir"/usr/share/man/**/view.1*
+ shopt -u globstar
- install -Dm644 "$srcdir"/gvim.desktop "$pkgdir"/usr/share/applications/gvim.desktop
- install -Dm644 runtime/vim48x48.png "$pkgdir"/usr/share/pixmaps/gvim.png
- install -Dm644 runtime/doc/uganda.txt "$pkgdir"/usr/share/licenses/vim/license.txt
+ install -Dm644 "$srcdir"/gvim.desktop "$pkgdir"/usr/share/applications/gvim.desktop
+ install -Dm644 runtime/vim48x48.png "$pkgdir"/usr/share/pixmaps/gvim.png
+ install -Dm644 runtime/doc/uganda.txt "$pkgdir"/usr/share/licenses/vim/license.txt
}
-
diff --git a/remove_ro_delay.patch b/remove_ro_delay.patch
new file mode 100644
index 0000000..d74ea19
--- /dev/null
+++ b/remove_ro_delay.patch
@@ -0,0 +1,11 @@
+diff -r 4d94c8a6758a src/misc1.c
+--- a/src/misc1.c Wed Jul 30 17:21:58 2014 +0200
++++ b/src/misc1.c Sun Aug 03 21:58:18 2014 +0100
+@@ -3302,7 +3302,6 @@
+ if (msg_silent == 0 && !silent_mode)
+ {
+ out_flush();
+- ui_delay(1000L, TRUE); /* give the user time to think about it */
+ }
+ curbuf->b_did_warn = TRUE;
+ redraw_cmdline = FALSE; /* don't redraw and erase the message */