commit:     e50955de6b05b0e38dfdef3b07f58aac560397ca
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  3 18:52:49 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec  3 18:52:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e50955de

media-libs/freetype: forbid use of internal/bundled zlib

This makes error messages far more explicit if people
are trying to circumvent the common circular
dependency b/t harfbuzz + freetype but don't
have zlib installed (possibly just missing for one
ABI: abi_x86_32).

No functional change for when zlib is installed
as per the ebuild's dependencies.

Closes: https://bugs.gentoo.org/808252
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/freetype/freetype-2.11.1.ebuild | 1 +
 media-libs/freetype/freetype-9999.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/media-libs/freetype/freetype-2.11.1.ebuild 
b/media-libs/freetype/freetype-2.11.1.ebuild
index dad3ee32aab0..d0c71e729b9c 100644
--- a/media-libs/freetype/freetype-2.11.1.ebuild
+++ b/media-libs/freetype/freetype-2.11.1.ebuild
@@ -176,6 +176,7 @@ multilib_src_configure() {
        local myeconfargs=(
                --disable-freetype-config
                --enable-shared
+               --with-zlib
                $(use_with brotli)
                $(use_with bzip2)
                $(use_with harfbuzz)

diff --git a/media-libs/freetype/freetype-9999.ebuild 
b/media-libs/freetype/freetype-9999.ebuild
index dad3ee32aab0..d0c71e729b9c 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -176,6 +176,7 @@ multilib_src_configure() {
        local myeconfargs=(
                --disable-freetype-config
                --enable-shared
+               --with-zlib
                $(use_with brotli)
                $(use_with bzip2)
                $(use_with harfbuzz)

Reply via email to