From 55af6185f667e3ba4dfe117c377c0fcfd02b651d Mon Sep 17 00:00:00 2001 From: PulkoMandy Date: Sat, 29 Jul 2023 13:49:01 +0200 Subject: [PATCH] vim: switch to Python 3.10 No reason to remain on Python 3.9, which is built without readline support currently. --- app-editors/vim/vim-9.0.1479.recipe | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app-editors/vim/vim-9.0.1479.recipe b/app-editors/vim/vim-9.0.1479.recipe index 9076be21f..f0968f52d 100644 --- a/app-editors/vim/vim-9.0.1479.recipe +++ b/app-editors/vim/vim-9.0.1479.recipe @@ -12,7 +12,7 @@ way, called evim or Easy Vim." HOMEPAGE="https://www.vim.org/" COPYRIGHT="1991-2023 Bram Moleenar et al." LICENSE="Vim" -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/vim/vim/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="2765bec0b7e1a1312a80d295762ebe27fd0bdde60744a1e4962a53efa70b72bb" SOURCE_FILENAME="vim-$portVersion.tar.gz" @@ -27,6 +27,8 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then commandBinDir=$prefix/bin fi +pythonVersion=3.10 + PROVIDES=" vim$secondaryArchSuffix = $portVersion cmd:ex$commandSuffix = $portVersion @@ -46,7 +48,7 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - cmd:python3 + cmd:python$pythonVersion lib:libiconv$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libncurses$secondaryArchSuffix >= 6 @@ -77,7 +79,7 @@ BUILD_PREREQUIRES=" cmd:make # cmd:perl cmd:pkg_config$secondaryArchSuffix - cmd:python3 + cmd:python$pythonVersion cmd:ruby cmd:sed " @@ -91,7 +93,7 @@ BUILD() autoconf export CFLAGS="\ - `pkg-config --cflags python3` \ + `pkg-config --cflags python-$pythonVersion` \ -fPIC" # CLI ------------------------------------------- @@ -107,7 +109,8 @@ BUILD() --enable-cscope \ --enable-rubyinterp=dynamic \ --with-compiledby=HaikuPorts \ - --enable-python3interp=dynamic + --enable-python3interp=dynamic \ + --with-python3-command=python$pythonVersion # --enable-luainterp=dynamic \ currently broken # --enable-tclinterp=dynamic \ # --enable-perlinterp=dynamic not dynamic yet @@ -125,7 +128,8 @@ BUILD() --enable-cscope \ --enable-rubyinterp=dynamic \ --with-compiledby=HaikuPorts \ - --enable-python3interp=dynamic + --enable-python3interp=dynamic \ + --with-python3-command=python$pythonVersion # --enable-luainterp=dynamic \ currently broken # --enable-tclinterp=dynamic \ # --enable-perlinterp=dynamic not dynamic yet