[gentoo-dev] [PATCH 1/2] gnome2-utils.eclass: Make *_gdk_pixbuf_update work unconditionally

[gentoo-dev] [PATCH 1/2] gnome2-utils.eclass: Make *_gdk_pixbuf_update work unconditionally

[Michał Górny]

Remove the GNOME2_ECLASS_GDK_PIXBUF_LOADERS condition that required
calling gnome2_gdk_pixbuf_savelist prior to gnome2_gdk_pixbuf_update.
The actual list was never used, and all the ebuilds calling the function
in Gentoo contain conditions to avoid calling the function when loaders
are not built.

Closes: https://bugs.gentoo.org/922500
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 eclass/gnome2-utils.eclass | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass
index 3a92a43e306a..bbee2a419dfc 100644
--- a/eclass/gnome2-utils.eclass
+++ b/eclass/gnome2-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: gnome2-utils.eclass
@@ -363,11 +363,6 @@ gnome2_gdk_pixbuf_update() {
 	local updater="${EROOT%/}/usr/bin/${CHOST}-gdk-pixbuf-query-loaders"
 	[[ -x ${updater} ]] || updater="${EROOT%/}/usr/bin/gdk-pixbuf-query-loaders"
 
-	if [[ -z ${GNOME2_ECLASS_GDK_PIXBUF_LOADERS} ]]; then
-		debug-print "gdk-pixbuf loader cache does not need an update"
-		return
-	fi
-
 	if tc-is-cross-compiler ; then
 		ewarn "Updating of gdk-pixbuf loader cache skipped due to cross-compilation."
 		ewarn "You might want to run gdk-pixbuf-query-loaders manually on the target"
-- 
2.43.0

[gentoo-dev] [PATCH 2/2] gnome2.eclass: Make gnome2_gdk_pixbuf_update call conditional

[Michał Górny]

Move the condition that checks the result of gnome2_gdk_pixbuf_savelist
from inside gnome2_gdk_pixbuf_update to the postinst phase
of gnome2.eclass.

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 eclass/gnome2.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 00188fd7889c..66de2df97f9f 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -214,7 +214,9 @@ gnome2_pkg_postinst() {
 		gnome2_schemas_update
 	fi
 	gnome2_scrollkeeper_update
-	gnome2_gdk_pixbuf_update
+	if [[ -n ${GNOME2_ECLASS_GDK_PIXBUF_LOADERS} ]]; then
+		gnome2_gdk_pixbuf_update
+	fi
 
 	if [[ ${#GNOME2_ECLASS_GIO_MODULES[@]} -gt 0 ]]; then
 		gnome2_giomodule_cache_update
-- 
2.43.0