gentoo auto-resync : 21:08:2023 - 09:43:30

4 files changed, 265 insertions, 2 deletions

diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 74c8245e8607..9ded47810cd7 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,11 +1,13 @@
 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
+AUX geeqie-2.1-exiv2-0.28.0.patch 5556 BLAKE2B 3af45f27984d789dc1618b348dabfa3cb7264fcce257f1f6dcf69aa7b37a11f48b5ddf9dfdd3f4f630da2583571bf228e95bf98729a13290f133c18c468651c7 SHA512 9e63688935b1f3c3bc33c238201b5cb5508a91df2c58020656a31edb88f22b2e53e6abcd61fa7b1634a772cc7cc1ce7307f57e93fbdc8a7beb2d63c1dc44df6f
 AUX geeqie-2.1-lua_hpp.patch 344 BLAKE2B 8206ef3ec5faf9b94efe57413905dedef5046b0d90056864e33b2adb876ca4bb3867417a24e4f6956d14923b3ee119ee5e8379f314cffe8ade2c1102bcb3c1de SHA512 599f9b63fad24bd292a393ead338894c6330b82fc3e02e71e16f7a85b49fa0ed564677444b5d78d68b4ac91ad04e8a6c237e3119031e1307ab089ae37e6eb838
 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
 DIST geeqie-2.1-docs.tar.xz 333756 BLAKE2B 2e569f4000befdaecebd6df9c94c59b8d9e05743343b1ba2ab647a228cc595b71369173cd0e7b798227a0843d493eb7d59be19b8259015239cfcdf8b5a40d339 SHA512 f1701e1f7550dc58d2d65f35da09284958b1d92f60568a8774831025525c835d2a03a48fd582052d3fca9cd2c15d935e30baf3f6599f624bf3dbccfeb606745d
 DIST geeqie-2.1.tar.xz 1800612 BLAKE2B 60190532eb8830e12acf06e39046dd04ccf28ac5d3679f2063e6f6e102add0d398dfc70a57a758d0c16483d5314ec88cb56b54829103ad938b29ac1500f86fdc SHA512 1812234d349536626433bbb7670cd45ef5ce328bf58f603af8eb4a01f7d3db2557d5a812714b12a9b49559aa1fe1c186ceddf2f632c2b303d64d36ad746a2d2f
 EBUILD geeqie-2.0.1-r4.ebuild 3222 BLAKE2B c5f8692d3801de700a3b5eb56c3385aa505e0a4dc5bc168aaf6882634c6653d82772b3e2b4bf5efe4b35461a08c42a23cafd717d27780fad2e06bbc3619f228f SHA512 8fefa2268feb69df22f212c9894134c352aa17b81ab5d14e1848fd38e52d6d9794f57b3e03fb5c381c0aaae21e0ea4ea7344b663613dc5e4db4f0c9ca2f527e0
+EBUILD geeqie-2.1-r1.ebuild 3114 BLAKE2B 3d5e834c0a792a6156dc672d3084ff2e90f72630d89e0115f5b38f6d8cfe608999000c03dc4ebeaf5c6c51f13ebf28486a8400e34d63d9cf3641f4f75ba25807 SHA512 9929c06c599153cd65ab5c21f2855b2f33ef4682d0eb0cd943f493f3ee0e1e0fcb3184e8d8f3fae5969715fb570dadc069ceb5f6cd3a97503ea3beb7ab5fe205
 EBUILD geeqie-2.1.ebuild 3075 BLAKE2B 95a2699a51c86d62e92c4e3a4bd0c08d2224c957f02dea199652b9009f577eb7e393b4efc35606013aad1a58de0cdd812fe509afed752735c37fbaec57dfd719 SHA512 b7449eaa6a325ac901e33e1b4da43e74605e16d6b7d47bb3dcdd0fb0052a8055aab692285023b90c2618b5eea97f90aef67b174775f9967c1d6332728309777b
 EBUILD geeqie-9999.ebuild 2946 BLAKE2B d9deaa6cfed97e34e0969e2aa4f64ff7881b342c4c095bae6a8ac1ef5f99f5120fdc4ee64c554a97c3715e402d6c5bc2c5e915531891c0f2b9b8a79f902694b0 SHA512 a5e6b76d4c3b2c024f2f98d87335e679553315b88b9d809fcfc5603157576b5abb6d3848c9feb0bf18107c126eaf9530540489ee1080a7d787ec428c0e944c52
