Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: app-editors/neovim-qt/files/, app-editors/neovim-qt/
Date: Thu, 11 Aug 2022 13:45:21
Message-Id: 1660053249.d4a86b6f10ef7b3b2c740491c33c554c02b94000.andrewammerlaan@gentoo
1 commit: d4a86b6f10ef7b3b2c740491c33c554c02b94000
2 Author: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
3 AuthorDate: Tue Aug 9 13:54:09 2022 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 9 13:54:09 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d4a86b6f
7
8 app-editors/neovim-qt: add 0.2.17, fix tests
9
10 Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>
11
12 app-editors/neovim-qt/Manifest | 1 +
13 ...only-require-Qt5Test-if-tests-are-enabled.patch | 50 ++++++++++++++++++++++
14 app-editors/neovim-qt/neovim-qt-0.2.17.ebuild | 50 ++++++++++++++++++++++
15 3 files changed, 101 insertions(+)
16
17 diff --git a/app-editors/neovim-qt/Manifest b/app-editors/neovim-qt/Manifest
18 index 653ba816d..69eafaae4 100644
19 --- a/app-editors/neovim-qt/Manifest
20 +++ b/app-editors/neovim-qt/Manifest
21 @@ -1 +1,2 @@
22 DIST neovim-qt-0.2.16.1.tar.gz 1069176 BLAKE2B ccb9d7275735969dc0576b498e017068da63e14ba82e3160621822d83c3902e35064be393dda57f8e70d83bcbb22e8e663f2ec996ffb48ff0140099ae0793a88 SHA512 63910b0416103f8c4f2450a07d4790c2b7fd26e2ba324445a20700a12d1dc3cb6fb06c674f3a1173348dad5c2256e8018167765306ca33ad94bc176bf5e4e45c
23 +DIST neovim-qt-0.2.17.tar.gz 1076230 BLAKE2B ab322d7f03bca40b4b3ee6e89a20dc04ec06d9ba3f49c0e658586f55e5219d13770078ed956a889dbe100836cb83cbc1829a39d60e9164e3bcb43ba085a72412 SHA512 ff290c6797c51ac23acd87ecd4c8d034321c4994c76b60f5d15626aa31db377090359d4bc681c6a9d0462ff5847269c35b95561ccd156600cf3f09f28ad4b8b2
24
25 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
26 new file mode 100644
27 index 000000000..06ca1b0ed
28 --- /dev/null
29 +++ b/app-editors/neovim-qt/files/neovim-qt-0.2.17-only-require-Qt5Test-if-tests-are-enabled.patch
30 @@ -0,0 +1,50 @@
31 +# upstream PR: <https://github.com/equalsraf/neovim-qt/pull/1007>
32 +
33 +From dd334be1e113d9e0f2310cc35b620c5090d06e1f Mon Sep 17 00:00:00 2001
34 +From: tastytea <tastytea@××××××××.de>
35 +Date: Tue, 9 Aug 2022 15:32:08 +0200
36 +Subject: [PATCH] only require Qt5Test if tests are enabled
37 +
38 +---
39 + CMakeLists.txt | 2 +-
40 + src/gui/shellwidget/CMakeLists.txt | 4 +++-
41 + 2 files changed, 4 insertions(+), 2 deletions(-)
42 +
43 +diff --git a/CMakeLists.txt b/CMakeLists.txt
44 +index 8c77d27..ed02426 100644
45 +--- a/CMakeLists.txt
46 ++++ b/CMakeLists.txt
47 +@@ -135,7 +135,6 @@ set(CMAKE_AUTOMOC ON)
48 + find_package(Qt5Core REQUIRED)
49 + find_package(Qt5Network REQUIRED)
50 + find_package(Qt5Svg REQUIRED)
51 +-find_package(Qt5Test REQUIRED)
52 + find_package(Qt5Widgets REQUIRED)
53 +
54 + if(Qt5Core_VERSION VERSION_LESS 5.8)
55 +@@ -176,6 +175,7 @@ add_subdirectory(doc)
56 +
57 + option(ENABLE_TESTS "Build tests" ON)
58 + if(ENABLE_TESTS)
59 ++ find_package(Qt5Test REQUIRED)
60 + enable_testing()
61 + add_subdirectory(test)
62 + add_subdirectory(src/gui/shellwidget/test)
63 +diff --git a/src/gui/shellwidget/CMakeLists.txt b/src/gui/shellwidget/CMakeLists.txt
64 +index f456c4a..41bc382 100644
65 +--- a/src/gui/shellwidget/CMakeLists.txt
66 ++++ b/src/gui/shellwidget/CMakeLists.txt
67 +@@ -9,7 +9,9 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
68 + # Qt
69 + set(CMAKE_AUTOMOC ON)
70 + find_package(Qt5Widgets REQUIRED)
71 +-find_package(Qt5Test REQUIRED)
72 ++if(ENABLE_TESTS)
73 ++ find_package(Qt5Test REQUIRED)
74 ++endif()
75 +
76 + if (WIN32 AND USE_STATIC_QT)
77 + add_definitions(-DUSE_STATIC_QT)
78 +--
79 +2.35.1
80 +
81
82 diff --git a/app-editors/neovim-qt/neovim-qt-0.2.17.ebuild b/app-editors/neovim-qt/neovim-qt-0.2.17.ebuild
83 new file mode 100644
84 index 000000000..204a6bb3c
85 --- /dev/null
86 +++ b/app-editors/neovim-qt/neovim-qt-0.2.17.ebuild
87 @@ -0,0 +1,50 @@
88 +# Copyright 1999-2022 Gentoo Authors
89 +# Distributed under the terms of the GNU General Public License v2
90 +
91 +EAPI=8
92 +
93 +inherit cmake virtualx xdg
94 +
95 +DESCRIPTION="Neovim client library and GUI, in Qt5"
96 +HOMEPAGE="https://github.com/equalsraf/neovim-qt"
97 +SRC_URI="https://github.com/equalsraf/neovim-qt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
98 +
99 +LICENSE="ISC"
100 +SLOT="0"
101 +KEYWORDS="~amd64 ~x86"
102 +IUSE="test"
103 +
104 +COMMON_DEPEND="
105 + dev-libs/msgpack
106 + dev-qt/qtcore:5
107 + dev-qt/qtgui:5
108 + dev-qt/qtnetwork:5
109 + dev-qt/qtsvg:5
110 + dev-qt/qtwidgets:5"
111 +DEPEND="
112 + ${COMMON_DEPEND}
113 + test? ( dev-qt/qttest:5 )
114 +"
115 +RDEPEND="
116 + ${COMMON_DEPEND}
117 + app-editors/neovim"
118 +
119 +RESTRICT="!test? ( test )"
120 +
121 +PATCHES=(
122 + "${FILESDIR}"/${PN}-0.2.17-only-require-Qt5Test-if-tests-are-enabled.patch
123 +)
124 +src_configure() {
125 + local mycmakeargs=(
126 + -DUSE_SYSTEM_MSGPACK=ON
127 + -DUSE_GCOV=OFF
128 + -DENABLE_TESTS=$(usex test)
129 + -DBUILD_SHARED_LIBS=OFF # upstream explicitly builds static lib
130 + )
131 +
132 + cmake_src_configure
133 +}
134 +
135 +src_test() {
136 + virtx cmake_src_test
137 +}