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 9536515800A for ; Tue, 1 Aug 2023 21:57:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B160EE0AE9; Tue, 1 Aug 2023 21:57:47 +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 pigeon.gentoo.org (Postfix) with ESMTPS id 95656E0AE9 for ; Tue, 1 Aug 2023 21:57:47 +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 A1498340AB2 for ; Tue, 1 Aug 2023 21:57:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AE7D2EA9 for ; Tue, 1 Aug 2023 21:57:44 +0000 (UTC) From: "Bernard Cafarelli" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Bernard Cafarelli" Message-ID: <1690927062.d5030dddcc9ab4029e1c9b9d44216a13080ef980.voyageur@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/geeqie/geeqie-9999.ebuild X-VCS-Directories: media-gfx/geeqie/ X-VCS-Committer: voyageur X-VCS-Committer-Name: Bernard Cafarelli X-VCS-Revision: d5030dddcc9ab4029e1c9b9d44216a13080ef980 X-VCS-Branch: master Date: Tue, 1 Aug 2023 21:57:44 +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: 8e253760-3e19-4358-bb9f-8c76b220b866 X-Archives-Hash: 0c4e672a1d0f01441d2df5e93ed4a3d4 commit: d5030dddcc9ab4029e1c9b9d44216a13080ef980 Author: Bernard Cafarelli gentoo org> AuthorDate: Tue Aug 1 21:57:26 2023 +0000 Commit: Bernard Cafarelli gentoo org> CommitDate: Tue Aug 1 21:57:42 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5030ddd media-gfx/geeqie: sync live ebuild Bug: https://bugs.gentoo.org/909302 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/geeqie-9999.ebuild | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/media-gfx/geeqie/geeqie-9999.ebuild b/media-gfx/geeqie/geeqie-9999.ebuild index ae833800a507..80135160f44c 100644 --- a/media-gfx/geeqie/geeqie-9999.ebuild +++ b/media-gfx/geeqie/geeqie-9999.ebuild @@ -26,7 +26,7 @@ RDEPEND="gnome-extra/zenity heif? ( >=media-libs/libheif-1.3.2 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0:2= ) jpeg? ( media-libs/libjpeg-turbo:= ) - jpegxl? ( >=media-libs/libjxl-0.3.7 ) + jpegxl? ( >=media-libs/libjxl-0.3.7:= ) lcms? ( media-libs/lcms:2 ) lua? ( ${LUA_DEPS} ) map? ( media-libs/clutter-gtk @@ -35,7 +35,7 @@ RDEPEND="gnome-extra/zenity raw? ( >=media-libs/libraw-0.20:= ) spell? ( app-text/gspell ) tiff? ( media-libs/tiff:= ) - webp? ( >=media-libs/libwebp-0.6.1:= ) + webp? ( gui-libs/gdk-pixbuf-loader-webp:= ) zip? ( >=app-arch/libarchive-3.4.0 )" DEPEND="${RDEPEND}" BDEPEND=" @@ -54,14 +54,8 @@ pkg_setup() { src_prepare() { default - # Fix xxdi.pl support - sed -e 's/"$build_dir/> \0/' scripts/generate-ClayRGB1998-icc-h.sh || die - # Disable doc build - not useful most of the time per upstream sed -e "/subdir('doc')/d" -i meson.build || die - - # Lua version - sed -e "s/lua5.[0-9]/${LUA_SINGLE_TARGET/-/.}/" -i meson.build || die } src_configure() { @@ -83,7 +77,6 @@ src_configure() { $(meson_feature raw libraw) $(meson_feature spell) $(meson_feature tiff) - $(meson_feature webp) $(meson_feature zip archive) )