commit: 92f3e7f2f6f53346dfbebd12f75b5266bbfc97d5 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> AuthorDate: Mon Oct 24 21:28:54 2022 +0000 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> CommitDate: Mon Oct 24 21:29:27 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92f3e7f2
media-gfx/geeqie: fix xxdi.pl support Also sync doc drop from live ebuild Closes: https://bugs.gentoo.org/878089 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch | 2 +- media-gfx/geeqie/geeqie-2.0.1-r1.ebuild | 10 +++++----- media-gfx/geeqie/geeqie-9999.ebuild | 3 +++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch b/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch index 440de7189344..bf6a7d77975f 100644 --- a/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch +++ b/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch @@ -14,4 +14,4 @@ diff -Naur geeqie-2.0.1.orig/scripts/generate-ClayRGB1998-icc-h.sh geeqie-2.0.1/ cd "$(dirname "$1")" || return 1 -xxd -i "$(basename "$1")" "$build_dir/$2" -+${XXD} "$(basename "$1")" "$build_dir/$2" ++${XXD} "$(basename "$1")" > "$build_dir/$2" diff --git a/media-gfx/geeqie/geeqie-2.0.1-r1.ebuild b/media-gfx/geeqie/geeqie-2.0.1-r1.ebuild index 8a99ae4480da..7dcf1197b2ae 100644 --- a/media-gfx/geeqie/geeqie-2.0.1-r1.ebuild +++ b/media-gfx/geeqie/geeqie-2.0.1-r1.ebuild @@ -14,13 +14,12 @@ SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}. LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug doc djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" +IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" RDEPEND="gnome-extra/zenity virtual/libintl x11-libs/gtk+:3 djvu? ( app-text/djvu ) - doc? ( app-text/yelp-tools ) exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) heif? ( >=media-libs/libheif-1.3.2 ) @@ -28,8 +27,7 @@ RDEPEND="gnome-extra/zenity jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( >=media-libs/libjxl-0.3.7 ) lcms? ( media-libs/lcms:2 ) - lua? ( ${LUA_DEPS} - doc? ( app-doc/doxygen ) ) + lua? ( ${LUA_DEPS} ) map? ( media-libs/clutter-gtk media-libs/libchamplain:0.12[gtk] ) pdf? ( >=app-text/poppler-0.62[cairo] ) @@ -61,6 +59,9 @@ 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 + # Lua version sed -e "s/lua5.[0-9]/${LUA_SINGLE_TARGET/-/.}/" -i meson.build || die } @@ -71,7 +72,6 @@ src_configure() { -Dgq_htmldir="share/doc/${PF}/html" $(meson_use debug) $(meson_feature djvu) - $(meson_feature doc) $(meson_feature exif exiv2) $(meson_feature ffmpegthumbnailer videothumbnailer) $(meson_feature heif) diff --git a/media-gfx/geeqie/geeqie-9999.ebuild b/media-gfx/geeqie/geeqie-9999.ebuild index ffac439db08a..9d85f853281b 100644 --- a/media-gfx/geeqie/geeqie-9999.ebuild +++ b/media-gfx/geeqie/geeqie-9999.ebuild @@ -55,6 +55,9 @@ 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
