From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/cherrytree/
Date: Thu, 27 Feb 2025 05:33:24 +0000 (UTC) [thread overview]
Message-ID: <1740630624.811e537d7536dea8f47b7213cee77eac737b65aa.sam@gentoo> (raw)
commit: 811e537d7536dea8f47b7213cee77eac737b65aa
Author: Joel Anderson <joel <AT> goatshriek <DOT> com>
AuthorDate: Sun Feb 2 18:45:26 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 27 04:30:24 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=811e537d
app-text/cherrytree: update and enable tests
The tests for cherrytree were restricted, with a comment that
dependencies were not available in Gentoo. Upon further investigation
and with confirmation from the upstream maintainer
(giuspen/cherrytree#2645), the test dependencies have since changed, and
now everything needed to run the tests is available. This change updates
the dependencies and enables the tests, limiting the number of jobs due
to a limitation in the test suite (giuspen/cherrytree#2663).
Signed-off-by: Joel Anderson <joel <AT> goatshriek.com>
Closes: https://github.com/gentoo/gentoo/pull/40462
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-text/cherrytree/cherrytree-1.2.0.ebuild | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/app-text/cherrytree/cherrytree-1.2.0.ebuild b/app-text/cherrytree/cherrytree-1.2.0.ebuild
index 26f7d785b46a..9c67de85be38 100644
--- a/app-text/cherrytree/cherrytree-1.2.0.ebuild
+++ b/app-text/cherrytree/cherrytree-1.2.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake python-any-r1 xdg
+inherit cmake python-any-r1 virtualx xdg
DESCRIPTION="A hierarchical note taking application (C++ version)"
HOMEPAGE="https://www.giuspen.com/cherrytree/"
@@ -24,9 +24,6 @@ KEYWORDS="~amd64 ~x86"
IUSE="nls test"
-# Has deps that aren't available in ::gentoo repo
-RESTRICT="test"
-
RDEPEND="app-i18n/uchardet
app-text/gspell:=
>=dev-cpp/glibmm-2.64.2:2
@@ -53,7 +50,7 @@ DEPEND="${PYTHON_DEPS}
BDEPEND="
virtual/pkgconfig
nls? ( sys-devel/gettext )
- test? ( dev-util/cpputest )"
+ test? ( dev-cpp/gtest )"
src_prepare() {
# disable compress man pages
@@ -71,7 +68,16 @@ src_configure() {
-DUSE_NLS=$(usex nls)
-DBUILD_TESTING=$(usex test)
-DUSE_SHARED_FMT_SPDLOG=ON
+ -DAUTO_RUN_TESTING=OFF
+ -DUSE_SHARED_GTEST_GMOCK=$(usex test)
)
cmake_src_configure
}
+
+src_test() {
+ # the export test suite fails if more than one job is used for testing, so
+ # we force it to a single job here, for more detail see
+ # https://github.com/giuspen/cherrytree/pull/2663
+ MAKEOPTS="${MAKEOPTS} -j1" virtx cmake_src_test
+}
next reply other threads:[~2025-02-27 5:33 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-27 5:33 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-24 5:58 [gentoo-commits] repo/gentoo:master commit in: app-text/cherrytree/ Sam James
2025-03-24 5:58 Sam James
2025-03-19 23:57 Sam James
2025-03-15 13:48 Petr Vaněk
2025-03-11 9:02 Sam James
2024-11-14 21:21 Petr Vaněk
2024-11-14 21:21 Petr Vaněk
2024-11-14 21:21 Petr Vaněk
2024-09-18 3:25 Sam James
2024-09-18 3:25 Sam James
2024-07-07 21:11 Eli Schwartz
2024-07-07 21:11 Eli Schwartz
2024-06-29 14:11 Arthur Zamarin
2024-06-28 7:43 Joonas Niilola
2024-06-28 7:43 Joonas Niilola
2024-06-28 7:43 Joonas Niilola
2024-01-20 12:04 Sam James
2023-10-08 11:51 Pacho Ramos
2023-10-08 11:51 Pacho Ramos
2023-08-26 17:20 Arthur Zamarin
2023-07-26 3:13 Sam James
2023-03-11 21:23 Sam James
2023-03-11 21:23 Sam James
2023-03-11 17:04 Sam James
2022-12-21 23:09 Sam James
2022-12-21 23:09 Sam James
2022-12-21 23:09 Sam James
2022-12-19 14:49 Andreas Sturmlechner
2022-12-19 14:47 Andreas Sturmlechner
2022-11-09 16:27 Florian Schmaus
2022-07-18 0:26 Sam James
2022-05-03 18:38 Sam James
2022-04-17 16:10 Sam James
2021-05-24 7:39 Joonas Niilola
2021-05-24 7:39 Joonas Niilola
2021-05-24 7:39 Joonas Niilola
2021-05-24 7:39 Joonas Niilola
2021-05-24 7:39 Joonas Niilola
2021-05-23 19:04 Michał Górny
2021-04-19 10:31 Joonas Niilola
2021-04-06 21:17 Sam James
2021-02-16 2:12 Matt Turner
2020-05-23 17:59 Andreas Sturmlechner
2020-04-09 8:58 Joonas Niilola
2019-11-20 6:03 Joonas Niilola
2018-04-09 0:15 Aaron Bauman
2016-09-17 15:19 Pacho Ramos
2016-07-07 22:50 Austin English
2016-07-01 7:25 Patrice Clement
2016-07-01 7:25 Patrice Clement
2016-07-01 7:25 Patrice Clement
2016-05-29 15:30 Kristian Fiskerstrand
2016-04-20 9:14 Ian Delaney
2016-04-19 17:09 Ian Delaney
2016-04-19 14:00 Ian Delaney
2016-04-19 14:00 Ian Delaney
2016-04-19 14:00 Ian Delaney
2016-04-19 14:00 Ian Delaney
2016-04-15 19:10 Patrice Clement
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1740630624.811e537d7536dea8f47b7213cee77eac737b65aa.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox