gentoo auto-resync : 26:03:2024 - 01:01:01

4 files changed, 136 insertions, 2 deletions

diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 30d297007789..da98f852c87a 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,6 +1,7 @@
 AUX geeqie-2.1-exiv2-0.28.0.patch 5556 BLAKE2B 3af45f27984d789dc1618b348dabfa3cb7264fcce257f1f6dcf69aa7b37a11f48b5ddf9dfdd3f4f630da2583571bf228e95bf98729a13290f133c18c468651c7 SHA512 9e63688935b1f3c3bc33c238201b5cb5508a91df2c58020656a31edb88f22b2e53e6abcd61fa7b1634a772cc7cc1ce7307f57e93fbdc8a7beb2d63c1dc44df6f
 AUX geeqie-2.1-locale.patch 522 BLAKE2B f676a4b2b0acb6184c66657314974f61413172bef3290d05d2764afae48b476fc40892012d1af93f02454de127a5b38cec240057ad20c3a6a63e11e354906b75 SHA512 c9d402fd9bb5d49a1f4219e33e24a16d656a6ba0a3eaddd6864debab09b3742927a89892e2fffe3c6726abe3f6b2bc6baae9af1ecf035f5a02ff3f9b5ad6ce59
 AUX geeqie-2.1-lua_hpp.patch 344 BLAKE2B 8206ef3ec5faf9b94efe57413905dedef5046b0d90056864e33b2adb876ca4bb3867417a24e4f6956d14923b3ee119ee5e8379f314cffe8ade2c1102bcb3c1de SHA512 599f9b63fad24bd292a393ead338894c6330b82fc3e02e71e16f7a85b49fa0ed564677444b5d78d68b4ac91ad04e8a6c237e3119031e1307ab089ae37e6eb838
+AUX geeqie-2.3-locale.patch 336 BLAKE2B 26d6712244e382be5981ad0c940828565e066aca961fd2fb4815bea26fe020c9ca95475b8f661f649e7a0ca54fdeea17aefcef2327e99f076646888b0fc3bf1a SHA512 00900c3740b1200db4eb515f0c5d77ac73d284e879d7c0dd36297953dc12149c65cc383ecc2837f55881dbf62e1ab0cedc0c6f58ff9e5aba1e73bd6a9314b2d8
 AUX geeqie-2.3-test-ancillary.patch 630 BLAKE2B a997e60c3fd6fe78b72019babbf2ad7d9f4fccea275cc95903925ed7ed1e0486da2d82e76e0afd43f82932c123ee03891878bf68d0ef5d714528806f206db45a SHA512 69aa64bf6945f6cd11b6ccd93052c5589f332f55d3e022e5b23b0e5eee0fada4764c54b7dffa75b8e5432f5c7d4c27384992cdd61a18c779feede4827f2be5ff
 DIST geeqie-2.1-docs.tar.xz 333756 BLAKE2B 2e569f4000befdaecebd6df9c94c59b8d9e05743343b1ba2ab647a228cc595b71369173cd0e7b798227a0843d493eb7d59be19b8259015239cfcdf8b5a40d339 SHA512 f1701e1f7550dc58d2d65f35da09284958b1d92f60568a8774831025525c835d2a03a48fd582052d3fca9cd2c15d935e30baf3f6599f624bf3dbccfeb606745d
 DIST geeqie-2.1.tar.xz 1800612 BLAKE2B 60190532eb8830e12acf06e39046dd04ccf28ac5d3679f2063e6f6e102add0d398dfc70a57a758d0c16483d5314ec88cb56b54829103ad938b29ac1500f86fdc SHA512 1812234d349536626433bbb7670cd45ef5ce328bf58f603af8eb4a01f7d3db2557d5a812714b12a9b49559aa1fe1c186ceddf2f632c2b303d64d36ad746a2d2f
@@ -8,8 +9,11 @@ DIST geeqie-2.2-docs.tar.xz 356976 BLAKE2B 3bca2815a6f177a2f38b9a66ff6fa95dba510
 DIST geeqie-2.2.tar.xz 2169096 BLAKE2B fe7f21f5842ac7824ec37f0775d31e8dcd05934809f7bdd84d7dcb749d25976055050f42a8cea3cd414fb3c7e60055c9fa32b93cfef2af62de68f4d44af425c8 SHA512 7d03493b463a1949cbc5e377927abc4bc6fa62914e8cdddb30a832cb9c6caad579f5ba5bd2b8b0913b77063300c9c5ac1f7e671ddfb2ce18d8a8d0efcfb51dbe
 DIST geeqie-2.3-docs.tar.xz 362412 BLAKE2B e05adbd6b277cfccae20c2ed7840e447016b32a9bf5c5ad6feb143993b4856fbb623feb6684a21c235ad846923463bed45cf887b1854189f01a46c3961f26a18 SHA512 cab4739adecd1dcb9cde3a58a2e2c2262f4014bc7594ae22af69b8bdbb14f6849b1e2267646301f31ebde76b2b2abc05e75aac3325e35cb88f9dc40703f2d943
 DIST geeqie-2.3.tar.xz 2184604 BLAKE2B dbd2d52d146d373a9694a7371a8ac44571e63895cf6cea7acb549a1135b4cf5869737cdf780ca6afdb14eda1338cb275791eaac1cd7596ed58eb07759cf75778 SHA512 9f45974d12c1f193a4a3624064b967fc06cf9c906c45160a4945a8f6a9d814b929b92c45a35006c7f1b20fa5fe360858f24fd54adbcd8863c3e7d787a3429899