-MISC metadata.xml 964 BLAKE2B 68899bc0e99e06b4121753cbe15beea5a5edecff0673b1265dd09e43f06fcf76f9769949d2d08470711eafa4fc65a07a926a66465cab47aa0aa0393cab7969d4 SHA512 83ede5f6bb9ad78cddf27cb98f2985d18e46112118a823f728f29f76a1804f62bdc4252faea39adfd3a64d8959e0a9be75c7349eee5e0be4e306a8ef21597e0b
+MISC metadata.xml 885 BLAKE2B 9e418f506ece9bfde90026f68374b5d288623b588d9cfb04c34caf936ded5e7f7b032ab4de07116188aa1975b5501cd1eb00a8c1bd895bac8f61891ee5b2e255 SHA512 a0c73f9d87de7dba935e72a8a4ebc5ef019f22d1b84faed6faaa3171ffb963a1aad2501c7116cdf56b9a6b9254818487a14c6792857a28c98cccb57ee4f4a3b1
diff --git a/media-gfx/geeqie/files/geeqie-2.1-exiv2-0.28.0.patch b/media-gfx/geeqie/files/geeqie-2.1-exiv2-0.28.0.patch
new file mode 100644
index 000000000000..13b6a171257d
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-2.1-exiv2-0.28.0.patch
@@ -0,0 +1,151 @@
+From c45cca777aa3477eaf297db99f337e18d9683c61 Mon Sep 17 00:00:00 2001
+From: Kevin Backhouse <kevinbackhouse@github.com>
+Date: Wed, 21 Jun 2023 12:23:33 +0100
+Subject: [PATCH] Add ExifData as extra argument to
+ exif_item_get_data_as_text().
+
+---
+ src/advanced-exif.cc | 2 +-
+ src/exif-common.cc   | 2 +-
+ src/exif.cc          | 8 ++++----
+ src/exif.h           | 2 +-
+ src/exiv2.cc         | 4 ++--
+ 5 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/src/advanced-exif.cc b/src/advanced-exif.cc
+index 79a54b12..e3d3067a 100644
+--- a/src/advanced-exif.cc
++++ b/src/advanced-exif.cc
+@@ -120,7 +120,7 @@ static void advanced_exif_update(ExifWin *ew)
+ 		tag = g_strdup_printf("0x%04x", exif_item_get_tag_id(item));
+ 		tag_name = exif_item_get_tag_name(item);
+ 		format = exif_item_get_format_name(item, TRUE);
+-		text = exif_item_get_data_as_text(item);
++		text = exif_item_get_data_as_text(item, exif);
+ 		utf8_text = utf8_validate_or_convert(text);
+ 		g_free(text);
+ 		elements = g_strdup_printf("%d", exif_item_get_elements(item));
+diff --git a/src/exif-common.cc b/src/exif-common.cc
+index 6a4c9740..b6f07ca6 100644
+--- a/src/exif-common.cc
++++ b/src/exif-common.cc
+@@ -995,7 +995,7 @@ gchar *exif_get_data_as_text(ExifData *exif, const gchar *key)
+ 	if (key_valid) return text;
+ 
+ 	item = exif_get_item(exif, key);
+-	if (item) return exif_item_get_data_as_text(item);
++	if (item) return exif_item_get_data_as_text(item, exif);
+ 
+ 	return nullptr;
+ }
+diff --git a/src/exif.cc b/src/exif.cc
+index 8708ff53..cda2cb1a 100644
+--- a/src/exif.cc
++++ b/src/exif.cc
+@@ -1454,7 +1454,7 @@ gchar *exif_item_get_string(ExifItem *item, gint UNUSED(idx))
+ 	return exif_item_get_data_as_text_full(item, METADATA_PLAIN);
+ }
+ 
+-gchar *exif_item_get_data_as_text(ExifItem *item)
++gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *exif)
+ {
+ 	return exif_item_get_data_as_text_full(item, METADATA_FORMATTED);
+ }
+@@ -1527,11 +1527,11 @@ gchar *exif_get_tag_description_by_key(const gchar *key)
+ 	return NULL;
+ }
+ 
+-static void exif_write_item(FILE *f, ExifItem *item)
++static void exif_write_item(FILE *f, ExifItem *item, ExifData *exif)
+ {
+ 	gchar *text;
+ 
+-	text = exif_item_get_data_as_text(item);
++	text = exif_item_get_data_as_text(item, exif);
+ 	if (text)
+ 		{
+ 		gchar *tag = exif_item_get_tag_name(item);
+@@ -1578,7 +1578,7 @@ void exif_write_data_list(ExifData *exif, FILE *f, gint human_readable_list)
+ 			item = (ExifItem*)(work->data);
+ 			work = work->next;
+ 
+-			exif_write_item(f, item);
++			exif_write_item(f, item, exif);
+ 			}
+ 		}
+ 	g_fprintf(f, "----------------------------------------------------\n");
+diff --git a/src/exif.h b/src/exif.h
+index fcc7d8f5..4b03c201 100644
+--- a/src/exif.h
++++ b/src/exif.h
+@@ -136,7 +136,7 @@ gchar *exif_item_get_data(ExifItem *item, guint *data_len);
+ gchar *exif_item_get_description(ExifItem *item);
+ guint exif_item_get_format_id(ExifItem *item);
+ const gchar *exif_item_get_format_name(ExifItem *item, gboolean brief);
+-gchar *exif_item_get_data_as_text(ExifItem *item);
++gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *exif);
+ gint exif_item_get_integer(ExifItem *item, gint *value);
+ ExifRational *exif_item_get_rational(ExifItem *item, gint *sign, guint n);
+ 
+diff --git a/src/exiv2.cc b/src/exiv2.cc
+index 33b779e7..dc62e8e0 100644
+--- a/src/exiv2.cc
++++ b/src/exiv2.cc
+@@ -778,13 +778,13 @@ const char *exif_item_get_format_name(ExifItem *item, gboolean UNUSED(brief))
+ }
+ 
+ 
+-gchar *exif_item_get_data_as_text(ExifItem *item)
++gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *exif)
+ {
+ 	try {
+ 		if (!item) return nullptr;
+ 		auto metadatum = reinterpret_cast<Exiv2::Metadatum *>(item);
+ #if EXIV2_TEST_VERSION(0,17,0)
+-		return utf8_validate_or_convert(metadatum->print().c_str());
++		return utf8_validate_or_convert(metadatum->print(&exif->exifData()).c_str());
+ #else
+ 		std::stringstream str;
+ 		Exiv2::Exifdatum *exifdatum;
+From b04f7cd0546976dc4f7ea440648ac0eedd8df3ce Mon Sep 17 00:00:00 2001
+From: Colin Clark <colin.clark@cclark.uk>
+Date: Wed, 21 Jun 2023 14:24:41 +0100
+Subject: [PATCH] Remove exiv2 0.28.0 restriction
+
+https://github.com/BestImageViewer/geeqie/pull/1119
+
+The bug was fixed in the above commit.
+---
+ meson.build | 12 ++----------
+ 1 file changed, 2 insertions(+), 10 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index a4cab49c..412399fe 100644
+--- a/meson.build
++++ b/meson.build
+@@ -280,15 +280,7 @@ else
+ endif
+ 
+ exiv2_dep = []
+-# See https://github.com/BestImageViewer/geeqie/issues/1090
+-# for the reason for 0.28.0 exclusion
+-req_version = ['>=0.11', '!=0.28.0']
+-
+-req_version_str = ''
+-foreach req_version_str_ : req_version
+-    req_version_str += req_version_str_
+-endforeach
+-
++req_version = '>=0.11'
+ option = get_option('exiv2')
+ if not option.disabled()
+     exiv2_dep = dependency('exiv2', version : req_version, required : get_option('exiv2'))
+@@ -296,7 +288,7 @@ if not option.disabled()
+         conf_data.set('HAVE_EXIV2', 1)
+         summary({'exiv2' : ['image metadata processed by exiv2:', true]}, section : 'Configuration', bool_yn : true)
+     else
+-        summary({'exiv2' : ['exiv2 ' + req_version_str + ' not found - image data not processed by exiv2:', false]}, section : 'Configuration', bool_yn : true)
++        summary({'exiv2' : ['exiv2 ' + req_version + ' not found - image data not processed by exiv2:', false]}, section : 'Configuration', bool_yn : true)
+     endif
+ else
+     summary({'exiv2' : ['disabled - image data processed by exiv2:', false]}, section : 'Configuration', bool_yn : true)
diff --git a/media-gfx/geeqie/geeqie-2.1-r1.ebuild b/media-gfx/geeqie/geeqie-2.1-r1.ebuild
new file mode 100644
index 000000000000..ef29faa38032
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-2.1-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+LUA_COMPAT=( lua5-{3,4} )
+
+inherit 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"
+
+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}"/${P}-lua_hpp.patch
+	"${FILESDIR}"/${P}-exiv2-0.28.0.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() {
+	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
+}
diff --git a/media-gfx/geeqie/metadata.xml b/media-gfx/geeqie/metadata.xml
index 280f5ee936ea..2b948d61d941 100644
--- a/media-gfx/geeqie/metadata.xml
+++ b/media-gfx/geeqie/metadata.xml
@@ -8,7 +8,6 @@
 	<longdescription>Geeqie is a lightweight image viewer. It was forked from GQview. The development is focused on features for photo collection maintenance: raw format, Exif/IPTC/XMP metadata and integration with programs like UFraw, ImageMagick, Gimp, gPhoto or ExifTool</longdescription>
 	<use>
 		<flag name="ffmpegthumbnailer">Enable video thumbnail support with <pkg>media-video/ffmpegthumbnailer</pkg></flag>
-		<flag name="gpu-accel">Enable GPU acceleration support - experimental</flag>
 		<flag name="jpegxl">Enable support for JPEG XL image format</flag>
 		<flag name="map">Enable items GPS map display</flag>
 	</use>