From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id 7E5121584AD for ; Wed, 23 Apr 2025 14:50:38 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 6A976340C39 for ; Wed, 23 Apr 2025 14:50:38 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 60D5611029A; Wed, 23 Apr 2025 14:50:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 bobolink.gentoo.org (Postfix) with ESMTPS id 5938111029A for ; Wed, 23 Apr 2025 14:50:37 +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 0688F342FE8 for ; Wed, 23 Apr 2025 14:50:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6082E2511 for ; Wed, 23 Apr 2025 14:50:35 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1745419454.189c9e67a7a99091d240ddd42d4b1f3561fcbbfe.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/cairo/cairo-1.18.4-r1.ebuild x11-libs/cairo/cairo-9999.ebuild X-VCS-Directories: x11-libs/cairo/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 189c9e67a7a99091d240ddd42d4b1f3561fcbbfe X-VCS-Branch: master Date: Wed, 23 Apr 2025 14:50:35 +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: 8179a3c4-42f2-40ea-8529-dd12177a93a2 X-Archives-Hash: b822540494440814b7c59c79dd776221 commit: 189c9e67a7a99091d240ddd42d4b1f3561fcbbfe Author: NRK disroot org> AuthorDate: Sat Apr 12 09:47:07 2025 +0000 Commit: Matt Turner gentoo org> CommitDate: Wed Apr 23 14:44:14 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=189c9e67 x11-libs/cairo: add lzo USE flag Closes: https://bugs.gentoo.org/953549 Closes: https://github.com/gentoo/gentoo/pull/41554 Signed-off-by: NRK disroot.org> Signed-off-by: Matt Turner gentoo.org> x11-libs/cairo/{cairo-9999.ebuild => cairo-1.18.4-r1.ebuild} | 7 ++++--- x11-libs/cairo/cairo-9999.ebuild | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-1.18.4-r1.ebuild similarity index 94% copy from x11-libs/cairo/cairo-9999.ebuild copy to x11-libs/cairo/cairo-1.18.4-r1.ebuild index 5b5de6710465..d7d6ec8b8184 100644 --- a/x11-libs/cairo/cairo-9999.ebuild +++ b/x11-libs/cairo/cairo-1.18.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,13 +17,12 @@ DESCRIPTION="A vector graphics library with cross-device output support" HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo" LICENSE="|| ( LGPL-2.1 MPL-1.1 )" SLOT="0" -IUSE="X aqua debug +glib gtk-doc test" +IUSE="X aqua debug +glib gtk-doc lzo test" # Tests need more wiring up like e.g. https://gitlab.freedesktop.org/cairo/cairo/-/blob/master/.gitlab-ci.yml # any2ppm tests seem to hang for now. RESTRICT="test !test? ( test )" RDEPEND=" - >=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}] >=media-libs/fontconfig-2.13.92[${MULTILIB_USEDEP}] >=media-libs/freetype-2.13:2[png,${MULTILIB_USEDEP}] >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] @@ -31,6 +30,7 @@ RDEPEND=" >=x11-libs/pixman-0.42.3[${MULTILIB_USEDEP}] debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] ) glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) + lzo? ( >=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}] ) X? ( >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] @@ -68,6 +68,7 @@ multilib_src_configure() { # Requires poppler-glib (poppler[cairo]) which isn't available in multilib $(meson_native_use_feature test tests) + $(meson_feature lzo) -Dgtk2-utils=disabled $(meson_feature glib) diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild index 5b5de6710465..d7d6ec8b8184 100644 --- a/x11-libs/cairo/cairo-9999.ebuild +++ b/x11-libs/cairo/cairo-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,13 +17,12 @@ DESCRIPTION="A vector graphics library with cross-device output support" HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo" LICENSE="|| ( LGPL-2.1 MPL-1.1 )" SLOT="0" -IUSE="X aqua debug +glib gtk-doc test" +IUSE="X aqua debug +glib gtk-doc lzo test" # Tests need more wiring up like e.g. https://gitlab.freedesktop.org/cairo/cairo/-/blob/master/.gitlab-ci.yml # any2ppm tests seem to hang for now. RESTRICT="test !test? ( test )" RDEPEND=" - >=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}] >=media-libs/fontconfig-2.13.92[${MULTILIB_USEDEP}] >=media-libs/freetype-2.13:2[png,${MULTILIB_USEDEP}] >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] @@ -31,6 +30,7 @@ RDEPEND=" >=x11-libs/pixman-0.42.3[${MULTILIB_USEDEP}] debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] ) glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) + lzo? ( >=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}] ) X? ( >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] @@ -68,6 +68,7 @@ multilib_src_configure() { # Requires poppler-glib (poppler[cairo]) which isn't available in multilib $(meson_native_use_feature test tests) + $(meson_feature lzo) -Dgtk2-utils=disabled $(meson_feature glib)