+DIST geeqie-2.4-docs.tar.xz 364536 BLAKE2B 688720808c8e4543455259966aef726bf56a821890a78e4757d9d1fd02ce67217461808d9697b331b2a94841bf3581b25242a7e5c9c9a3f5b02209a566b09c16 SHA512 07bca33c347f448ee853ea60daf22c9cdace458b6ce6b3f4ced9b343a965370c51d7a872d5279852b7a83a1de51c8529a668f7d62a031bcec1fdde8b9bfbf9cb
+DIST geeqie-2.4.tar.xz 2178572 BLAKE2B df24f0b5d443cbd2033c0b382fe0d846c9073e8966aa736f647e34930e44083b9e44252c554578548a13c12c1b1a5a48bb7795f2fda8b8688a63ef402a257334 SHA512 7e0f5dff21e38a41adf0a793bd82652c5d639e84ab49403517f4b1dae042bfc5f4d02e54b54928e04a2397300acb04b130347df0be5637ee48634f5865ad346b
 EBUILD geeqie-2.1-r1.ebuild 3277 BLAKE2B e9a43ed274613dd5a98552d1d83768cffbc0be641d1661d6bd9b5d4b599e210d48dd6fe771c03d90abfc895bd582901e1ac0c4c224edbe96c6139f75e0b40e87 SHA512 f1a090d18fe0f6bb6ab3f7ecb6c42a996fcfbe05457f97ae00cff4d44da057107acd982616ffc307208bc893235ec5b1bcaeee79eefbae177a445a1f465e54da
 EBUILD geeqie-2.2.ebuild 3284 BLAKE2B 3c81435058a54a3da139b128db23b2adc7a378c9fb6a7f81cc9405b427ad66696f94c42bf39fb65583d79a8ac7428c2130a4e780410643fe6511457d4b3bea67 SHA512 db41ac9bfe390f64c6352a33f9c2181d3fe27d0e15c256cabef7ab026d4398342f0de05c4f29466634ec419d07f2c13b6294551e27dcb47df66c221f55aa6641
-EBUILD geeqie-2.3.ebuild 3342 BLAKE2B ba2e5484201f6d834d3a5ff70cc28a2bab369bdc2286a27285b86ceb33b54325b47e4d03b00a5b98ee00039bcd50c57b917e7faea4570dca1405265590c5ba20 SHA512 b7af3c8f7479996f9228c6c36269e33975356245b018654f140b16ef84a0a327c867677e5ecce9020759fe3fa181918145eaa5e9b1fcfbcbd8ecc79a094baa59
+EBUILD geeqie-2.3.ebuild 3376 BLAKE2B 515083b0ecb99fa9c2d6f92d9df2ef9c8f1e72436c290bb02311cfe73bcb0a92f0334df33c1453a709cf94277cddb99deaf9ba9276895524ec42126ef44616f5 SHA512 4906e493fe819d29e6c94dcb452b8f2382a0e01f59b60b8fb0afd0ac8c79f27c2befd23ed6366fd4e76a6da6dafc75d24aaab552f93ca0fad7a3b38f5d6c4e7d
+EBUILD geeqie-2.4.ebuild 3342 BLAKE2B ba2e5484201f6d834d3a5ff70cc28a2bab369bdc2286a27285b86ceb33b54325b47e4d03b00a5b98ee00039bcd50c57b917e7faea4570dca1405265590c5ba20 SHA512 b7af3c8f7479996f9228c6c36269e33975356245b018654f140b16ef84a0a327c867677e5ecce9020759fe3fa181918145eaa5e9b1fcfbcbd8ecc79a094baa59
 EBUILD geeqie-9999.ebuild 3055 BLAKE2B 450d32bd793aa6436b3ab676758758e57f1bd34fa38ceafbd14a3df436611cc0f25a1c93f05f51104089e2c76a82f2605f00467e0aedf41032645d5e236f6421 SHA512 c1695fa7e9fe635f5799677c13014f4792ca2463654d1faeb967fd9fa6f89a757892316386797590632f3a233eb19daff8e724cd59d937294e2f48c79246d26c
 MISC metadata.xml 816 BLAKE2B ed50c576f068626d95d99899b17508b7c48567707ff020988dc611be9b482893f008f904ce460565ed0f263c76f2e274640f6e662f827d0879de5a59a93e8c3b SHA512 45458e31201d1baee61f48fe452c3577bcb74fea6569d1afdd8787aff6714d3400f501d1dc6b3de31ea1d5151326d48593f5bb219ec5cfed603cfe8835690dcd
