On Fri Dec 01, 2023 at 11:14:46AM +0000, Laurence Tratt wrote:
> At last, neovim-qt-0.2.18 is out! I've been testing this for a couple of
> days and haven't noticed any regressions. Note that we can now all of
> the patches for this port, as they are part of 0.2.18.
>
>
> Laurie
>
>
> diff --git editors/neovim-qt/Makefile editors/neovim-qt/Makefile
> index 727b5258375..83732a979af 100644
> --- editors/neovim-qt/Makefile
> +++ editors/neovim-qt/Makefile
> @@ -2,7 +2,7 @@ COMMENT = Qt5 GUI front-end for neovim
>
> GH_ACCOUNT = equalsraf
> GH_PROJECT = neovim-qt
> -GH_TAGNAME = v0.2.17
> +GH_TAGNAME = v0.2.18
>
> CATEGORIES = editors
>
> @@ -25,6 +25,7 @@ MODPY_RUNDEP = Yes
> BUILD_DEPENDS = editors/neovim
>
> LIB_DEPENDS = devel/msgpack \
> + x11/qt5/qtbase \
This is already present and comes from the qt5 module.
Checkout `make show=LIB_DEPENDS`
OK without the LIB_DEPENDS change.
> x11/qt5/qtsvg
>
> RUN_DEPENDS = devel/desktop-file-utils \
> @@ -34,6 +35,7 @@ RUN_DEPENDS = devel/desktop-file-utils \
>
> CONFIGURE_ARGS = -DUSE_SYSTEM_MSGPACK=On \
> -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=On
> +CONFIGURE_ENV = QT_DIR=${LOCALBASE}/lib/qt5/cmake/Qt5/
>
> TEST_IS_INTERACTIVE = X11
>
> diff --git editors/neovim-qt/distinfo editors/neovim-qt/distinfo
> index 13a1ccea2a3..b3cc86e590a 100644
> --- editors/neovim-qt/distinfo
> +++ editors/neovim-qt/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (neovim-qt-0.2.17.tar.gz) =
> rFOMLl1jVy3QVDwT+vtNQo5nEo6mdkZ/zaaJZbKqzaE=
> -SIZE (neovim-qt-0.2.17.tar.gz) = 1076230
> +SHA256 (neovim-qt-0.2.18.tar.gz) =
> seHgGZRuyxBrOuqONfxuNn0u/ORMocFZmizN+zWihjU=
> +SIZE (neovim-qt-0.2.18.tar.gz) = 1078273
> diff --git editors/neovim-qt/patches/patch-src_gui_input_cpp
> editors/neovim-qt/patches/patch-src_gui_input_cpp
> deleted file mode 100644
> index 7c50d217540..00000000000
> --- editors/neovim-qt/patches/patch-src_gui_input_cpp
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -From 0dfa20e481edbc582caa29c608195d3a206f21d7 Mon Sep 17 00:00:00 2001
> -From: John Gehrig <jgeh...@users.noreply.github.com>
> -Date: Tue, 21 Feb 2023 21:51:46 -0500
> -Subject: [PATCH] Issue 999: Replace Issue 728 with key remap
> -
> -Many users find the shift-space and shift-backspace behavior in terminal
> -frustrating. However, some users still want to map these sequences.
> -
> -Applying the runtime re-map workaround, since Neovim is unable to fix
> -this issue upstream. Neovim still does not report `:terminal` mode.
> -
> -Index: src/gui/input.cpp
> ---- src/gui/input.cpp.orig
> -+++ src/gui/input.cpp
> -@@ -191,13 +191,6 @@ QString convertKey(const QKeyEvent& ev) noexcept
> - const QMap<int, QString>& specialKeys { GetSpecialKeysMap() };
> -
> - if (specialKeys.contains(key)) {
> -- // Issue#728: Shift + Space inserts ;2u in `:terminal`.
> Incorrectly sent as <S-Space>.
> -- // Issue#259: Shift + BackSpace inserts 7;2u in `:terminal`.
> Incorrectly sent as <S-BS>.
> -- if (key == Qt::Key_Space
> -- || key == Qt::Key_Backspace) {
> -- mod &= ~Qt::ShiftModifier;
> -- }
> --
> - return ToKeyString(GetModifierPrefix(mod),
> specialKeys.value(key));
> - }
> -
> diff --git
> editors/neovim-qt/patches/patch-src_gui_runtime_plugin_nvim_gui_shim_vim
> editors/neovim-qt/patches/patch-src_gui_runtime_plugin_nvim_gui_shim_vim
> deleted file mode 100644
> index 1c15c08ef76..00000000000
> --- editors/neovim-qt/patches/patch-src_gui_runtime_plugin_nvim_gui_shim_vim
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -From 0dfa20e481edbc582caa29c608195d3a206f21d7 Mon Sep 17 00:00:00 2001
> -From: John Gehrig <jgeh...@users.noreply.github.com>
> -Date: Tue, 21 Feb 2023 21:51:46 -0500
> -Subject: [PATCH] Issue 999: Replace Issue 728 with key remap
> -
> -Many users find the shift-space and shift-backspace behavior in terminal
> -frustrating. However, some users still want to map these sequences.
> -
> -Applying the runtime re-map workaround, since Neovim is unable to fix
> -this issue upstream. Neovim still does not report `:terminal` mode.
> -
> -Index: src/gui/runtime/plugin/nvim_gui_shim.vim
> ---- src/gui/runtime/plugin/nvim_gui_shim.vim.orig
> -+++ src/gui/runtime/plugin/nvim_gui_shim.vim
> -@@ -278,3 +278,16 @@ function! s:GuiWindowOpacityCommand(value) abort
> - call rpcnotify(0, 'Gui', 'WindowOpacity', a:value)
> - endfunction
> - command! -nargs=1 GuiWindowOpacity call s:GuiWindowOpacityCommand("<args>")
> -+
> -+" Issue 728: Terminal reports ';2u' for key sequences such as <S-Space>
> -+" Force-mapping keys is a less-than ideal workaround, but it is the only
> -+" option that appeases everyone. Neovim does not report terminal mode.
> -+"
> -+" See issues:
> -+" - https://github.com/neovim/neovim/issues/20325
> -+" - https://github.com/neovim/neovim/issues/19265
> -+" - https://github.com/equalsraf/neovim-qt/issues/999
> -+tnoremap <S-Space> <Space>
> -+tnoremap <C-Space> <Space>
> -+tnoremap <S-Backspace> <BackSpace>
> -+tnoremap <C-Backspace> <Backspace>
> diff --git editors/neovim-qt/patches/patch-test_tst_input_common_cpp
> editors/neovim-qt/patches/patch-test_tst_input_common_cpp
> deleted file mode 100644
> index f00a7d15347..00000000000
> --- editors/neovim-qt/patches/patch-test_tst_input_common_cpp
> +++ /dev/null
> @@ -1,50 +0,0 @@
> -From 0dfa20e481edbc582caa29c608195d3a206f21d7 Mon Sep 17 00:00:00 2001
> -From: John Gehrig <jgeh...@users.noreply.github.com>
> -Date: Tue, 21 Feb 2023 21:51:46 -0500
> -Subject: [PATCH] Issue 999: Replace Issue 728 with key remap
> -
> -Many users find the shift-space and shift-backspace behavior in terminal
> -frustrating. However, some users still want to map these sequences.
> -
> -Applying the runtime re-map workaround, since Neovim is unable to fix
> -this issue upstream. Neovim still does not report `:terminal` mode.
> -
> -Index: test/tst_input_common.cpp
> ---- test/tst_input_common.cpp.orig
> -+++ test/tst_input_common.cpp
> -@@ -15,8 +15,6 @@ private slots:
> - void CapsLockIgnored() noexcept;
> - void AltGrAloneIgnored() noexcept;
> - void AltGrKeyEventWellFormed() noexcept;
> -- void ShiftSpaceWellFormed() noexcept;
> -- void ShiftBackSpaceWellFormed() noexcept;
> -
> - // Mouse Input
> - void MouseLeftClick() noexcept;
> -@@ -135,26 +133,6 @@ void TestInputCommon::CapsLockIgnored() noexcept
> -
> - QKeyEvent evMetaCapsLock{ QEvent::KeyPress, Qt::Key_CapsLock,
> Qt::MetaModifier};
> - QCOMPARE(NeovimQt::Input::convertKey(evMetaCapsLock), QString{ "" });
> --}
> --
> --void TestInputCommon::ShiftSpaceWellFormed() noexcept
> --{
> -- // Issue#728: Shift + Space inserts ;2u in `:terminal`, mode sent as
> <S-Space>.
> -- QKeyEvent evShift{ QEvent::KeyPress, Qt::Key_Shift, Qt::ShiftModifier,
> "" };
> -- QCOMPARE(NeovimQt::Input::convertKey(evShift), QString{ "" });
> --
> -- QKeyEvent evShiftSpace{ QEvent::KeyPress, Qt::Key_Space,
> Qt::ShiftModifier, " " };
> -- QCOMPARE(NeovimQt::Input::convertKey(evShiftSpace), QString{ "<Space>"
> });
> --}
> --
> --void TestInputCommon::ShiftBackSpaceWellFormed() noexcept
> --{
> -- // Issue#259: Shift + BackSpace inserts 7;2u in `:terminal`, mode sent
> as <S-BS>.
> -- QKeyEvent evShift{ QEvent::KeyPress, Qt::Key_Shift, Qt::ShiftModifier,
> "" };
> -- QCOMPARE(NeovimQt::Input::convertKey(evShift), QString{ "" });
> --
> -- QKeyEvent evShiftBackSpace{ QEvent::KeyPress, Qt::Key_Backspace,
> Qt::ShiftModifier, "\b" };
> -- QCOMPARE(NeovimQt::Input::convertKey(evShiftBackSpace), QString{ "<BS>"
> });
> - }
> -
> - void TestInputCommon::MouseLeftClick() noexcept
>
