Date: Monday, February 22, 2010 @ 00:05:16 Author: dgriffiths Revision: 69726
Merged revisions 69692,69725 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/gvim/trunk ........ r69692 | dgriffiths | 2010-02-21 16:33:00 -0600 (Sun, 21 Feb 2010) | 1 line Removing ruby, doesn't build properly ........ r69725 | dgriffiths | 2010-02-21 23:04:54 -0600 (Sun, 21 Feb 2010) | 2 lines FS#16710 - Thanks to drmikehenry ........ Modified: gvim/repos/extra-i686/ (properties) gvim/repos/extra-i686/PKGBUILD gvim/repos/extra-i686/fetch_patches.sh ------------------+ PKGBUILD | 6 +++--- fetch_patches.sh | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) Property changes on: gvim/repos/extra-i686 ___________________________________________________________________ Modified: svnmerge-integrated - /gvim/trunk:1-69652 + /gvim/trunk:1-69725 Modified: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2010-02-22 05:04:54 UTC (rev 69725) +++ extra-i686/PKGBUILD 2010-02-22 05:05:16 UTC (rev 69726) @@ -5,13 +5,13 @@ _srcver=7.2 _patchlevel=368 pkgver=${_srcver}.${_patchlevel} -pkgrel=1 +pkgrel=2 pkgdesc="the vim text editor with advanced features enabled, such as a gui mode" arch=('i686' 'x86_64') license=('custom:vim') url="http://www.vim.org" depends=("vim>=${pkgver}" 'python' 'libxt' 'desktop-file-utils' 'gtk2') -makedepends=('pkgconfig' 'sed' 'perl' 'curl') +makedepends=('pkgconfig' 'sed' 'perl' 'curl' 'rsync' 'ruby') install=${pkgname}.install source=(ftp://ftp.vim.org/pub/vim/unix/vim-${_srcver}.tar.bz2 \ ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-extra.tar.gz \ @@ -19,7 +19,7 @@ ${pkgname}.desktop fetch_patches.sh) md5sums=('f0901284b338e448bfd79ccca0041254' '35e04482f07c57221c9a751aaa3b8dac' \ 'd8884786979e0e520c112faf2e176f05' '2be104c0372dd6dae19cb7968c03cd4f' \ - '159d4d11ecaf85c06623a02c1f843d01') + '9c8f6b302fc3f343962686b8cf4a0350') build() { Modified: extra-i686/fetch_patches.sh =================================================================== --- extra-i686/fetch_patches.sh 2010-02-22 05:04:54 UTC (rev 69725) +++ extra-i686/fetch_patches.sh 2010-02-22 05:05:16 UTC (rev 69726) @@ -7,12 +7,11 @@ let _patchlevel=$_patchlevel+1 _currpatch=$(cat MD5SUMS | wc -l) sed -i "${_patchlevel},\$d" MD5SUMS - cat MD5SUMS | awk '{ print $2 }' | sed -e \ - "s|^|ftp://ftp.vim.org/pub/vim/patches/${_srcver}/|" | \ - xargs -P 0 -r -n 1 wget -nv + rsync -avzcP "ftp.nluug.nl::Vim/patches/${_srcver}/${_srcver}.*" . md5sum -c MD5SUMS > /dev/null || return 1 + > vim.full.patch.log for file in $(cat MD5SUMS | awk '{ print $2 }') - do patch -p0 < $file > vim.full.patch.log; done + do patch -d ${_versiondir} -p0 < $file >> vim.full.patch.log || return 1; done ########