From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 39BF2158086 for ; Fri, 3 Dec 2021 18:53:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BCF8FE07C5; Fri, 3 Dec 2021 18:53:53 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A0854E07C5 for ; Fri, 3 Dec 2021 18:53:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 419193430E9 for ; Fri, 3 Dec 2021 18:53:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7A9888E for ; Fri, 3 Dec 2021 18:53:50 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1638557569.e50955de6b05b0e38dfdef3b07f58aac560397ca.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/freetype/freetype-2.11.1.ebuild media-libs/freetype/freetype-9999.ebuild X-VCS-Directories: media-libs/freetype/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e50955de6b05b0e38dfdef3b07f58aac560397ca X-VCS-Branch: master Date: Fri, 3 Dec 2021 18:53:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c5ff1e07-8d7c-476a-94b5-0e33be17e0fa X-Archives-Hash: 7fa37e48a49ce7f5b52de632a90376c4 commit: e50955de6b05b0e38dfdef3b07f58aac560397ca Author: Sam James gentoo org> AuthorDate: Fri Dec 3 18:52:49 2021 +0000 Commit: Sam James gentoo 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 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)