gentoo resync : 06.04.2022

4 files changed, 128 insertions, 1 deletions

diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index d182a9319cd6..dec2580c8aa7 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,3 +1,6 @@
+AUX 3.12.2-link-with-x11.patch 419 BLAKE2B f13fc6aead441d83ba55fafd3528a96691c18bca894c5aed6f8e6e1a9084059ec1843668ef8f76697a866979de4d2aaed944ca1729dd6f49d0aa1af316ecb7cc SHA512 667aed7e8dae78b19e0df37ca7f03b565d87a2ffa05a8ef3e3460c3cc491c263ba29781b0659c9a57595e735d38d27ae78f37898011189514ff6a1c237d2b1bb
 DIST gthumb-3.10.4.tar.xz 7581416 BLAKE2B 7afc94c18d819a5eef7d075489533cf99e7f6d5eaf409b163524a2f62d9c22a40edbc114b16d6d7b7960df53d49cefda9196ebeaa2bc0c19e5760f584628209b SHA512 90f7d83d2fb6db12ef16e5ce29d9310ed5aaccb269004d72df985dda839c1ce738354942f537a23f63cbe724a351a0f13f2eb1e659ada50196af1bc60d5c5d27
+DIST gthumb-3.12.2.tar.xz 7585700 BLAKE2B 9fb4fd934975fb775b82cf17028abd6d4ac3c31ee30458c377d36d3af97e59218e621d09768eebec096c64e3d01697bd3080409fd2191c2af29d84c9b53508c1 SHA512 5304b5cfefa4ced6a244db5a6e2880dad4f5a598654c9ea6c7707ddc0a766bdfa108f827a74e400168dbc338e35db519fffb7ac7382e0ee564771d56af3ac97c
 EBUILD gthumb-3.10.4.ebuild 2348 BLAKE2B bdbd9aedb683d9a02e2731418c175405d50ce3388400970d944dbc119af902e57bcf735c2ee4bd7744be41b2fa77bc5ae22edf148061fcf29ccaa35825bed17c SHA512 aaac5963f3b6d12596c6b216fb29a2269d322013f8db95a45b38abf07053087d6132725985b5781bbf9e2b1804597700172da0179144c3511653614e44530ced
