diff --git a/development/neovim/neovim.SlackBuild b/development/neovim/neovim.SlackBuild index 6dc2ff0b16..d94202d098 100644 --- a/development/neovim/neovim.SlackBuild +++ b/development/neovim/neovim.SlackBuild @@ -27,7 +27,10 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=neovim -VERSION=${VERSION:-0.9.0} +VERSION=${VERSION:-0.9.1} +LuaJIT=505e2c03de35e2718eef0d2d3660712e06dadf1f +luv=093a977b82077591baefe1e880d37dfa2730bd54 +luacompat53="0.9" BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -70,14 +73,18 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -install -Dm644 $CWD/LuaJIT-505e2c03de35e2718eef0d2d3660712e06dadf1f.tar.gz \ - .deps/build/downloads/luajit/505e2c03de35e2718eef0d2d3660712e06dadf1f.tar.gz -install -Dm644 $CWD/luv-093a977b82077591baefe1e880d37dfa2730bd54.tar.gz \ - .deps/build/downloads/luv/093a977b82077591baefe1e880d37dfa2730bd54.tar.gz -install -Dm644 $CWD/lua-compat-5.3-0.9.tar.gz \ - .deps/build/downloads/lua-compat-5.3/v0.9.tar.gz +mkdir -p $PRGNAM-$VERSION/.deps/build/src + +cd $PRGNAM-$VERSION/.deps/build/src +tar xvf $CWD/LuaJIT-$LuaJIT.tar.gz +mv LuaJIT-$LuaJIT luajit +tar xvf $CWD/luv-$luv.tar.gz +mv luv-$luv luv +tar xvf $CWD/lua-compat-5.3-$luacompat53.tar.gz +mv lua-compat-5.3-$luacompat53 lua-compat-5.3 + +cd $TMP/$PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -86,12 +93,14 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +export NVIM_LOG_FILE=$TMP/$PRGNAM-$VERSION/log make \ CMAKE_INSTALL_PREFIX=/usr \ CMAKE_EXTRA_FLAGS=" \ -DCMAKE_INSTALL_MANDIR=/usr/man \ -DCMAKE_C_FLAGS:STRING=\"$SLKCFLAGS\"" \ BUNDLED_CMAKE_FLAG=" \ + -DUSE_EXISTING_SRC_DIR=ON \ -DUSE_BUNDLED=OFF \ -DUSE_BUNDLED_LUV=ON \ -DUSE_BUNDLED_LUAJIT=ON" \ diff --git a/development/neovim/neovim.info b/development/neovim/neovim.info index d3280c818d..3e5bff556b 100644 --- a/development/neovim/neovim.info +++ b/development/neovim/neovim.info @@ -1,11 +1,11 @@ PRGNAM="neovim" -VERSION="0.9.0" +VERSION="0.9.1" HOMEPAGE="https://neovim.io" -DOWNLOAD="https://github.com/neovim/neovim/archive/v0.9.0/neovim-0.9.0.tar.gz \ +DOWNLOAD="https://github.com/neovim/neovim/archive/v0.9.1/neovim-0.9.1.tar.gz \ https://github.com/LuaJIT/LuaJIT/archive/505e2c0/LuaJIT-505e2c03de35e2718eef0d2d3660712e06dadf1f.tar.gz \ https://github.com/luvit/luv/archive/093a977/luv-093a977b82077591baefe1e880d37dfa2730bd54.tar.gz \ https://github.com/keplerproject/lua-compat-5.3/archive/v0.9/lua-compat-5.3-0.9.tar.gz" -MD5SUM="86b762639f29ee92d37f8ec0f78b7074 \ +MD5SUM="e7677dbba956c71508cf298a9f4e11ac \ bbf308354cf8f67d821c32adbfe52a50 \ 9f6cd99a215ef21ef93c273e4b664066 \ 7c0530123479804e40971b069ea6b0da"