commit: 5770020d8b47aa058d907686f75b4d1680815b30 Author: brahmajit das <brahmajit.xyz <AT> gmail <DOT> com> AuthorDate: Fri Mar 31 17:07:20 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Mar 31 18:04:54 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5770020d
app-editors/neovim: Fix build failure with msgpack-6.0.0 Closes: https://bugs.gentoo.org/903629 Signed-off-by: brahmajit das <brahmajit.xyz <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/30422 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/neovim-0.8-msgpack-6.0.0-fix.patch | 26 ++++++++++++++++++++++ app-editors/neovim/neovim-0.8.2.ebuild | 1 + app-editors/neovim/neovim-0.8.3.ebuild | 1 + 3 files changed, 28 insertions(+) diff --git a/app-editors/neovim/files/neovim-0.8-msgpack-6.0.0-fix.patch b/app-editors/neovim/files/neovim-0.8-msgpack-6.0.0-fix.patch new file mode 100644 index 000000000000..ce5f7bb86dc4 --- /dev/null +++ b/app-editors/neovim/files/neovim-0.8-msgpack-6.0.0-fix.patch @@ -0,0 +1,26 @@ +# https://github.com/neovim/neovim/commit/46c4cbced567f5f05f2c95b91cd90084ea8b5528 +# Closes: https://bugs.gentoo.org/903629 +# Contributed by Olivier Huber <oli.hu...@gmail.com> +--- a/cmake/FindMsgpack.cmake ++++ b/cmake/FindMsgpack.cmake +@@ -26,18 +26,8 @@ + set(MSGPACK_VERSION_STRING) + endif() + +-if(MSVC) +- # The import library for the msgpack DLL has a different name +- list(APPEND MSGPACK_NAMES msgpackc_import) +-else() +- list(APPEND MSGPACK_NAMES msgpackc msgpack) +-endif() +- +-find_library(MSGPACK_LIBRARY NAMES ${MSGPACK_NAMES} +- # Check each directory for all names to avoid using headers/libraries from +- # different places. +- NAMES_PER_DIR +- HINTS ${PC_MSGPACK_LIBDIR} ${PC_MSGPACK_LIBRARY_DIRS}) ++find_library(MSGPACK_LIBRARY NAMES msgpackc msgpack msgpackc_import msgpack-c ++ NAMES_PER_DIR) + + mark_as_advanced(MSGPACK_INCLUDE_DIR MSGPACK_LIBRARY) + diff --git a/app-editors/neovim/neovim-0.8.2.ebuild b/app-editors/neovim/neovim-0.8.2.ebuild index 30a9cc0855a1..68e7c6e9f33e 100644 --- a/app-editors/neovim/neovim-0.8.2.ebuild +++ b/app-editors/neovim/neovim-0.8.2.ebuild @@ -71,6 +71,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-0.8-cmake_lua_version.patch" "${FILESDIR}/${PN}-0.8-cmake-darwin.patch" + "${FILESDIR}/${PN}-0.8-msgpack-6.0.0-fix.patch" ) if [[ ${PV} != 9999 ]]; then diff --git a/app-editors/neovim/neovim-0.8.3.ebuild b/app-editors/neovim/neovim-0.8.3.ebuild index 7accf336c721..4a155f092263 100644 --- a/app-editors/neovim/neovim-0.8.3.ebuild +++ b/app-editors/neovim/neovim-0.8.3.ebuild @@ -71,6 +71,7 @@ BDEPEND+=" PATCHES=( "${FILESDIR}/${PN}-0.8-cmake_lua_version.patch" "${FILESDIR}/${PN}-0.8-cmake-darwin.patch" + "${FILESDIR}/${PN}-0.8-msgpack-6.0.0-fix.patch" ) if [[ ${PV} != 9999 ]]; then
