gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 17:09:10 -07:00
Code Issues Projects Releases Wiki Activity

app-editors/neovim: Fix build failure with msgpack-6.0.0

Browse Source 
Closes: https://bugs.gentoo.org/903629
Signed-off-by: brahmajit das <brahmajit.xyz@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30422
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
brahmajit das
2023-03-31 22:37:20 +05:30
committed by Sam James
parent ea90114910
commit 5770020d8b
3 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app-editors/neovim/files/neovim-0.8-msgpack-6.0.0-fix.patch Normal file
View File

@@ -0,0 +1,26 @@
# https://github.com/neovim/neovim/commit/46c4cbced567f5f05f2c95b91cd90084ea8b5528
# Closes: https://bugs.gentoo.org/903629
# Contributed by Olivier Huber <oli.huber@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)

1
app-editors/neovim/neovim-0.8.2.ebuild
View File

@@ -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

1
app-editors/neovim/neovim-0.8.3.ebuild
View File

@@ -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