Skip to content

Commit 7bde95a

Browse files
committed
patch 8.1.1196: parallel build may fail
Problem: Parallel build may fail. Solution: Update dependencies.
1 parent eead75c commit 7bde95a

2 files changed

Lines changed: 35 additions & 34 deletions

File tree

src/Makefile

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3432,8 +3432,9 @@ objects/crypt_zip.o: crypt_zip.c vim.h protodef.h auto/config.h feature.h \
34323432
proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
34333433
proto.h globals.h
34343434
objects/debugger.o: debugger.c vim.h protodef.h auto/config.h feature.h os_unix.h \
3435-
os_mac.h ascii.h keymap.h term.h macros.h option.h beval.h structs.h \
3436-
regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h
3435+
auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
3436+
proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
3437+
proto.h globals.h
34373438
objects/dict.o: dict.c vim.h protodef.h auto/config.h feature.h os_unix.h \
34383439
auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
34393440
proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
@@ -3482,11 +3483,10 @@ objects/fileio.o: fileio.c vim.h protodef.h auto/config.h feature.h os_unix.h \
34823483
auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
34833484
proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
34843485
proto.h globals.h
3485-
objects/findfile.o: findfile.c vim.h protodef.h auto/config.h feature.h \
3486-
os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
3486+
objects/findfile.o: findfile.c vim.h protodef.h auto/config.h feature.h os_unix.h \
3487+
auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
34873488
proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
3488-
proto.h globals.h libvterm/include/vterm.h \
3489-
libvterm/include/vterm_keycodes.h
3489+
proto.h globals.h
34903490
objects/fold.o: fold.c vim.h protodef.h auto/config.h feature.h os_unix.h \
34913491
auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
34923492
proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
@@ -3684,16 +3684,15 @@ objects/gui_gtk_f.o: gui_gtk_f.c vim.h protodef.h auto/config.h feature.h \
36843684
objects/gui_motif.o: gui_motif.c vim.h protodef.h auto/config.h feature.h \
36853685
os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
36863686
proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
3687-
proto.h globals.h gui_xmebw.h ../pixmaps/alert.xpm \
3688-
../pixmaps/error.xpm ../pixmaps/generic.xpm ../pixmaps/info.xpm \
3689-
../pixmaps/quest.xpm gui_x11_pm.h ../pixmaps/tb_new.xpm \
3690-
../pixmaps/tb_open.xpm ../pixmaps/tb_close.xpm ../pixmaps/tb_save.xpm \
3691-
../pixmaps/tb_print.xpm ../pixmaps/tb_cut.xpm ../pixmaps/tb_copy.xpm \
3692-
../pixmaps/tb_paste.xpm ../pixmaps/tb_find.xpm \
3693-
../pixmaps/tb_find_next.xpm ../pixmaps/tb_find_prev.xpm \
3694-
../pixmaps/tb_find_help.xpm ../pixmaps/tb_exit.xpm \
3695-
../pixmaps/tb_undo.xpm ../pixmaps/tb_redo.xpm ../pixmaps/tb_help.xpm \
3696-
../pixmaps/tb_macro.xpm ../pixmaps/tb_make.xpm \
3687+
proto.h globals.h gui_xmebw.h ../pixmaps/alert.xpm ../pixmaps/error.xpm \
3688+
../pixmaps/generic.xpm ../pixmaps/info.xpm ../pixmaps/quest.xpm \
3689+
gui_x11_pm.h ../pixmaps/tb_new.xpm ../pixmaps/tb_open.xpm \
3690+
../pixmaps/tb_close.xpm ../pixmaps/tb_save.xpm ../pixmaps/tb_print.xpm \
3691+
../pixmaps/tb_cut.xpm ../pixmaps/tb_copy.xpm ../pixmaps/tb_paste.xpm \
3692+
../pixmaps/tb_find.xpm ../pixmaps/tb_find_next.xpm \
3693+
../pixmaps/tb_find_prev.xpm ../pixmaps/tb_find_help.xpm \
3694+
../pixmaps/tb_exit.xpm ../pixmaps/tb_undo.xpm ../pixmaps/tb_redo.xpm \
3695+
../pixmaps/tb_help.xpm ../pixmaps/tb_macro.xpm ../pixmaps/tb_make.xpm \
36973696
../pixmaps/tb_save_all.xpm ../pixmaps/tb_jump.xpm \
36983697
../pixmaps/tb_ctags.xpm ../pixmaps/tb_load_session.xpm \
36993698
../pixmaps/tb_save_session.xpm ../pixmaps/tb_new_session.xpm \
@@ -3713,10 +3712,10 @@ objects/gui_xmebw.o: gui_xmebw.c vim.h protodef.h auto/config.h feature.h \
37133712
objects/gui_athena.o: gui_athena.c vim.h protodef.h auto/config.h feature.h \
37143713
os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
37153714
proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
3716-
proto.h globals.h gui_at_sb.h gui_x11_pm.h \
3717-
../pixmaps/tb_new.xpm ../pixmaps/tb_open.xpm ../pixmaps/tb_close.xpm \
3718-
../pixmaps/tb_save.xpm ../pixmaps/tb_print.xpm ../pixmaps/tb_cut.xpm \
3719-
../pixmaps/tb_copy.xpm ../pixmaps/tb_paste.xpm ../pixmaps/tb_find.xpm \
3715+
proto.h globals.h gui_at_sb.h gui_x11_pm.h ../pixmaps/tb_new.xpm \
3716+
../pixmaps/tb_open.xpm ../pixmaps/tb_close.xpm ../pixmaps/tb_save.xpm \
3717+
../pixmaps/tb_print.xpm ../pixmaps/tb_cut.xpm ../pixmaps/tb_copy.xpm \
3718+
../pixmaps/tb_paste.xpm ../pixmaps/tb_find.xpm \
37203719
../pixmaps/tb_find_next.xpm ../pixmaps/tb_find_prev.xpm \
37213720
../pixmaps/tb_find_help.xpm ../pixmaps/tb_exit.xpm \
37223721
../pixmaps/tb_undo.xpm ../pixmaps/tb_redo.xpm ../pixmaps/tb_help.xpm \
@@ -3737,8 +3736,8 @@ objects/gui_gtk_x11.o: gui_gtk_x11.c vim.h protodef.h auto/config.h feature.h \
37373736
objects/gui_x11.o: gui_x11.c vim.h protodef.h auto/config.h feature.h os_unix.h \
37383737
auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
37393738
proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
3740-
proto.h globals.h ../runtime/vim32x32.xpm \
3741-
../runtime/vim16x16.xpm ../runtime/vim48x48.xpm
3739+
proto.h globals.h ../runtime/vim32x32.xpm ../runtime/vim16x16.xpm \
3740+
../runtime/vim48x48.xpm
37423741
objects/gui_at_sb.o: gui_at_sb.c vim.h protodef.h auto/config.h feature.h \
37433742
os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
37443743
proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
@@ -3842,50 +3841,50 @@ objects/xdiffi.o: xdiff/xdiffi.c xdiff/xinclude.h auto/config.h \
38423841
macros.h option.h beval.h proto/gui_beval.pro \
38433842
structs.h regexp.h gui.h alloc.h \
38443843
ex_cmds.h spell.h proto.h globals.h \
3845-
xdiff/xtypes.h xdiff/xutils.h \
3846-
xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h
3844+
xdiff/xtypes.h xdiff/xutils.h xdiff/xprepare.h xdiff/xdiffi.h \
3845+
xdiff/xemit.h
38473846
objects/xemit.o: xdiff/xemit.c xdiff/xinclude.h auto/config.h \
38483847
xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \
38493848
auto/config.h feature.h os_unix.h \
38503849
auto/osdef.h ascii.h keymap.h term.h \
38513850
macros.h option.h beval.h proto/gui_beval.pro \
38523851
structs.h regexp.h gui.h alloc.h \
38533852
ex_cmds.h spell.h proto.h globals.h \
3854-
xdiff/xtypes.h xdiff/xutils.h \
3855-
xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h
3853+
xdiff/xtypes.h xdiff/xutils.h xdiff/xprepare.h xdiff/xdiffi.h \
3854+
xdiff/xemit.h
38563855
objects/xprepare.o: xdiff/xprepare.c xdiff/xinclude.h auto/config.h \
38573856
xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \
38583857
auto/config.h feature.h os_unix.h \
38593858
auto/osdef.h ascii.h keymap.h term.h \
38603859
macros.h option.h beval.h proto/gui_beval.pro \
38613860
structs.h regexp.h gui.h alloc.h \
38623861
ex_cmds.h spell.h proto.h globals.h \
3863-
xdiff/xtypes.h xdiff/xutils.h \
3864-
xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h
3862+
xdiff/xtypes.h xdiff/xutils.h xdiff/xprepare.h xdiff/xdiffi.h \
3863+
xdiff/xemit.h
38653864
objects/xutils.o: xdiff/xutils.c xdiff/xinclude.h auto/config.h \
38663865
xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \
38673866
auto/config.h feature.h os_unix.h \
38683867
auto/osdef.h ascii.h keymap.h term.h \
38693868
macros.h option.h beval.h proto/gui_beval.pro \
38703869
structs.h regexp.h gui.h alloc.h \
38713870
ex_cmds.h spell.h proto.h globals.h \
3872-
xdiff/xtypes.h xdiff/xutils.h \
3873-
xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h
3871+
xdiff/xtypes.h xdiff/xutils.h xdiff/xprepare.h xdiff/xdiffi.h \
3872+
xdiff/xemit.h
38743873
objects/xhistogram.o: xdiff/xhistogram.c xdiff/xinclude.h auto/config.h \
38753874
xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \
38763875
auto/config.h feature.h os_unix.h \
38773876
auto/osdef.h ascii.h keymap.h term.h \
38783877
macros.h option.h beval.h proto/gui_beval.pro \
38793878
structs.h regexp.h gui.h alloc.h \
38803879
ex_cmds.h spell.h proto.h globals.h \
3881-
xdiff/xtypes.h xdiff/xutils.h \
3882-
xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h
3880+
xdiff/xtypes.h xdiff/xutils.h xdiff/xprepare.h xdiff/xdiffi.h \
3881+
xdiff/xemit.h
38833882
objects/xpatience.o: xdiff/xpatience.c xdiff/xinclude.h auto/config.h \
38843883
xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \
38853884
auto/config.h feature.h os_unix.h \
38863885
auto/osdef.h ascii.h keymap.h term.h \
38873886
macros.h option.h beval.h proto/gui_beval.pro \
38883887
structs.h regexp.h gui.h alloc.h \
38893888
ex_cmds.h spell.h proto.h globals.h \
3890-
xdiff/xtypes.h xdiff/xutils.h \
3891-
xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h
3889+
xdiff/xtypes.h xdiff/xutils.h xdiff/xprepare.h xdiff/xdiffi.h \
3890+
xdiff/xemit.h

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -771,6 +771,8 @@ static char *(features[]) =
771771

772772
static int included_patches[] =
773773
{ /* Add new patch number below this line */
774+
/**/
775+
1196,
774776
/**/
775777
1195,
776778
/**/

0 commit comments

Comments
 (0)