vim: update to 8.2.4804

This commit is contained in:
Tom G. Christensen 2022-04-22 17:54:59 +02:00
parent aaa395cbb2
commit 64ebbf954b
4 changed files with 25 additions and 21 deletions

View File

@ -4,17 +4,17 @@
. ${BUILDPKG_SCRIPTS}/build.sh.functions . ${BUILDPKG_SCRIPTS}/build.sh.functions
# #
########################################################### ###########################################################
patchlevel=1733 patchlevel=4804
# repo_pl is always 4 digits # repo_pl is always 4 digits
repo_pl=$patchlevel repo_pl=$patchlevel
basever=8.0 basever=8.2
# Check the following 4 variables before running the script # Check the following 4 variables before running the script
topdir=vim topdir=vim
version=${basever}.${patchlevel} version=${basever}.${patchlevel}
pkgver=1 pkgver=1
source[0]=https://github.com/vim/vim/archive/v${basever}.${repo_pl}.tar.gz#/${topdir}-${version}.tar.gz source[0]="https://github.com/vim/vim/archive/v${basever}.${repo_pl}.tar.gz#/${topdir}-${version}.tar.gz"
# If there are no patches, simply comment this # If there are no patches, simply comment this
patch[0]=vim-7.4.2253-socklen_t.patch patch[0]=vim-8.2.4804-socklen_t.patch
# Source function library # Source function library
. ${BUILDPKG_SCRIPTS}/buildpkg.functions . ${BUILDPKG_SCRIPTS}/buildpkg.functions
@ -22,7 +22,11 @@ patch[0]=vim-7.4.2253-socklen_t.patch
# Global settings # Global settings
export CPPFLAGS="-I/usr/tgcware/include" export CPPFLAGS="-I/usr/tgcware/include"
export LDFLAGS="-L$prefix/lib -R$prefix/lib" export LDFLAGS="-L$prefix/lib -R$prefix/lib"
basic_args=(--prefix=$prefix --without-local-dir --with-features=huge --enable-multibyte --disable-perlinterp --disable-pythoninterp --disable-tclinterp --with-compiledby="<swpkg@jupiterrise.com>" --disable-netbeans) basic_args=(--prefix=$prefix --without-local-dir --with-features=huge)
basic_args+=(--enable-multibyte --disable-perlinterp --disable-pythoninterp)
basic_args+=(--disable-tclinterp --disable-netbeans)
basic_args+=(--with-compiledby="<swpkg@jupiterrise.com>")
basic_args+=(--with-modified-by="<swpkg@jupiterrise.com>")
# Do not let scripts add a dependency on perl # Do not let scripts add a dependency on perl
ignore_deps="TGCperl" ignore_deps="TGCperl"
# We need to override this # We need to override this
@ -73,10 +77,7 @@ install()
custom_install=1 custom_install=1
generic_install DESTDIR generic_install DESTDIR
doc README.txt doc README.txt
#setdir ${stagedir}${prefix}/${_sharedir}/vim/vim71/lang/ ${__rm} -rf ${stagedir}${prefix}/${_mandir}/{fr,it,pl,ru,ja,da,de,tr}*
#${__mv} "menu_chinese(gb)_gb.936.vim" "menu_chinese_gb__gb.936.vim"
#${__mv} "menu_chinese(taiwan)_taiwan.950.vim" "menu_chinese_taiwan__taiwan.950.vim"
${__rm} -rf ${stagedir}${prefix}/${_mandir}/{fr,it,pl,ru,ja}*
} }
reg pack reg pack

View File

@ -1,5 +1,8 @@
CHANGELOG CHANGELOG
--------- ---------
* Fri Apr 22 2022 Tom G. Christensen <swpkg@jupiterrise.com> - 8.2.4804-1
- Update to 8.2.4804
* Wed Apr 18 2018 Tom G. Christensen <swpkg@jupiterrise.com> - 8.0.1733-1 * Wed Apr 18 2018 Tom G. Christensen <swpkg@jupiterrise.com> - 8.0.1733-1
- Update to 8.0.1733 - Update to 8.0.1733

View File

@ -1,12 +0,0 @@
--- vim-7.4.2253/src/channel.c.socklen_t 2016-08-25 23:19:29.000000000 +0200
+++ vim-7.4.2253/src/channel.c 2016-08-26 11:33:11.314733000 +0200
@@ -52,6 +52,9 @@
# define fd_read(fd, buf, len) read(fd, buf, len)
# define fd_write(sd, buf, len) write(sd, buf, len)
# define fd_close(sd) close(sd)
+# ifndef socklen_t
+typedef int socklen_t;
+# endif
#endif
static void channel_read(channel_T *channel, int part, char *func);

View File

@ -0,0 +1,12 @@
--- vim-8.2.4804/src/channel.c.socklen_t 2022-04-22 00:30:15.000000000 +0000
+++ vim-8.2.4804/src/channel.c 2022-04-22 17:29:16.780004000 +0000
@@ -66,6 +66,9 @@
# define fd_read(fd, buf, len) read(fd, buf, len)
# define fd_write(sd, buf, len) write(sd, buf, len)
# define fd_close(sd) close(sd)
+# ifndef socklen_t
+typedef size_t socklen_t;
+# endif
#endif
static void channel_read(channel_T *channel, ch_part_T part, char *func);