From 33b52a63e93e85b49399540cffdb72be9c2aa6db Mon Sep 17 00:00:00 2001 From: Shane Peelar Date: Thu, 2 Feb 2017 09:23:08 -0500 Subject: [PATCH 1/2] vim: Update Vim to 8.0.069 Vim stable is at version 8 now Signed-off-by: Shane Peelar --- utils/vim/Makefile | 8 +++--- utils/vim/patches/001-compile.patch | 41 ----------------------------- 2 files changed, 4 insertions(+), 45 deletions(-) delete mode 100644 utils/vim/patches/001-compile.patch diff --git a/utils/vim/Makefile b/utils/vim/Makefile index 2e9f96a8b6..4961c8a32e 100644 --- a/utils/vim/Makefile +++ b/utils/vim/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vim -PKG_VERSION:=7.4 -PKG_RELEASE:=3 -VIMVER:=74 +PKG_VERSION:=8.0.069 +PKG_RELEASE:=4 +VIMVER:=80 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.vim.org/pub/vim/unix/ -PKG_MD5SUM:=607e135c559be642f210094ad023dc65 +PKG_MD5SUM:=457543a7754b0d3c1c0aa4d4c3bb4070 PKG_MAINTAINER:=Marko Ratkaj PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)$(VIMVER) diff --git a/utils/vim/patches/001-compile.patch b/utils/vim/patches/001-compile.patch deleted file mode 100644 index 6740f1a8e4..0000000000 --- a/utils/vim/patches/001-compile.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/src/auto/configure -+++ b/src/auto/configure -@@ -12294,37 +12294,8 @@ _ACEOF - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking uint32_t is 32 bits" >&5 - $as_echo_n "checking uint32_t is 32 bits... " >&6; } --if test "$cross_compiling" = yes; then : -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot check uint32_t when cross-compiling." >&5 --$as_echo "$as_me: WARNING: cannot check uint32_t when cross-compiling." >&2;} --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --#ifdef HAVE_STDINT_H --# include --#endif --#ifdef HAVE_INTTYPES_H --# include --#endif --main() { -- uint32_t nr1 = (uint32_t)-1; -- uint32_t nr2 = (uint32_t)0xffffffffUL; -- if (sizeof(uint32_t) != 4 || nr1 != 0xffffffffUL || nr2 + 1 != 0) exit(1); -- exit(0); --} --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: assuming ok" >&5 - $as_echo "ok" >&6; } --else -- as_fn_error "WRONG! uint32_t not defined correctly." "$LINENO" 5 --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- -- - - bcopy_test_prog=' - #include "confdefs.h" From a5218a505c67b4d942bcca3773d861362b00f7eb Mon Sep 17 00:00:00 2001 From: Shane Peelar Date: Thu, 2 Feb 2017 14:38:51 -0500 Subject: [PATCH 2/2] vim: Add "fuller" package The fuller package is built with --with-features=big and contains the files that would normally live in /usr/share/vim/, including syntax highlighting and colours. This package supports truecolor support in terminals. Signed-off-by: Shane Peelar --- utils/vim/Makefile | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/utils/vim/Makefile b/utils/vim/Makefile index 4961c8a32e..4f78d777d6 100644 --- a/utils/vim/Makefile +++ b/utils/vim/Makefile @@ -41,6 +41,12 @@ define Package/vim-full TITLE+= (Normal) endef + +define Package/vim-fuller + $(call Package/vim/Default) + TITLE+= (Big) +endef + define Package/vim-runtime $(call Package/vim/Default) TITLE+= (runtime files) @@ -78,6 +84,12 @@ define Package/vim-full/description (Normal build) endef + +define Package/vim-fuller/description + Vim is an almost compatible version of the UNIX editor Vi. + (Big build) +endef + define Package/vim-runtime/description Vim is an almost compatible version of the UNIX editor Vi. (Runtime files) @@ -138,6 +150,20 @@ define Build/Compile/vim-full endef endif +ifneq ($(CONFIG_PACKAGE_vim-fuller),) +define Build/Compile/vim-fuller + $(call Build/Configure/Default, \ + --with-features=big \ + --enable-multibyte \ + ) + +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" all + $(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(PKG_BUILD_DIR)/vim_big +endef +endif + + + ifneq ($(CONFIG_PACKAGE_xxd),) define Build/Compile/xxd +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ @@ -155,6 +181,7 @@ endef define Build/Compile $(call Build/Compile/vim) $(call Build/Compile/vim-full) +$(call Build/Compile/vim-fuller) $(call Build/Compile/vim-runtime) $(call Build/Compile/xxd) endef @@ -173,6 +200,17 @@ define Package/vim-full/install $(INSTALL_CONF) ./files/vimrc.full $(1)/usr/share/vim/vimrc endef + +define Package/vim-fuller/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/vim_big $(1)/usr/bin/vim + $(INSTALL_DIR) $(1)/usr/share/vim + $(CP) -r $(PKG_INSTALL_DIR)/usr/share/vim/vim$(VIMVER) $(1)/usr/share/vim + $(INSTALL_CONF) ./files/vimrc.full $(1)/usr/share/vim/vimrc +endef + + + define Package/vim-runtime/install $(CP) $(PKG_INSTALL_DIR)/* $(1) rm -rf $(1)/usr/share/vim/vim$(VIMVER)/doc @@ -189,6 +227,7 @@ endef $(eval $(call BuildPackage,vim)) $(eval $(call BuildPackage,vim-full)) +$(eval $(call BuildPackage,vim-fuller)) $(eval $(call BuildPackage,vim-runtime)) $(eval $(call BuildPackage,vim-help)) $(eval $(call BuildPackage,xxd))