commit: 2dc16d27908f6c4302f3e0f2ac7058481013bc19 Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> AuthorDate: Sat Nov 2 13:02:11 2024 +0000 Commit: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> CommitDate: Sat Nov 2 13:02:11 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2dc16d27
media-gfx/swayimg: sync USE=X with x11-libs/cairo USE=X needs to be synced with x11-libs/cairo during build, otherwise the build will fail. https://github.com/gentoo/guru/commit/f4d3cb8692d9819e393c2265ab6cefbae5c81568#commitcomment-148646896 ``` meson.build:53:7: ERROR: Dependency lookup for librsvg-2.0 with method 'pkgconfig' failed: Could not generate cflags for librsvg-2.0: Package xproto was not found in the pkg-config search path. Perhaps you should add the directory containing `xproto.pc' ``` Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com> media-gfx/swayimg/swayimg-3.2.ebuild | 12 +++++------- media-gfx/swayimg/swayimg-3.4.ebuild | 12 +++++------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/media-gfx/swayimg/swayimg-3.2.ebuild b/media-gfx/swayimg/swayimg-3.2.ebuild index adf13e554..c63caf3e3 100644 --- a/media-gfx/swayimg/swayimg-3.2.ebuild +++ b/media-gfx/swayimg/swayimg-3.2.ebuild @@ -1,4 +1,3 @@ - # Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 @@ -33,18 +32,17 @@ RDEPEND=" svg? ( dev-libs/glib:2 gnome-base/librsvg:2 - x11-libs/cairo + x11-libs/cairo[X=] ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:= )" DEPEND="${RDEPEND} - dev-libs/wayland-protocols" + dev-libs/wayland-protocols + svg? ( X? ( x11-base/xorg-proto ) ) +" BDEPEND=" dev-util/wayland-scanner - svg? ( - dev-build/cmake - X? ( x11-base/xorg-proto ) - ) + svg? ( dev-build/cmake ) " src_configure() { diff --git a/media-gfx/swayimg/swayimg-3.4.ebuild b/media-gfx/swayimg/swayimg-3.4.ebuild index ad2d4ad33..baacc4fb6 100644 --- a/media-gfx/swayimg/swayimg-3.4.ebuild +++ b/media-gfx/swayimg/swayimg-3.4.ebuild @@ -1,4 +1,3 @@ - # Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 @@ -34,18 +33,17 @@ RDEPEND=" svg? ( dev-libs/glib:2 gnome-base/librsvg:2 - x11-libs/cairo + x11-libs/cairo[X=] ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:= )" DEPEND="${RDEPEND} - dev-libs/wayland-protocols" + dev-libs/wayland-protocols + svg? ( X? ( x11-base/xorg-proto ) ) +" BDEPEND=" dev-util/wayland-scanner - svg? ( - dev-build/cmake - X? ( x11-base/xorg-proto ) - ) + svg? ( dev-build/cmake ) test? ( dev-cpp/gtest ) "
