diff --git a/vim/build.sh b/vim/build.sh index bfb79d0..70479db 100755 --- a/vim/build.sh +++ b/vim/build.sh @@ -4,15 +4,16 @@ . ${BUILDPKG_SCRIPTS}/build.sh.functions # ########################################################### -patchlevel=977 -basever=7.4 +patchlevel=8 +repo_pl=0008 +basever=8.0 # Check the following 4 variables before running the script topdir=vim version=${basever}.${patchlevel} pkgver=1 -source[0]=https://github.com/vim/vim/archive/v${basever}.${patchlevel}.tar.gz +source[0]=https://github.com/vim/vim/archive/v${basever}.${repo_pl}.tar.gz # If there are no patches, simply comment this -#patch[0]= +patch[0]=vim-7.4.2253-socklen_t.patch # Source function library . ${BUILDPKG_SCRIPTS}/buildpkg.functions @@ -24,7 +25,7 @@ basic_args=(--prefix=$prefix --without-local-dir --with-features=huge --enable-m # Do not let scripts add a dependency on perl ignore_deps="TGCperl" # We need to override this -topsrcdir=vim-${basever}.${patchlevel} +topsrcdir=vim-${basever}.${repo_pl} reg prep prep() diff --git a/vim/meta/ChangeLog b/vim/meta/ChangeLog index 9291e67..27f2020 100644 --- a/vim/meta/ChangeLog +++ b/vim/meta/ChangeLog @@ -1,5 +1,11 @@ CHANGELOG --------- +* Sat Sep 24 2016 Tom G. Christensen - 8.0.8-1 +- Update to 8.0.8 + +* Fri Aug 26 2016 Tom G. Christensen - 7.4.2253-1 +- Update to 7.4.2253 + * Sat Dec 19 2015 Tom G. Christensen - 7.4.977-1 - Update to 7.4.977 diff --git a/vim/meta/pkgdef b/vim/meta/pkgdef index e628dcf..64b3cf2 100644 --- a/vim/meta/pkgdef +++ b/vim/meta/pkgdef @@ -36,4 +36,6 @@ $_bindir/gvim $_bindir/gvimdiff $_bindir/gview $_mandir/man1/g* +$_sharedir/applications +$_sharedir/icons diff --git a/vim/src/vim-7.4.2253-socklen_t.patch b/vim/src/vim-7.4.2253-socklen_t.patch new file mode 100644 index 0000000..da8b923 --- /dev/null +++ b/vim/src/vim-7.4.2253-socklen_t.patch @@ -0,0 +1,12 @@ +--- 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);