diff --git a/media-gfx/geeqie/files/geeqie-2.3-locale.patch b/media-gfx/geeqie/files/geeqie-2.3-locale.patch
new file mode 100644
index 000000000000..05f8bdcfdaea
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-2.3-locale.patch
@@ -0,0 +1,11 @@
+diff -Naur geeqie-2.3.orig/src/misc.cc geeqie-2.3/src/misc.cc
+--- geeqie-2.3.orig/src/misc.cc	2024-03-06 16:56:22.000000000 +0100
++++ geeqie-2.3/src/misc.cc	2024-03-25 21:03:18.655779225 +0100
+@@ -23,6 +23,7 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+ 
++#include <clocale>
+ #include <cstdio>
+ #include <cstdlib>
+ #include <cstring>
diff --git a/media-gfx/geeqie/geeqie-2.3.ebuild b/media-gfx/geeqie/geeqie-2.3.ebuild
index 2b9b96fbe6a9..dae22816e4fd 100644
--- a/media-gfx/geeqie/geeqie-2.3.ebuild
+++ b/media-gfx/geeqie/geeqie-2.3.ebuild
@@ -49,7 +49,9 @@ BDEPEND="
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.3-test-ancillary.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.3-test-ancillary.patch
+	"${FILESDIR}"/${P}-locale.patch
+	)
 
 pkg_setup() {
 	# Do not require setting LUA_SINGLE_TARGET if lua is not used
diff --git a/media-gfx/geeqie/geeqie-2.4.ebuild b/media-gfx/geeqie/geeqie-2.4.ebuild
new file mode 100644
index 000000000000..2b9b96fbe6a9
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-2.4.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+LUA_COMPAT=( lua5-{3,4} )
+
+inherit flag-o-matic lua-single meson optfeature xdg
+
+DESCRIPTION="A lightweight GTK image viewer forked from GQview"
+HOMEPAGE="http://www.geeqie.org"
+SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz
+	https://dev.gentoo.org/~voyageur/distfiles/${P}-docs.tar.xz"
+# Doc build:
+# clone git at matching tag
+# mkdir build; ./gen_changelog.sh . build;
+# pandoc README.md -o build/README.html
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+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 )
+	exif? ( >=media-gfx/exiv2-0.17:=[xmp?] )
+	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
+	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] )
+	pdf? ( >=app-text/poppler-0.62[cairo] )
+	raw? ( >=media-libs/libraw-0.20:= )
+	spell? ( app-text/gspell )
+	tiff? ( media-libs/tiff:= )
+	webp? ( gui-libs/gdk-pixbuf-loader-webp:= )
+	zip? ( >=app-arch/libarchive-3.4.0 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	|| ( dev-util/xxdi app-editors/vim-core )
+	dev-util/glib-utils
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.3-test-ancillary.patch )
+
+pkg_setup() {
+	# Do not require setting LUA_SINGLE_TARGET if lua is not used
+	use lua && lua-single_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
+}
+
+src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/585432
+	# https://github.com/BestImageViewer/geeqie/issues/1270
+	filter-lto
+
+	local emesonargs=(
+		-Dgq_helpdir="share/doc/${PF}"
+		-Dgq_htmldir="share/doc/${PF}/html"
+		$(meson_use debug)
+		$(meson_feature djvu)
+		$(meson_feature exif exiv2)
+		$(meson_feature ffmpegthumbnailer videothumbnailer)
+		$(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 pdf)
+		$(meson_feature raw libraw)
+		$(meson_feature spell)
+		$(meson_feature tiff)
+		$(meson_feature zip archive)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# Manually generated ChangeLog
+	dodoc "${WORKDIR}"/${P}-docs/*
+
+	# The application needs access to some uncompressed doc files.
+	docompress -x /usr/share/doc/${PF}/AUTHORS
+	docompress -x /usr/share/doc/${PF}/ChangeLog
+	docompress -x /usr/share/doc/${PF}/README.md
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "Camera import and tethered photography plugins" media-gfx/gphoto2
+	optfeature "Lens ID plugin" media-libs/exiftool
+	optfeature "Image crop plugin" "media-libs/exiftool media-gfx/imagemagick"
+	optfeature "Image rotate plugin (JPEG)" media-gfx/fbida
+	optfeature "Image rotate plugin (TIFF/PNG)" media-gfx/imagemagick
+	optfeature "Print preview functionality" app-text/evince
+}