From 73e71d7ad4c8bbf4e708eab669929034ebadcb9c Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Fri, 9 Oct 2026 13:42:09 +0200 Subject: [PATCH] media-gfx/geeqie: sync live ebuild Closes: https://bugs.gentoo.org/982148 Signed-off-by: Bernard Cafarelli --- media-gfx/geeqie/geeqie-9999.ebuild | 37 ++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/media-gfx/geeqie/geeqie-9999.ebuild b/media-gfx/geeqie/geeqie-9999.ebuild index 25550e8412f08..3a9b0c2cf6cd4 100644 --- a/media-gfx/geeqie/geeqie-9999.ebuild +++ b/media-gfx/geeqie/geeqie-9999.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 + LUA_COMPAT=( lua5-{3,4} ) inherit flag-o-matic git-r3 lua-single meson optfeature xdg @@ -13,28 +14,29 @@ EGIT_REPO_URI="https://github.com/BestImageViewer/geeqie.git" LICENSE="GPL-2" SLOT="0" -IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map openexr pdf raw spell tiff webp X xmp zip" +IUSE="debug djvu exif ffmpegthumbnailer fits heif jpeg jpeg2k jpegxl lcms lua map openexr pdf raw spell tiff videometadata webp X xmp zip" RDEPEND="gnome-extra/zenity virtual/libintl - x11-libs/gtk+:3[X?] + >=gui-libs/gtk-4.18:4[X?] djvu? ( app-text/djvu ) - exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) + exif? ( >=media-gfx/exiv2-0.18:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) + fits? ( sci-libs/cfitsio:= ) 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:= ) lcms? ( media-libs/lcms:2 ) lua? ( ${LUA_DEPS} ) - map? ( media-libs/clutter-gtk - media-libs/libchamplain:0.12[gtk] ) + map? ( media-libs/libshumate:= ) openexr? ( media-libs/openexr:= ) pdf? ( >=app-text/poppler-0.62[cairo] ) raw? ( >=media-libs/libraw-0.20:= ) - spell? ( app-text/gspell:= ) + spell? ( app-text/libspelling:= ) tiff? ( media-libs/tiff:= ) - webp? ( gui-libs/gdk-pixbuf-loader-webp:= ) + videometadata? ( media-video/ffmpeg:= ) + webp? ( media-libs/libwebp:= ) zip? ( >=app-arch/libarchive-3.4.0 )" DEPEND="${RDEPEND}" BDEPEND=" @@ -42,7 +44,8 @@ BDEPEND=" sys-devel/gettext virtual/pkgconfig" -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) + videometadata? ( exif )" pkg_setup() { # Do not require setting LUA_SINGLE_TARGET if lua is not used @@ -52,8 +55,13 @@ pkg_setup() { src_prepare() { default - # Disable doc build - not useful most of the time per upstream - sed -e "/subdir('doc')/d" -i meson.build || die + # Do not install the bundled icon fallback license/readme files. + sed -e '/^install_data($/,/^)$/d' \ + -i data/icons/meson.build || die + + # Drop the "Ancillary files" test, repo/CI lint bundle + sed -e "/^# Ancillary files test$/,/^summary({'Ancillary files'/d" \ + -i meson.build || die } src_configure() { @@ -64,22 +72,29 @@ src_configure() { local emesonargs=( -Dgq_helpdir="share/doc/${PF}" -Dgq_htmldir="share/doc/${PF}/html" + # Disable in-build documentation generation + -Ddoxygen=disabled + -Dhelp_pdf=disabled + -Dpandoc=disabled + -Dyelp_build=disabled $(meson_use debug) $(meson_feature djvu) $(meson_feature exif exiv2) $(meson_feature ffmpegthumbnailer videothumbnailer) + $(meson_feature fits) $(meson_feature heif) $(meson_feature jpeg) $(meson_feature jpeg2k j2k) $(meson_feature jpegxl) $(meson_feature lcms cms) $(meson_feature lua) - $(meson_feature map gps-map) + $(meson_feature map gps_map) $(meson_feature openexr exr) $(meson_feature pdf) $(meson_feature raw libraw) $(meson_feature spell) $(meson_feature tiff) + $(meson_feature videometadata) $(meson_feature zip archive) )