1 files changed, 37 insertions, 19 deletions
diff --git a/development/neovim/neovim.SlackBuild b/development/neovim/neovim.SlackBuild
index 644750fa04..09b6b4a417 100644
--- a/development/neovim/neovim.SlackBuild
+++ b/development/neovim/neovim.SlackBuild
@@ -3,6 +3,8 @@
 # SlackBuild script for neovim
 
 # Copyright 2014-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2021-2022 Ruben Schuller <sb@rbn.im>
+# Copyright 2023-2024 Alexander Verbovetsky, Moscow, Russia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,8 +27,11 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=neovim
-VERSION=${VERSION:-0.5.0}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.9.5}
+LuaJIT=03c31124cc3b521ef54fe398e10fa55660a5057d
+luv="1.45.0-0"
+luacompat53="0.9"
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -38,9 +43,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -71,7 +73,19 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+
+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 . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -79,17 +93,23 @@ 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 {} \;
 
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIBUV_LIBRARY=/usr/lib${LIBDIRSUFFIX}/libuv.so \
+export NVIM_LOG_FILE=$TMP/$PRGNAM-$VERSION/log
+make \
+  CMAKE_INSTALL_PREFIX=/usr \
+  CMAKE_EXTRA_FLAGS=" \
     -DCMAKE_INSTALL_MANDIR=/usr/man \
-    -DCMAKE_BUILD_TYPE=Release \
-     ..
-  make install DESTDIR=$PKG
-cd ..
+    -DCMAKE_C_FLAGS:STRING=\"$SLKCFLAGS\"" \
+  BUNDLED_CMAKE_FLAG=" \
+    -DUSE_EXISTING_SRC_DIR=ON \
+    -DUSE_BUNDLED=OFF \
+    -DUSE_BUNDLED_LUV=ON \
+    -DUSE_BUNDLED_LUAJIT=ON" \
+  CMAKE_BUILD_TYPE=Release
+make install DESTDIR=$PKG
+
+rmdir $PKG/usr/lib${LIBDIRSUFFIX}/nvim $PKG/usr/lib${LIBDIRSUFFIX}
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -98,9 +118,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  CONTRIBUTING.md README.md \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CONTRIBUTING.md README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install