diff options
Diffstat (limited to 'meta/recipes-support/vim')
-rw-r--r-- | meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch | 13 | ||||
-rw-r--r-- | meta/recipes-support/vim/files/disable_acl_header_check.patch | 15 | ||||
-rw-r--r-- | meta/recipes-support/vim/files/no-path-adjust.patch | 8 | ||||
-rw-r--r-- | meta/recipes-support/vim/files/racefix.patch | 33 | ||||
-rw-r--r-- | meta/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch | 13 | ||||
-rw-r--r-- | meta/recipes-support/vim/vim-tiny_9.0.bb (renamed from meta/recipes-support/vim/vim-tiny_8.2.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-support/vim/vim.inc | 48 | ||||
-rw-r--r-- | meta/recipes-support/vim/vim_9.0.bb (renamed from meta/recipes-support/vim/vim_8.2.bb) | 0 |
8 files changed, 50 insertions, 80 deletions
diff --git a/meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch b/meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch index 63a7b78f12..2fc11dbdc2 100644 --- a/meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch +++ b/meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch | |||
@@ -16,11 +16,11 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | |||
16 | src/Makefile | 14 ++++---------- | 16 | src/Makefile | 14 ++++---------- |
17 | 1 file changed, 4 insertions(+), 10 deletions(-) | 17 | 1 file changed, 4 insertions(+), 10 deletions(-) |
18 | 18 | ||
19 | diff --git a/src/Makefile b/src/Makefile | 19 | Index: git/src/Makefile |
20 | index f2fafa4dc..7148d4bd9 100644 | 20 | =================================================================== |
21 | --- a/src/Makefile | 21 | --- git.orig/src/Makefile |
22 | +++ b/src/Makefile | 22 | +++ git/src/Makefile |
23 | @@ -2845,16 +2845,10 @@ auto/pathdef.c: Makefile auto/config.mk | 23 | @@ -3101,16 +3101,10 @@ auto/pathdef.c: Makefile auto/config.mk |
24 | -@echo '#include "vim.h"' >> $@ | 24 | -@echo '#include "vim.h"' >> $@ |
25 | -@echo 'char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)";' | $(QUOTESED) >> $@ | 25 | -@echo 'char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)";' | $(QUOTESED) >> $@ |
26 | -@echo 'char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR)";' | $(QUOTESED) >> $@ | 26 | -@echo 'char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR)";' | $(QUOTESED) >> $@ |
@@ -41,6 +41,3 @@ index f2fafa4dc..7148d4bd9 100644 | |||
41 | -@sh $(srcdir)/pathdef.sh | 41 | -@sh $(srcdir)/pathdef.sh |
42 | 42 | ||
43 | GUI_GTK_RES_INPUTS = \ | 43 | GUI_GTK_RES_INPUTS = \ |
44 | -- | ||
45 | 2.17.1 | ||
46 | |||
diff --git a/meta/recipes-support/vim/files/disable_acl_header_check.patch b/meta/recipes-support/vim/files/disable_acl_header_check.patch index 33089162b4..533138245d 100644 --- a/meta/recipes-support/vim/files/disable_acl_header_check.patch +++ b/meta/recipes-support/vim/files/disable_acl_header_check.patch | |||
@@ -13,11 +13,11 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> | |||
13 | src/configure.ac | 3 ++- | 13 | src/configure.ac | 3 ++- |
14 | 1 file changed, 2 insertions(+), 1 deletion(-) | 14 | 1 file changed, 2 insertions(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/src/configure.ac b/src/configure.ac | 16 | Index: git/src/configure.ac |
17 | index 2d409b3ca06a..dbcaf6140263 100644 | 17 | =================================================================== |
18 | --- a/src/configure.ac | 18 | --- git.orig/src/configure.ac |
19 | +++ b/src/configure.ac | 19 | +++ git/src/configure.ac |
20 | @@ -3257,7 +3257,7 @@ AC_CHECK_HEADERS(stdint.h stdlib.h string.h \ | 20 | @@ -3292,7 +3292,7 @@ AC_CHECK_HEADERS(stdint.h stdlib.h strin |
21 | sys/systeminfo.h locale.h sys/stream.h termios.h \ | 21 | sys/systeminfo.h locale.h sys/stream.h termios.h \ |
22 | libc.h sys/statfs.h poll.h sys/poll.h pwd.h \ | 22 | libc.h sys/statfs.h poll.h sys/poll.h pwd.h \ |
23 | utime.h sys/param.h sys/ptms.h libintl.h libgen.h \ | 23 | utime.h sys/param.h sys/ptms.h libintl.h libgen.h \ |
@@ -26,7 +26,7 @@ index 2d409b3ca06a..dbcaf6140263 100644 | |||
26 | sys/access.h sys/sysinfo.h wchar.h wctype.h) | 26 | sys/access.h sys/sysinfo.h wchar.h wctype.h) |
27 | 27 | ||
28 | dnl sys/ptem.h depends on sys/stream.h on Solaris | 28 | dnl sys/ptem.h depends on sys/stream.h on Solaris |
29 | @@ -3886,6 +3886,7 @@ AC_ARG_ENABLE(acl, | 29 | @@ -3974,6 +3974,7 @@ AC_ARG_ENABLE(acl, |
30 | , [enable_acl="yes"]) | 30 | , [enable_acl="yes"]) |
31 | if test "$enable_acl" = "yes"; then | 31 | if test "$enable_acl" = "yes"; then |
32 | AC_MSG_RESULT(no) | 32 | AC_MSG_RESULT(no) |
@@ -34,6 +34,3 @@ index 2d409b3ca06a..dbcaf6140263 100644 | |||
34 | AC_CHECK_LIB(posix1e, acl_get_file, [LIBS="$LIBS -lposix1e"], | 34 | AC_CHECK_LIB(posix1e, acl_get_file, [LIBS="$LIBS -lposix1e"], |
35 | AC_CHECK_LIB(acl, acl_get_file, [LIBS="$LIBS -lacl" | 35 | AC_CHECK_LIB(acl, acl_get_file, [LIBS="$LIBS -lacl" |
36 | AC_CHECK_LIB(attr, fgetxattr, LIBS="$LIBS -lattr",,)],,),) | 36 | AC_CHECK_LIB(attr, fgetxattr, LIBS="$LIBS -lattr",,)],,),) |
37 | -- | ||
38 | 2.7.4 | ||
39 | |||
diff --git a/meta/recipes-support/vim/files/no-path-adjust.patch b/meta/recipes-support/vim/files/no-path-adjust.patch index 05c2d803f6..9d6da80913 100644 --- a/meta/recipes-support/vim/files/no-path-adjust.patch +++ b/meta/recipes-support/vim/files/no-path-adjust.patch | |||
@@ -7,9 +7,11 @@ Upstream-Status: Pending | |||
7 | 7 | ||
8 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | 8 | Signed-off-by: Joe Slater <joe.slater@windriver.com> |
9 | 9 | ||
10 | --- a/src/Makefile | 10 | Index: git/src/Makefile |
11 | +++ b/src/Makefile | 11 | =================================================================== |
12 | @@ -2507,11 +2507,14 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_ | 12 | --- git.orig/src/Makefile |
13 | +++ git/src/Makefile | ||
14 | @@ -2565,11 +2565,14 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_ | ||
13 | rm -rf $$cvs; \ | 15 | rm -rf $$cvs; \ |
14 | fi | 16 | fi |
15 | -chmod $(FILEMOD) $(DEST_TOOLS)/* | 17 | -chmod $(FILEMOD) $(DEST_TOOLS)/* |
diff --git a/meta/recipes-support/vim/files/racefix.patch b/meta/recipes-support/vim/files/racefix.patch deleted file mode 100644 index 48dca44cad..0000000000 --- a/meta/recipes-support/vim/files/racefix.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | The creation of the LINGUAS file is duplicated for each desktop file | ||
2 | which can lead the commands to race against each other. Rework | ||
3 | the makefile to avoid this as the expense of leaving the file on disk. | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | RP 2021/2/15 | ||
7 | |||
8 | Index: git/src/po/Makefile | ||
9 | =================================================================== | ||
10 | --- git.orig/src/po/Makefile | ||
11 | +++ git/src/po/Makefile | ||
12 | @@ -165,17 +165,16 @@ $(PACKAGE).pot: ../*.c ../if_perl.xs ../ | ||
13 | po/gvim.desktop.in po/vim.desktop.in | ||
14 | mv -f ../$(PACKAGE).po $(PACKAGE).pot | ||
15 | |||
16 | -vim.desktop: vim.desktop.in $(POFILES) | ||
17 | +LINGUAS: | ||
18 | echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS | ||
19 | + | ||
20 | +vim.desktop: vim.desktop.in $(POFILES) LINGUAS | ||
21 | $(MSGFMT) --desktop -d . --template vim.desktop.in -o tmp_vim.desktop | ||
22 | - rm -f LINGUAS | ||
23 | if command -v desktop-file-validate; then desktop-file-validate tmp_vim.desktop; fi | ||
24 | mv tmp_vim.desktop vim.desktop | ||
25 | |||
26 | -gvim.desktop: gvim.desktop.in $(POFILES) | ||
27 | - echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS | ||
28 | +gvim.desktop: gvim.desktop.in $(POFILES) LINGUAS | ||
29 | $(MSGFMT) --desktop -d . --template gvim.desktop.in -o tmp_gvim.desktop | ||
30 | - rm -f LINGUAS | ||
31 | if command -v desktop-file-validate; then desktop-file-validate tmp_gvim.desktop; fi | ||
32 | mv tmp_gvim.desktop gvim.desktop | ||
33 | |||
diff --git a/meta/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch b/meta/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch index 37914d4cd9..5284ba45b6 100644 --- a/meta/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch +++ b/meta/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch | |||
@@ -14,11 +14,11 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> | |||
14 | src/configure.ac | 7 +++++++ | 14 | src/configure.ac | 7 +++++++ |
15 | 1 file changed, 7 insertions(+) | 15 | 1 file changed, 7 insertions(+) |
16 | 16 | ||
17 | diff --git a/src/configure.ac b/src/configure.ac | 17 | Index: git/src/configure.ac |
18 | index 0ee86ad..64736f0 100644 | 18 | =================================================================== |
19 | --- a/src/configure.ac | 19 | --- git.orig/src/configure.ac |
20 | +++ b/src/configure.ac | 20 | +++ git/src/configure.ac |
21 | @@ -3192,11 +3192,18 @@ AC_TRY_COMPILE([#include <stdio.h>], [int x __attribute__((unused));], | 21 | @@ -3264,11 +3264,18 @@ AC_TRY_COMPILE([#include <stdio.h>], [in |
22 | AC_MSG_RESULT(no)) | 22 | AC_MSG_RESULT(no)) |
23 | 23 | ||
24 | dnl Checks for header files. | 24 | dnl Checks for header files. |
@@ -37,6 +37,3 @@ index 0ee86ad..64736f0 100644 | |||
37 | 37 | ||
38 | AC_HEADER_DIRENT | 38 | AC_HEADER_DIRENT |
39 | 39 | ||
40 | -- | ||
41 | 2.7.4 | ||
42 | |||
diff --git a/meta/recipes-support/vim/vim-tiny_8.2.bb b/meta/recipes-support/vim/vim-tiny_9.0.bb index e4c26d23f6..e4c26d23f6 100644 --- a/meta/recipes-support/vim/vim-tiny_8.2.bb +++ b/meta/recipes-support/vim/vim-tiny_9.0.bb | |||
diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index d57f784da5..6d62bd67af 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc | |||
@@ -1,29 +1,37 @@ | |||
1 | SUMMARY = "Vi IMproved - enhanced vi editor" | 1 | SUMMARY = "Vi IMproved - enhanced vi editor" |
2 | DESCRIPTION = "Vim is a greatly improved version of the good old UNIX editor Vi. Many new features have been added: multi-level undo, syntax highlighting, command line history, on-line help, spell checking, filename completion, block operations, script language, etc. There is also a Graphical User Interface (GUI) available." | ||
2 | SECTION = "console/utils" | 3 | SECTION = "console/utils" |
3 | 4 | ||
5 | HOMEPAGE = "https://www.vim.org/" | ||
6 | BUGTRACKER = "https://github.com/vim/vim/issues" | ||
7 | |||
4 | DEPENDS = "ncurses gettext-native" | 8 | DEPENDS = "ncurses gettext-native" |
5 | # vimdiff doesn't like busybox diff | 9 | # vimdiff doesn't like busybox diff |
6 | RSUGGESTS_${PN} = "diffutils" | 10 | RSUGGESTS_${PN} = "diffutils" |
11 | |||
7 | LICENSE = "vim" | 12 | LICENSE = "vim" |
8 | LIC_FILES_CHKSUM = "file://runtime/doc/uganda.txt;endline=287;md5=a19edd7ec70d573a005d9e509375a99a" | 13 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d1a651ab770b45d41c0f8cb5a8ca930e" |
9 | 14 | ||
10 | SRC_URI = "git://github.com/vim/vim.git \ | 15 | SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ |
11 | file://disable_acl_header_check.patch \ | 16 | file://disable_acl_header_check.patch \ |
12 | file://vim-add-knob-whether-elf.h-are-checked.patch \ | 17 | file://vim-add-knob-whether-elf.h-are-checked.patch \ |
13 | file://0001-src-Makefile-improve-reproducibility.patch \ | 18 | file://0001-src-Makefile-improve-reproducibility.patch \ |
14 | file://no-path-adjust.patch \ | 19 | file://no-path-adjust.patch \ |
15 | file://racefix.patch \ | 20 | " |
16 | " | 21 | |
17 | SRCREV = "98056533b96b6b5d8849641de93185dd7bcadc44" | 22 | PV .= ".2190" |
23 | SRCREV = "6a950da86d7a6eb09d5ebeab17657986420d07ac" | ||
18 | 24 | ||
19 | # Do not consider .z in x.y.z, as that is updated with every commit | 25 | # Do not consider .z in x.y.z, as that is updated with every commit |
20 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+)\.0" | 26 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+)\.0" |
27 | # Ignore that the upstream version .z in x.y.z is always newer | ||
28 | UPSTREAM_VERSION_UNKNOWN = "1" | ||
21 | 29 | ||
22 | S = "${WORKDIR}/git" | 30 | S = "${WORKDIR}/git" |
23 | 31 | ||
24 | VIMDIR = "vim${@d.getVar('PV').split('.')[0]}${@d.getVar('PV').split('.')[1]}" | 32 | VIMDIR = "vim${@d.getVar('PV').split('.')[0]}${@d.getVar('PV').split('.')[1]}" |
25 | 33 | ||
26 | inherit autotools-brokensep update-alternatives mime-xdg | 34 | inherit autotools-brokensep update-alternatives mime-xdg pkgconfig |
27 | 35 | ||
28 | CLEANBROKEN = "1" | 36 | CLEANBROKEN = "1" |
29 | 37 | ||
@@ -32,29 +40,24 @@ do_configure () { | |||
32 | cd src | 40 | cd src |
33 | rm -f auto/* | 41 | rm -f auto/* |
34 | touch auto/config.mk | 42 | touch auto/config.mk |
43 | # git timestamps aren't reliable, so touch the shipped .po files so they aren't regenerated | ||
44 | touch -c po/cs.cp1250.po po/ja.euc-jp.po po/ja.sjis.po po/ko.po po/pl.UTF-8.po po/pl.cp1250.po po/ru.cp1251.po po/sk.cp1250.po po/uk.cp1251.po po/zh_CN.po po/zh_CN.cp936.po po/zh_TW.po | ||
45 | # ru.cp1251.po uses CP1251 rather than cp1251, fix that | ||
46 | sed -i -e s/CP1251/cp1251/ po/ru.cp1251.po | ||
35 | aclocal | 47 | aclocal |
36 | autoconf | 48 | autoconf |
37 | cd .. | 49 | cd .. |
38 | oe_runconf | 50 | oe_runconf |
39 | touch src/auto/configure | 51 | touch src/auto/configure |
40 | touch src/auto/config.mk src/auto/config.h | 52 | touch src/auto/config.mk src/auto/config.h |
53 | # need a native tool, not a target one | ||
54 | ${BUILD_CC} src/po/sjiscorr.c -o src/po/sjiscorr | ||
41 | } | 55 | } |
42 | 56 | ||
43 | do_compile() { | 57 | PACKAGECONFIG ??= "\ |
44 | # We do not support fully / correctly the following locales. Attempting | ||
45 | # to use these with msgfmt in order to update the ".desktop" files exposes | ||
46 | # this problem and leads to the compile failing. | ||
47 | for LOCALE in cs fr ko pl sk zh_CN zh_TW;do | ||
48 | echo -n > src/po/${LOCALE}.po | ||
49 | done | ||
50 | autotools_do_compile | ||
51 | } | ||
52 | |||
53 | #Available PACKAGECONFIG options are gtkgui, acl, x11, tiny | ||
54 | PACKAGECONFIG ??= "" | ||
55 | PACKAGECONFIG += " \ | ||
56 | ${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)} \ | 58 | ${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)} \ |
57 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtkgui', '', d)} \ | 59 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtkgui', '', d)} \ |
60 | nls \ | ||
58 | " | 61 | " |
59 | 62 | ||
60 | PACKAGECONFIG[gtkgui] = "--enable-gui=gtk3,--enable-gui=no,gtk+3" | 63 | PACKAGECONFIG[gtkgui] = "--enable-gui=gtk3,--enable-gui=no,gtk+3" |
@@ -63,6 +66,7 @@ PACKAGECONFIG[x11] = "--with-x,--without-x,xt," | |||
63 | PACKAGECONFIG[tiny] = "--with-features=tiny,--with-features=big,," | 66 | PACKAGECONFIG[tiny] = "--with-features=tiny,--with-features=big,," |
64 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux," | 67 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux," |
65 | PACKAGECONFIG[elfutils] = "--enable-elf-check,,elfutils," | 68 | PACKAGECONFIG[elfutils] = "--enable-elf-check,,elfutils," |
69 | PACKAGECONFIG[nls] = "--enable-nls,--disable-nls,," | ||
66 | 70 | ||
67 | EXTRA_OECONF = " \ | 71 | EXTRA_OECONF = " \ |
68 | --disable-gpm \ | 72 | --disable-gpm \ |
@@ -71,6 +75,7 @@ EXTRA_OECONF = " \ | |||
71 | --disable-netbeans \ | 75 | --disable-netbeans \ |
72 | --disable-desktop-database-update \ | 76 | --disable-desktop-database-update \ |
73 | --with-tlib=ncurses \ | 77 | --with-tlib=ncurses \ |
78 | --with-modified-by='${MAINTAINER}' \ | ||
74 | ac_cv_small_wchar_t=no \ | 79 | ac_cv_small_wchar_t=no \ |
75 | ac_cv_path_GLIB_COMPILE_RESOURCES=no \ | 80 | ac_cv_path_GLIB_COMPILE_RESOURCES=no \ |
76 | vim_cv_getcwd_broken=no \ | 81 | vim_cv_getcwd_broken=no \ |
@@ -83,6 +88,11 @@ EXTRA_OECONF = " \ | |||
83 | STRIP=/bin/true \ | 88 | STRIP=/bin/true \ |
84 | " | 89 | " |
85 | 90 | ||
91 | # Some host distros don't have it, disable consistently | ||
92 | # also disable on dunfell target builds | ||
93 | EXTRA_OECONF_append_class-native = " vim_cv_timer_create=no" | ||
94 | EXTRA_OECONF_append_class-target = " vim_cv_timer_create=no" | ||
95 | |||
86 | do_install() { | 96 | do_install() { |
87 | autotools_do_install | 97 | autotools_do_install |
88 | 98 | ||
diff --git a/meta/recipes-support/vim/vim_8.2.bb b/meta/recipes-support/vim/vim_9.0.bb index 709b6ddb55..709b6ddb55 100644 --- a/meta/recipes-support/vim/vim_8.2.bb +++ b/meta/recipes-support/vim/vim_9.0.bb | |||