Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/
Date: Fri, 03 Dec 2021 18:53:55
Message-Id: 1638557569.e50955de6b05b0e38dfdef3b07f58aac560397ca.sam@gentoo
1 commit: e50955de6b05b0e38dfdef3b07f58aac560397ca
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 3 18:52:49 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 3 18:52:49 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e50955de
7
8 media-libs/freetype: forbid use of internal/bundled zlib
9
10 This makes error messages far more explicit if people
11 are trying to circumvent the common circular
12 dependency b/t harfbuzz + freetype but don't
13 have zlib installed (possibly just missing for one
14 ABI: abi_x86_32).
15
16 No functional change for when zlib is installed
17 as per the ebuild's dependencies.
18
19 Closes: https://bugs.gentoo.org/808252
20 Signed-off-by: Sam James <sam <AT> gentoo.org>
21
22 media-libs/freetype/freetype-2.11.1.ebuild | 1 +
23 media-libs/freetype/freetype-9999.ebuild | 1 +
24 2 files changed, 2 insertions(+)
25
26 diff --git a/media-libs/freetype/freetype-2.11.1.ebuild b/media-libs/freetype/freetype-2.11.1.ebuild
27 index dad3ee32aab0..d0c71e729b9c 100644
28 --- a/media-libs/freetype/freetype-2.11.1.ebuild
29 +++ b/media-libs/freetype/freetype-2.11.1.ebuild
30 @@ -176,6 +176,7 @@ multilib_src_configure() {
31 local myeconfargs=(
32 --disable-freetype-config
33 --enable-shared
34 + --with-zlib
35 $(use_with brotli)
36 $(use_with bzip2)
37 $(use_with harfbuzz)
38
39 diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
40 index dad3ee32aab0..d0c71e729b9c 100644
41 --- a/media-libs/freetype/freetype-9999.ebuild
42 +++ b/media-libs/freetype/freetype-9999.ebuild
43 @@ -176,6 +176,7 @@ multilib_src_configure() {
44 local myeconfargs=(
45 --disable-freetype-config
46 --enable-shared
47 + --with-zlib
48 $(use_with brotli)
49 $(use_with bzip2)
50 $(use_with harfbuzz)