From 1bb02f2ca2710df2358072c9a036ae83d2ece88c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Oct 2022 03:53:02 +0100 Subject: gentoo auto-resync : 25:10:2022 - 03:53:02 --- media-gfx/geeqie/Manifest | 6 +++--- 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 | 13 ++++++++----- 4 files changed, 17 insertions(+), 14 deletions(-) (limited to 'media-gfx/geeqie') diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index 0e5045fb6652..f1885f01b1e7 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1,9 +1,9 @@ -AUX geeqie-2.0.1-allow_xxdi.patch 774 BLAKE2B 4bba0667ea4030bba821787d22725e0db177ab5034a77124c85467f4c4b34b3148f4b3001f9466ee472425958d6d97fd868539a7c7d04740872255aad6ed6543 SHA512 83788dc0e4e99e9a2ad6e4da20c9c8d61e8bea9678d86b40c82cfc9d925abde2bfbdc5cfa0fbf421056b3625049fdf037dcc18402049dfba8c1c4443106464d8 +AUX geeqie-2.0.1-allow_xxdi.patch 776 BLAKE2B 59f566ef44b581e06b7d066fc6874a552bc08ad4b180ed1a240839661d50a92b860738efd8994c3a5344746bb109cd6da7cac0b68c3b37f730ba842a9382883e SHA512 376ca5efc6ec2f5385c4c4f77e5257d105ecf2ef39d26576a2f50307b8babdb2ae55d8aa38a23709eb1aa7d5dfa62e0213b3a71aebe70c54c7d6a1afc5b7da8a AUX geeqie-2.0.1-doc_option.patch 4141 BLAKE2B 59ea49f13d8bd666a01c0905ae95845eb1ecc6acbe71b7ef8553902c0ffca172984ca7dabe39e840d0ca779e13418a8a8043cacc0e3992d691a363f547fa0d58 SHA512 4edb088606d5a4b6f1d83390b40c47c8d2e06a2da2a2ea21dd9049961c63253a9aaa32d0270ef3969b0a273f5f9d2114a740328d9d4d7bbf73b766ecd2aaa8a8 DIST geeqie-1.7.3.tar.xz 1949696 BLAKE2B c261a09446472f2decb0f332f227453e14fbffbc64bff77c538062d7cf57fd91efd7d30a121b2760795eb9c097e993a1dcbe5ead79cb32c200092e27422ad8b9 SHA512 5647422876dcd41ec369cc926783661e15f33c2794e073df98827b8fc030baf3ebf03587e42eef35caaddc3b315b74ee0f8c3a156422f72522ffbbb7ec0fd8d9 DIST geeqie-2.0.1-ChangeLog.tar.gz 626106 BLAKE2B b1e166e7537d6e2bf8a9fec259315af4d70194688b489eb44715eb51c690806dd6387e6aa884b737222a25114c36b2e1a2a70fd2bbec015e64d5f6274cac1ab9 SHA512 a986981f28bad254747fb674ee16691bbec64afb354eb158dc511e0f9b198bba8e3bd0fc2ae432322806959a5ea7434687cb462c8cbb0d1c9dc17b5431f72288 DIST geeqie-2.0.1.tar.xz 1666600 BLAKE2B e90d9b5c0bfe9d4f84c65e4754ba3ddaee8ba44c6d493cf4b5c0e37d398a4e2f6234c60fc6e88e4022ff4f8fcaf10626037c3a80450921f88f5fd937fd386958 SHA512 cd2251c831c6d4d461d92eee84df08590752ad625e1f50d57e1fb5d0fc6ac16a225584a8217e14bf4f993ba247f7df3296498b27fcc4f5f4c7f25307699aadc5 EBUILD geeqie-1.7.3.ebuild 2322 BLAKE2B 57e6a0b443abe37232d6d241a017da5d2f3f33173bfd3e801ebac526bcfca240415fcf99d38fac0aabec01678a693cef716c94fb15a011c7734e4c956bd7a5ca SHA512 a11a4e45a52482e189fcca579c45bb9be07e1a8b56ca5f68430472b186ccfb2b3d80670b9ab70294832de8c90f7125b9849d1ba6ae0dbb98754d289c2588383c -EBUILD geeqie-2.0.1-r1.ebuild 3206 BLAKE2B 6c3f999812883d72561c7a3404fb56ec9e26831293661629df71dc60093d76f82214436724d6f6d7e96e7f54606519f2b86202dc5641e436d2bb6c0363e8d5ee SHA512 8adbe3711c9dc40e039757a03c259da700bf9306399da8ff5d4fe505f465b1aad7ceb415a8b10aeb21b6a448b544069216f29e6481cf3a093fad041ccf1d7eec -EBUILD geeqie-9999.ebuild 3034 BLAKE2B 0c3f49fa2ec5d21210f405c9892620702e99846b92262c93c5371630c241337fad3a2d89048f69ddd188c3374e29b9030124b6e9ac31d77c4d0167901abc5ea2 SHA512 c4284b1db9733672337618fcc471ebbadca43ff54cfea121111be24f8d4a2ef42829b71beea3b9744ed18b09c09462160124163415b17f600791d7e71b937e65 +EBUILD geeqie-2.0.1-r1.ebuild 3236 BLAKE2B 834efdba26ca755e3bcbda45b850b6035a903be91e2060b9dad7e12e46302a5f243c5d440adddb5480b0cdd8512087dfbc6287c560ede251d9cb6a584128b8bb SHA512 710fd6b9e72a92a5f44f84dacb623987718d17725a7e9cee539ec500dd831c3167059e130b181f5287e229299c44443dd03e3eff995d5653cdda9f66119f074a +EBUILD geeqie-9999.ebuild 3163 BLAKE2B 03580468af556c3645872e313d8458fd88b0e48ce8842a0bba637bb0b492958b365fbfb8df062ec8cb04fa876c4d012e6159749c80778f7b2eb7e63f50789986 SHA512 736b6d49daef5f6dccefd3c6760f784341ace097ce6ea3337d00482b836b89f22c5ba427b179257459c513513f35576c985092582d31fc514332ea51efef3f90 MISC metadata.xml 1004 BLAKE2B 8f631bfdc45713df491faf9f78479c2c675c815547e52e848e55d6b87aad94ddb656d1ec9a3159b2bf22b039f5c25840e9a86da78de80bee97478e0c07c3fd4e SHA512 b721895c5afc72f4e09fd7ce512113495364fffdf0aa8e01e92cf0a4f441e72683e7319023baca99f575b2514d815810b7e04eab12482f20798235246c2a06bd 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 2be0f992fee3..9d85f853281b 100644 --- a/media-gfx/geeqie/geeqie-9999.ebuild +++ b/media-gfx/geeqie/geeqie-9999.ebuild @@ -15,13 +15,12 @@ EGIT_REPO_URI="https://github.com/BestImageViewer/geeqie.git" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -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 ) @@ -29,8 +28,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] ) @@ -57,6 +55,12 @@ 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 } @@ -67,7 +71,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) -- cgit v1.2.3