From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A28A515802F for ; Fri, 31 Mar 2023 18:05:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 133DDE0830; Fri, 31 Mar 2023 18:05:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ECF04E0830 for ; Fri, 31 Mar 2023 18:05:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F1A02340FF6 for ; Fri, 31 Mar 2023 18:05:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 63A8CA13 for ; Fri, 31 Mar 2023 18:05:41 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1680285894.5770020d8b47aa058d907686f75b4d1680815b30.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/files/, app-editors/neovim/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/neovim/files/neovim-0.8-msgpack-6.0.0-fix.patch app-editors/neovim/neovim-0.8.2.ebuild app-editors/neovim/neovim-0.8.3.ebuild X-VCS-Directories: app-editors/neovim/ app-editors/neovim/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5770020d8b47aa058d907686f75b4d1680815b30 X-VCS-Branch: master Date: Fri, 31 Mar 2023 18:05:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c996fa26-5a7d-4113-8c1a-2a9316da1907 X-Archives-Hash: 3494af0e96f98d733ff35076243bd7c3 commit: 5770020d8b47aa058d907686f75b4d1680815b30 Author: brahmajit das gmail com> AuthorDate: Fri Mar 31 17:07:20 2023 +0000 Commit: Sam James gentoo 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 gmail.com> Closes: https://github.com/gentoo/gentoo/pull/30422 Signed-off-by: Sam James 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 +--- 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