-MISC metadata.xml 421 BLAKE2B 4b3895ebffd9ff5b3b63f7b32cd30e4e36f1156a9201b1e8d4cac7de62bd1cf72b2d11e321bae2dffe0818c6140170f6b14249ce4a38f0e65a78139f98316f06 SHA512 91e93d9d56d9254c80723c864178ba2f0e31e7d2fd998ccece63c8d225bff0c5b3477c98c94deb3c768a6e150dbbd3eff7d8c0d9f0abf31bab9207b0161eab10
+EBUILD gthumb-3.12.2-r1.ebuild 2565 BLAKE2B d36be19d437bc141a95d87e1d4a1a632549fd865d0e4e1f424ae7022a9396fbfa9cd272e059c97734e71a770ad771ad5aaf7d825ed06686524723615428cd6c2 SHA512 b901a9a73967f6d0c645fdb0b409c097e83a0556ed36654994acfde1221ab4e5861fa752e321ed3bf4c26ac19b200db4d6fff9b331ace047bb0c7f3f0172d789
+MISC metadata.xml 610 BLAKE2B 3f0da33439a8ea18b5a5b3939d892494370c163a41bbf1daf1e9663a6ca25f833447c555d04debc2f61795d4eea3eb2691e3181492dbc3be0a72df8ca960c501 SHA512 b12acc3949bac7cc6f45de0db32c7741eeadda19a975d4dd743053f6c3c63e3358c6900139793e3eeda782b91757f25cebbd5fbc5d550568d36fe2ff3581edaf
diff --git a/media-gfx/gthumb/files/3.12.2-link-with-x11.patch b/media-gfx/gthumb/files/3.12.2-link-with-x11.patch
new file mode 100644
index 000000000000..b5e84710e5e1
--- /dev/null
+++ b/media-gfx/gthumb/files/3.12.2-link-with-x11.patch
@@ -0,0 +1,14 @@
+https://gitlab.gnome.org/GNOME/gthumb/-/issues/222
+
+diff --git a/meson.build b/meson.build
+index 2a970673..4cdc1a5e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -232,6 +232,7 @@ common_deps = [
+   dependency('gmodule-2.0'),
+   dependency('gio-unix-2.0'),
+   dependency('gtk+-3.0', version : gtk_version),
++  dependency('x11'),
+   dependency('libpng'),
+   dependency('zlib'),
+   dependency('gsettings-desktop-schemas')
diff --git a/media-gfx/gthumb/gthumb-3.12.2-r1.ebuild b/media-gfx/gthumb/gthumb-3.12.2-r1.ebuild
new file mode 100644
index 000000000000..480440e8f992
--- /dev/null
+++ b/media-gfx/gthumb/gthumb-3.12.2-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
+
+DESCRIPTION="Image viewer and browser for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gthumb"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="cdr colord exif gnome-keyring gstreamer heif http jpegxl lcms raw slideshow svg tiff webp"
+
+# libX11 dep is a workaround. See files/3.12.2-link-with-x11.patch
+RDEPEND="
+	x11-libs/libX11
+
+	>=dev-libs/glib-2.54.0:2
+	>=x11-libs/gtk+-3.16.0:3
+	exif? ( >=media-gfx/exiv2-0.21:= )
+	slideshow? (
+		>=media-libs/clutter-1.12.0:1.0
+		>=media-libs/clutter-gtk-1:1.0
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-plugins/gst-plugins-gtk:1.0
+	)
+	raw? (
+		>=media-libs/libraw-0.14:=
+	)
+	http? (
+		>=net-libs/libsoup-2.42.0:2.4
+		>=dev-libs/json-glib-0.15.0
+		>=net-libs/webkit-gtk-1.10.0:4
+	)
+	gnome-keyring? ( >=app-crypt/libsecret-0.11 )
+	cdr? ( >=app-cdr/brasero-3.2.0 )
+	svg? ( >=gnome-base/librsvg-2.34:2 )
+	webp? ( >=media-libs/libwebp-0.2.0:= )
+	lcms? ( >=media-libs/lcms-2.6:2 )
+	colord? (
+		>=x11-misc/colord-1.3
+		>=media-libs/lcms-2.6:2
+	)
+
+	sys-libs/zlib
+	virtual/jpeg:0=
+	tiff? ( media-libs/tiff:= )
+	media-libs/libpng:0=
+	>=gnome-base/gsettings-desktop-schemas-0.1.4
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/appstream-0.14.6
+	dev-util/glib-utils
+	dev-util/itstool
+	sys-devel/bison
+	sys-devel/flex
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-link-with-x11.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		-Drun-in-place=false
+		$(meson_use exif exiv2)
+		$(meson_use slideshow clutter)
+		$(meson_use gstreamer)
+		-Dlibchamplain=false # Upstream still doesn't seem to consider this ready
+		$(meson_use colord)
+		$(meson_use tiff libtiff)
+		$(meson_use webp libwebp)
+		$(meson_use jpegxl libjxl)
+		$(meson_use heif libheif)
+		$(meson_use raw libraw)
+		$(meson_use svg librsvg)
+		$(meson_use gnome-keyring libsecret)
+		$(meson_use http webservices)
+		$(meson_use cdr libbrasero)
+	)
+
+	# colord pulls in lcms2 anyway, so enable lcms with USE="colord -lcms"; some of upstream HAVE_COLORD code depends on HAVE_LCMS2
+	if use lcms || use colord; then
+		emesonargs+=( -Dlcms2=true )
+	else
+		emesonargs+=( -Dlcms2=false )
+	fi
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/gthumb/metadata.xml b/media-gfx/gthumb/metadata.xml
index d03ecf7b2c83..cf37ee13e1b6 100644
--- a/media-gfx/gthumb/metadata.xml
+++ b/media-gfx/gthumb/metadata.xml
@@ -6,7 +6,9 @@
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
 	<use>
+		<flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using <pkg>media-libs/libheif</pkg></flag>
 		<flag name="http">Enable webservice integration through <pkg>net-libs/webkit-gtk</pkg></flag>
+		<flag name="jpegxl">Support for JPEG XL image format</flag>
 		<flag name="slideshow">Enable slideshow plugin</flag>
 	</use>
 </pkgmetadata>