commit: 61c3aadb8bcc018a3097e90a123ed92b1415bfe3 Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> AuthorDate: Sat Feb 8 14:21:24 2025 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Sat Feb 8 14:21:24 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=61c3aadb
app-editors/neovim-qt: drop 0.2.17-r1, 0.2.18-r1 Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com> app-editors/neovim-qt/Manifest | 2 - .../neovim-qt-0.2.17-fix-finding-msgpack-6+.patch | 26 ---------- ...only-require-Qt5Test-if-tests-are-enabled.patch | 50 ------------------- app-editors/neovim-qt/neovim-qt-0.2.17-r1.ebuild | 57 ---------------------- app-editors/neovim-qt/neovim-qt-0.2.18-r1.ebuild | 57 ---------------------- 5 files changed, 192 deletions(-) diff --git a/app-editors/neovim-qt/Manifest b/app-editors/neovim-qt/Manifest index f1785efe5..d42739bb3 100644 --- a/app-editors/neovim-qt/Manifest +++ b/app-editors/neovim-qt/Manifest @@ -1,3 +1 @@ -DIST neovim-qt-0.2.17.tar.gz 1076230 BLAKE2B ab322d7f03bca40b4b3ee6e89a20dc04ec06d9ba3f49c0e658586f55e5219d13770078ed956a889dbe100836cb83cbc1829a39d60e9164e3bcb43ba085a72412 SHA512 ff290c6797c51ac23acd87ecd4c8d034321c4994c76b60f5d15626aa31db377090359d4bc681c6a9d0462ff5847269c35b95561ccd156600cf3f09f28ad4b8b2 -DIST neovim-qt-0.2.18.tar.gz 1078273 BLAKE2B 9ab288f7035e563022bfc22f04c45e02fe08bc5f705d95e862ea2cc71dc51d985c110fa104e512805418e79914461aa7098757a7024a9ddbae75b36c58dc94bc SHA512 39125492442793936f3a345a611df9613b08bf31caf39e6710ca25a38e2bbb1f11b7307d8f51985c6cb80ba752acffec09fffba1a81141edf18f557db1d994f6 DIST neovim-qt-0.2.19.tar.gz 1080516 BLAKE2B 54b4f4798b5cf861e8dd57efab20a159589d186c78738bce90c7b80eb2724b51d1327a20e2c161e18e38459999fcaf29bab2dafc391062b02ee9e4e2aef9ff47 SHA512 97b03ecab3f9b6cb42f9bfb4c05b072ae9ea1708a86f3fe03698f55b3563fc2aeeeae3edc34b337af52b8138ddec03d6507ab1488a282611d18c7b564df250f9 diff --git a/app-editors/neovim-qt/files/neovim-qt-0.2.17-fix-finding-msgpack-6+.patch b/app-editors/neovim-qt/files/neovim-qt-0.2.17-fix-finding-msgpack-6+.patch deleted file mode 100644 index 85e532f41..000000000 --- a/app-editors/neovim-qt/files/neovim-qt-0.2.17-fix-finding-msgpack-6+.patch +++ /dev/null @@ -1,26 +0,0 @@ -# upstream commit: https://github.com/equalsraf/neovim-qt/commit/c6ae970 - -From c6ae9709237b6a55a705687afe4103646f34ac60 Mon Sep 17 00:00:00 2001 -From: Carlo Cabrera <[email protected]> -Date: Sun, 5 Mar 2023 23:03:47 +0800 -Subject: [PATCH] Fix finding msgpack 6+ - -`libmsgpackc` was renamed to `libmsgpack-c` in 6.0.0. See -msgpack/msgpack-c#1053. ---- - cmake/FindMsgpack.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/FindMsgpack.cmake b/cmake/FindMsgpack.cmake -index 0e2013f9d..41e2d7b5c 100644 ---- a/cmake/FindMsgpack.cmake -+++ b/cmake/FindMsgpack.cmake -@@ -5,7 +5,7 @@ find_path(MSGPACK_INCLUDE_DIR - ) - - find_library(MSGPACK_LIBRARY -- NAMES msgpack msgpackc libmsgpack.a libmsgpackc.a -+ NAMES msgpack-c msgpack msgpackc libmsgpack.a libmsgpackc.a - ) - - mark_as_advanced(MSGPACK_INCLUDE_DIR MSGPACK_LIBRARY) diff --git a/app-editors/neovim-qt/files/neovim-qt-0.2.17-only-require-Qt5Test-if-tests-are-enabled.patch b/app-editors/neovim-qt/files/neovim-qt-0.2.17-only-require-Qt5Test-if-tests-are-enabled.patch deleted file mode 100644 index 06ca1b0ed..000000000 --- a/app-editors/neovim-qt/files/neovim-qt-0.2.17-only-require-Qt5Test-if-tests-are-enabled.patch +++ /dev/null @@ -1,50 +0,0 @@ -# upstream PR: <https://github.com/equalsraf/neovim-qt/pull/1007> - -From dd334be1e113d9e0f2310cc35b620c5090d06e1f Mon Sep 17 00:00:00 2001 -From: tastytea <[email protected]> -Date: Tue, 9 Aug 2022 15:32:08 +0200 -Subject: [PATCH] only require Qt5Test if tests are enabled - ---- - CMakeLists.txt | 2 +- - src/gui/shellwidget/CMakeLists.txt | 4 +++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8c77d27..ed02426 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -135,7 +135,6 @@ set(CMAKE_AUTOMOC ON) - find_package(Qt5Core REQUIRED) - find_package(Qt5Network REQUIRED) - find_package(Qt5Svg REQUIRED) --find_package(Qt5Test REQUIRED) - find_package(Qt5Widgets REQUIRED) - - if(Qt5Core_VERSION VERSION_LESS 5.8) -@@ -176,6 +175,7 @@ add_subdirectory(doc) - - option(ENABLE_TESTS "Build tests" ON) - if(ENABLE_TESTS) -+ find_package(Qt5Test REQUIRED) - enable_testing() - add_subdirectory(test) - add_subdirectory(src/gui/shellwidget/test) -diff --git a/src/gui/shellwidget/CMakeLists.txt b/src/gui/shellwidget/CMakeLists.txt -index f456c4a..41bc382 100644 ---- a/src/gui/shellwidget/CMakeLists.txt -+++ b/src/gui/shellwidget/CMakeLists.txt -@@ -9,7 +9,9 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) - # Qt - set(CMAKE_AUTOMOC ON) - find_package(Qt5Widgets REQUIRED) --find_package(Qt5Test REQUIRED) -+if(ENABLE_TESTS) -+ find_package(Qt5Test REQUIRED) -+endif() - - if (WIN32 AND USE_STATIC_QT) - add_definitions(-DUSE_STATIC_QT) --- -2.35.1 - diff --git a/app-editors/neovim-qt/neovim-qt-0.2.17-r1.ebuild b/app-editors/neovim-qt/neovim-qt-0.2.17-r1.ebuild deleted file mode 100644 index a1a758b5c..000000000 --- a/app-editors/neovim-qt/neovim-qt-0.2.17-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake virtualx xdg - -DESCRIPTION="Neovim client library and GUI, in Qt5" -HOMEPAGE="https://github.com/equalsraf/neovim-qt"; -SRC_URI="https://github.com/equalsraf/neovim-qt/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -COMMON_DEPEND=" - dev-libs/msgpack:= - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 -" -# NOTE: remove dejavu once <https://github.com/equalsraf/neovim-qt/issues/1005> -# is resolved -DEPEND=" - ${COMMON_DEPEND} - test? ( - dev-qt/qttest:5 - media-fonts/dejavu[X] - ) -" -RDEPEND=" - ${COMMON_DEPEND} - app-editors/neovim" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${P}-only-require-Qt5Test-if-tests-are-enabled.patch - "${FILESDIR}"/${P}-fix-finding-msgpack-6+.patch -) -src_configure() { - local mycmakeargs=( - -DUSE_SYSTEM_MSGPACK=ON - -DUSE_GCOV=OFF - -DENABLE_TESTS=$(usex test) - -DBUILD_SHARED_LIBS=OFF # upstream explicitly builds static lib - ) - - cmake_src_configure -} - -src_test() { - virtx cmake_src_test -} diff --git a/app-editors/neovim-qt/neovim-qt-0.2.18-r1.ebuild b/app-editors/neovim-qt/neovim-qt-0.2.18-r1.ebuild deleted file mode 100644 index 9dbb3629b..000000000 --- a/app-editors/neovim-qt/neovim-qt-0.2.18-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake virtualx xdg - -DESCRIPTION="Neovim client library and GUI, in Qt" -HOMEPAGE="https://github.com/equalsraf/neovim-qt"; -SRC_URI="https://github.com/equalsraf/neovim-qt/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="qt6 test" - -COMMON_DEPEND=" - dev-libs/msgpack:= - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - ) - qt6? ( - dev-qt/qtbase:6[gui,network,widgets] - dev-qt/qtsvg:6 - ) -" -# NOTE: see <https://github.com/equalsraf/neovim-qt/issues/1005> for dejavu dep -DEPEND=" - ${COMMON_DEPEND} - !qt6? ( dev-qt/qttest:5 ) - test? ( media-fonts/dejavu[X] ) -" -RDEPEND=" - ${COMMON_DEPEND} - app-editors/neovim" - -RESTRICT="!test? ( test )" - -src_configure() { - local mycmakeargs=( - -DUSE_SYSTEM_MSGPACK=ON - -DUSE_GCOV=OFF - -DENABLE_TESTS=$(usex test) - -DBUILD_SHARED_LIBS=OFF # upstream explicitly builds static lib - -DWITH_QT=$(usex qt6 Qt6 Qt5) - ) - - cmake_src_configure -} - -src_test() { - virtx cmake_src_test -}
