From ebc282ef4dfa408accac685565b8ee5f6faec119 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Feb 2023 09:56:54 +0000 Subject: gentoo auto-resync : 12:02:2023 - 09:56:54 --- app-editors/neovim/Manifest | 10 ++-- .../neovim/files/neovim-0.8-cmake-darwin.patch | 65 ++++++++++++++++++++++ .../files/neovim-0.8-cmake_lua_version.patch | 11 ++++ .../neovim/files/neovim-9999-cmake-darwin.patch | 62 ++------------------- .../files/neovim-9999-cmake_lua_version.patch | 12 ++-- app-editors/neovim/neovim-0.8.2.ebuild | 4 +- app-editors/neovim/neovim-0.8.3.ebuild | 4 +- 7 files changed, 97 insertions(+), 71 deletions(-) create mode 100644 app-editors/neovim/files/neovim-0.8-cmake-darwin.patch create mode 100644 app-editors/neovim/files/neovim-0.8-cmake_lua_version.patch (limited to 'app-editors/neovim') diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest index 7159e18aaf0c..82fe26d2eb1f 100644 --- a/app-editors/neovim/Manifest +++ b/app-editors/neovim/Manifest @@ -1,10 +1,12 @@ +AUX neovim-0.8-cmake-darwin.patch 2938 BLAKE2B eea54402913fb3c1b2aa5b1acc1d307f2b43ed3fb18b489f8341becc281280417222c2996cb5e353a6fb0c42792184c65f670cae931eb08356dc0659e8fcd7e6 SHA512 cfa0719bf069dd1eca885df658b9722b7701a78afc9a498df4a1e868f8bb8e1eb3c5f990003901bd3ed20a29d73d644ff7438f024b43217b90f9a92f9e88bc2a +AUX neovim-0.8-cmake_lua_version.patch 433 BLAKE2B bf24bad4c0e0f7f902172e35771ff8d2fdadbaa14460b0757f0a3ae5e8be083da6149a7025c70cf5de3f6fb853dc2563d0b83891dabcf18a7745a699b6173e17 SHA512 245e5427a79d7ab3cbea66ee2b27aee5020ae9db2784f2aa3945773bbff629c721da1dc562b0142e9e870e159be888457893d253339cf2f5988c5c0e63ec4973 AUX neovim-0.8.0-cmake-release-type.patch 1087 BLAKE2B a3cad7ee2803fe189200eea597aaaf5f45f4306c53b8e69e3c2ccc93ec64b52c1a60214c41033a1d3dc50b907b14faeb49eaf50c586855448ba02e82495336b3 SHA512 474f23acf6e8f41b954eec0fa2d52d4fde4712058d95b4d93a975374af8db9239d69c1c720384c1625cdf521e50d7da78f7bf802d1e1e60866fc45ab0d07a4c1 -AUX neovim-9999-cmake-darwin.patch 2938 BLAKE2B eea54402913fb3c1b2aa5b1acc1d307f2b43ed3fb18b489f8341becc281280417222c2996cb5e353a6fb0c42792184c65f670cae931eb08356dc0659e8fcd7e6 SHA512 cfa0719bf069dd1eca885df658b9722b7701a78afc9a498df4a1e868f8bb8e1eb3c5f990003901bd3ed20a29d73d644ff7438f024b43217b90f9a92f9e88bc2a -AUX neovim-9999-cmake_lua_version.patch 433 BLAKE2B bf24bad4c0e0f7f902172e35771ff8d2fdadbaa14460b0757f0a3ae5e8be083da6149a7025c70cf5de3f6fb853dc2563d0b83891dabcf18a7745a699b6173e17 SHA512 245e5427a79d7ab3cbea66ee2b27aee5020ae9db2784f2aa3945773bbff629c721da1dc562b0142e9e870e159be888457893d253339cf2f5988c5c0e63ec4973 +AUX neovim-9999-cmake-darwin.patch 508 BLAKE2B b0321cda6e590b7f89243231dd96c629510a866dbafdd1bbb28932df96ae8302d031515db67c85821fe85a612ba87d45a934ee628ba9d98dff6c55d9c3427173 SHA512 bdac3bc071f15e196d150c0367679afe64c759384aae9ddce06987dafa458d9c0820fcd5c098ea67edc5c3970473a402a12b36e94a5a1fa6ea8883d4be9c98c2 +AUX neovim-9999-cmake_lua_version.patch 583 BLAKE2B 085ef029e0945e410724c586f7a9f0e679af967bfe1d36cb2c4fac7579697f4d1473ef62ddbe9770bb6ef79130a6c5f0d81d3918334b5e3ca83cb951bfb547f5 SHA512 e29fbc7198b71ea8804a1676da6e9e0b3e42d436c1a280fc83dd5e932b490d5210c4cc46639d7592ab3b98ba82d5b1f8046650bc3cdcf53193f8298481611d47 AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a DIST neovim-0.8.2.tar.gz 11401444 BLAKE2B 2b652e98fa68c64f547777396726b80c28493841f2ec5acc01ef5dd659f0babce0baf3d5575cec1d08dd924b1855b21f13b75d2de9d117fcc125b1ec7945376e SHA512 f6c9ad09618c9f8ebb4fe522f55fd3381cc4b6d079d912a0d2ef6ca5f48ed6c4c66805c14695469e2b3d2be2266a9b60e5fc698116cd655fd92ef0f4705fdbb2 DIST neovim-0.8.3.tar.gz 11406282 BLAKE2B 67f4d4d1857e4c0416639dd0986f34b3842883ef48b68d90704472b40f1f064798f1f5f3c29e485f04ef8b2ed387132549442e86624b43f2ababff05bc477312 SHA512 0ecf60b564a323eb95eb2e67f7dc7e1c1e7bfc70b08466a66eb668d1b75a7362ca42901cd5a64fda22292375e2921ba61c299ac846f820ac146dc55426813eb8 -EBUILD neovim-0.8.2.ebuild 3342 BLAKE2B 09ea1bcb11aced98fa9e7aded0c212a0c0978316f3adc1a2119ec32d15d0d059ea05e11adc3cd064ea24928b48bf1ff2d26c77399391efe2327b9c7f016b2827 SHA512 63768f48d8cbd4e72f13410b68d9718337b60f36b193e408d981ae051e835be41a953a41ff6210cd0c188253ea7fb63ba9c9235ed1ebe331fe825bd97ecea4db -EBUILD neovim-0.8.3.ebuild 3345 BLAKE2B d834d7fdca30070d16b1636ee129e5e733a58fdd701807da03e1f4f66c1512822e364d2ea099197fc19b7b2ac95297efa5f000f0576ae80de4b68c731b8e73a2 SHA512 8fd60aea8285e0d72786aeb3c39fc049b77912b62963bad2c577425818661d3a03862a442a8921d0df7ff5c184099cf3a95579199cdcb7fe0ddb21cce07a1705 +EBUILD neovim-0.8.2.ebuild 3340 BLAKE2B cc1e2fafa0cd286d3b26a58d33aae1880ced810143ea33b1e0e06c14d05c3c9df4438036f57eeb4dfb8acb60194c0d092ddbf604c5a3ae6c2050795f9c61439c SHA512 fa49213beb2f07dfaa40ad442c8addbbc966a802c3e578fdec69ed4ddf8521e847f2b9b14cb6c5573df2fed53c5fa660dadc1ea71410a7f32e2af0a54603ae33 +EBUILD neovim-0.8.3.ebuild 3343 BLAKE2B 289506c8c375b8119baa58e78db4ac9531f63daf0f1c555930466f25c0a174efb9d5ffb153c9d1c7245576578de8ddf921637f2bcabdf6964ab617968d09260a SHA512 ab200b861f995fa1554ec7a7be423bdaeea4377b2788b4c11807d6c0c94680a47909f2783fd7aa8566462e00a0b77eef14674ee96faeabc26cd35ba2ca879133 EBUILD neovim-9999.ebuild 3345 BLAKE2B 99383cf0fc60f7b3a26d5ecf0764c62ec0e915543527a946f5b87ee2b187331698f3cf121d9318d9dc5f3a323b75dc749331c8b43392f9dd631f768fa4754c43 SHA512 362e23b5dd98a03593ffabae9dc7174a6c7f5735a380548da529a71b723956443cf94f39d44eba6e8609684a73726096b67133e3c28fc9f45dd08be603857bd7 MISC metadata.xml 795 BLAKE2B cd2ca0a1f0024ef58bf71ae5b8e50da205213b110f42b62cbcaa10ce6b1edd3fdc724afbb996f29aae52765e29a9342fd22b43b6de8c27b532bd5f094e14b160 SHA512 e36e72c448a6e430668e7a1fd45e9c83e8a396e6b23177fc61ce6e8e8996184b84f3d9f282a9faf5b3cbea845189578437f356f92414393b3cfeb2ea313d9644 diff --git a/app-editors/neovim/files/neovim-0.8-cmake-darwin.patch b/app-editors/neovim/files/neovim-0.8-cmake-darwin.patch new file mode 100644 index 000000000000..ad47a46e1a7a --- /dev/null +++ b/app-editors/neovim/files/neovim-0.8-cmake-darwin.patch @@ -0,0 +1,65 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -80,33 +80,6 @@ set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${DEPS_PREFIX}/lib/pkgconfig") + # used for check_c_compiler_flag + include(CheckCCompilerFlag) + +-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") +- # CMake tries to treat /sw and /opt/local as extension of the system path, but +- # that doesn't really work out very well. Once you have a dependency that +- # resides there and have to add it as an include directory, then any other +- # dependency that could be satisfied from there must be--otherwise you can end +- # up with conflicting versions. So, let's make them more of a priority having +- # them be included as one of the first places to look for dependencies. +- list(APPEND CMAKE_PREFIX_PATH /sw /opt/local) +- +- # If the macOS deployment target is not set manually (via $MACOSX_DEPLOYMENT_TARGET), +- # fall back to local system version. Needs to be done both here and in cmake.deps. +- if(NOT CMAKE_OSX_DEPLOYMENT_TARGET) +- execute_process(COMMAND sw_vers -productVersion +- OUTPUT_VARIABLE MACOS_VERSION +- OUTPUT_STRIP_TRAILING_WHITESPACE) +- set(CMAKE_OSX_DEPLOYMENT_TARGET "${MACOS_VERSION}") +- endif() +- message("Using deployment target ${CMAKE_OSX_DEPLOYMENT_TARGET}") +- +- # Work around some old, broken detection by CMake for knowing when to use the +- # isystem flag. Apple's compilers have supported this for quite some time +- # now. +- if(CMAKE_C_COMPILER_ID MATCHES "GNU") +- set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ") +- endif() +-endif() +- + if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Darwin") + # Ignore case when comparing filenames on Windows and Mac. + set(CASE_INSENSITIVE_FILENAME TRUE) +--- a/cmake.deps/CMakeLists.txt ++++ b/cmake.deps/CMakeLists.txt +@@ -112,13 +112,6 @@ if(CMAKE_CXX_COMPILER) + set(DEPS_CXX_COMPILER "${CMAKE_CXX_COMPILER}") + endif() + +-if(CMAKE_OSX_SYSROOT) +- set(DEPS_C_COMPILER "${DEPS_C_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}") +- if(DEPS_CXX_COMPILER) +- set(DEPS_CXX_COMPILER "${DEPS_CXX_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}") +- endif() +-endif() +- + if(CMAKE_OSX_ARCHITECTURES) + string(REPLACE ";" "|" CMAKE_OSX_ARCHITECTURES_ALT_SEP "${CMAKE_OSX_ARCHITECTURES}") + # The LuaJIT build does not like being passed multiple `-arch` flags +--- a/src/nvim/CMakeLists.txt ++++ b/src/nvim/CMakeLists.txt +@@ -181,10 +181,6 @@ get_directory_property(gen_includes INCLUDE_DIRECTORIES) + foreach(gen_include ${gen_includes} ${LUA_PREFERRED_INCLUDE_DIRS}) + list(APPEND gen_cflags "-I${gen_include}") + endforeach() +-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_SYSROOT) +- list(APPEND gen_cflags "-isysroot") +- list(APPEND gen_cflags "${CMAKE_OSX_SYSROOT}") +-endif() + string(TOUPPER "${CMAKE_BUILD_TYPE}" build_type) + separate_arguments(C_FLAGS_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS}) + separate_arguments(C_FLAGS_${build_type}_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS_${build_type}}) diff --git a/app-editors/neovim/files/neovim-0.8-cmake_lua_version.patch b/app-editors/neovim/files/neovim-0.8-cmake_lua_version.patch new file mode 100644 index 000000000000..87a898032493 --- /dev/null +++ b/app-editors/neovim/files/neovim-0.8-cmake_lua_version.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -464,7 +464,7 @@ endif() + option(PREFER_LUA "Prefer Lua over LuaJIT in the nvim executable." OFF) + + if(PREFER_LUA) +- find_package(Lua 5.1 EXACT REQUIRED) ++ find_package(Lua ${PREFER_LUA} EXACT REQUIRED) + set(LUA_PREFERRED_INCLUDE_DIRS ${LUA_INCLUDE_DIR}) + set(LUA_PREFERRED_LIBRARIES ${LUA_LIBRARIES}) + # Passive (not REQUIRED): if LUAJIT_FOUND is not set, nvim-test is skipped. diff --git a/app-editors/neovim/files/neovim-9999-cmake-darwin.patch b/app-editors/neovim/files/neovim-9999-cmake-darwin.patch index ad47a46e1a7a..b2920451743d 100644 --- a/app-editors/neovim/files/neovim-9999-cmake-darwin.patch +++ b/app-editors/neovim/files/neovim-9999-cmake-darwin.patch @@ -1,65 +1,13 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -80,33 +80,6 @@ set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${DEPS_PREFIX}/lib/pkgconfig") - # used for check_c_compiler_flag - include(CheckCCompilerFlag) - --if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") -- # CMake tries to treat /sw and /opt/local as extension of the system path, but -- # that doesn't really work out very well. Once you have a dependency that -- # resides there and have to add it as an include directory, then any other -- # dependency that could be satisfied from there must be--otherwise you can end -- # up with conflicting versions. So, let's make them more of a priority having -- # them be included as one of the first places to look for dependencies. -- list(APPEND CMAKE_PREFIX_PATH /sw /opt/local) -- -- # If the macOS deployment target is not set manually (via $MACOSX_DEPLOYMENT_TARGET), -- # fall back to local system version. Needs to be done both here and in cmake.deps. -- if(NOT CMAKE_OSX_DEPLOYMENT_TARGET) -- execute_process(COMMAND sw_vers -productVersion -- OUTPUT_VARIABLE MACOS_VERSION -- OUTPUT_STRIP_TRAILING_WHITESPACE) -- set(CMAKE_OSX_DEPLOYMENT_TARGET "${MACOS_VERSION}") -- endif() -- message("Using deployment target ${CMAKE_OSX_DEPLOYMENT_TARGET}") -- -- # Work around some old, broken detection by CMake for knowing when to use the -- # isystem flag. Apple's compilers have supported this for quite some time -- # now. -- if(CMAKE_C_COMPILER_ID MATCHES "GNU") -- set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ") -- endif() --endif() -- - if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Darwin") - # Ignore case when comparing filenames on Windows and Mac. - set(CASE_INSENSITIVE_FILENAME TRUE) ---- a/cmake.deps/CMakeLists.txt -+++ b/cmake.deps/CMakeLists.txt -@@ -112,13 +112,6 @@ if(CMAKE_CXX_COMPILER) - set(DEPS_CXX_COMPILER "${CMAKE_CXX_COMPILER}") - endif() - --if(CMAKE_OSX_SYSROOT) -- set(DEPS_C_COMPILER "${DEPS_C_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}") -- if(DEPS_CXX_COMPILER) -- set(DEPS_CXX_COMPILER "${DEPS_CXX_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}") -- endif() --endif() -- - if(CMAKE_OSX_ARCHITECTURES) - string(REPLACE ";" "|" CMAKE_OSX_ARCHITECTURES_ALT_SEP "${CMAKE_OSX_ARCHITECTURES}") - # The LuaJIT build does not like being passed multiple `-arch` flags --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt -@@ -181,10 +181,6 @@ get_directory_property(gen_includes INCLUDE_DIRECTORIES) - foreach(gen_include ${gen_includes} ${LUA_PREFERRED_INCLUDE_DIRS}) +@@ -440,10 +440,6 @@ get_directory_property(gen_includes INCLUDE_DIRECTORIES) + foreach(gen_include ${prop}) list(APPEND gen_cflags "-I${gen_include}") endforeach() -if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_SYSROOT) - list(APPEND gen_cflags "-isysroot") - list(APPEND gen_cflags "${CMAKE_OSX_SYSROOT}") -endif() - string(TOUPPER "${CMAKE_BUILD_TYPE}" build_type) - separate_arguments(C_FLAGS_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS}) - separate_arguments(C_FLAGS_${build_type}_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS_${build_type}}) + set(gen_cflags ${gen_cflags} -O2) + + set(NVIM_VERSION_GIT_H ${PROJECT_BINARY_DIR}/cmake.config/auto/versiondef_git.h) diff --git a/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch b/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch index 87a898032493..b14b3b992349 100644 --- a/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch +++ b/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch @@ -1,11 +1,11 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt +--- a/src/nvim/CMakeLists.txt ++++ b/src/nvim/CMakeLists.txt @@ -464,7 +464,7 @@ endif() + # The unit test lib requires LuaJIT; it will be skipped if LuaJIT is missing. option(PREFER_LUA "Prefer Lua over LuaJIT in the nvim executable." OFF) - if(PREFER_LUA) - find_package(Lua 5.1 EXACT REQUIRED) + find_package(Lua ${PREFER_LUA} EXACT REQUIRED) - set(LUA_PREFERRED_INCLUDE_DIRS ${LUA_INCLUDE_DIR}) - set(LUA_PREFERRED_LIBRARIES ${LUA_LIBRARIES}) - # Passive (not REQUIRED): if LUAJIT_FOUND is not set, nvim-test is skipped. + target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LUA_INCLUDE_DIR}) + target_link_libraries(main_lib INTERFACE ${LUA_LIBRARIES}) + # Passive (not REQUIRED): if LUAJIT_FOUND is not set, fixtures for unittests is skipped. diff --git a/app-editors/neovim/neovim-0.8.2.ebuild b/app-editors/neovim/neovim-0.8.2.ebuild index 46c61e58ef5a..30a9cc0855a1 100644 --- a/app-editors/neovim/neovim-0.8.2.ebuild +++ b/app-editors/neovim/neovim-0.8.2.ebuild @@ -69,8 +69,8 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-9999-cmake_lua_version.patch" - "${FILESDIR}/${PN}-9999-cmake-darwin.patch" + "${FILESDIR}/${PN}-0.8-cmake_lua_version.patch" + "${FILESDIR}/${PN}-0.8-cmake-darwin.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 3b3878d8fc9c..f8fb77103051 100644 --- a/app-editors/neovim/neovim-0.8.3.ebuild +++ b/app-editors/neovim/neovim-0.8.3.ebuild @@ -69,8 +69,8 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-9999-cmake_lua_version.patch" - "${FILESDIR}/${PN}-9999-cmake-darwin.patch" + "${FILESDIR}/${PN}-0.8-cmake_lua_version.patch" + "${FILESDIR}/${PN}-0.8-cmake-darwin.patch" ) if [[ ${PV} != 9999 ]]; then -- cgit v1.2.3