Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/
Date: Mon, 07 Nov 2022 21:10:23
Message-Id: 1667855326.35683548ca97455f295f52aed45cdf357b878794.ionen@gentoo
1 commit: 35683548ca97455f295f52aed45cdf357b878794
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 7 21:04:40 2022 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 7 21:08:46 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35683548
7
8 media-libs/libcaca: avoid mixing ncurses with ncursesw
9
10 Also only do this with USE=ncurses and use || die
11
12 (fixes runtime with mpv wrt bug #825058)
13
14 Closes: https://bugs.gentoo.org/825058
15 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
16
17 ...{libcaca-0.99_beta19-r10.ebuild => libcaca-0.99_beta19-r11.ebuild} | 4 ++--
18 1 file changed, 2 insertions(+), 2 deletions(-)
19
20 diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r10.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
21 similarity index 97%
22 rename from media-libs/libcaca/libcaca-0.99_beta19-r10.ebuild
23 rename to media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
24 index 86ee32249914..9466208ef8c1 100644
25 --- a/media-libs/libcaca/libcaca-0.99_beta19-r10.ebuild
26 +++ b/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
27 @@ -89,8 +89,8 @@ src_prepare() {
28 # bug #653400
29 append-cxxflags -std=c++11
30
31 - # bug #601902
32 - append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
33 + # bug #601902, bug #825058
34 + use ncurses && append-libs $($(tc-getPKG_CONFIG) --libs tinfow || die)
35
36 # fix docs install path, bug 543870#c14
37 sed -i "s/libcaca-dev/${PF}/g" doc/Makefile.am || die