diff options
| author | Daniel Gomez <daniel@qtec.com> | 2023-01-07 12:29:28 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-26 23:37:05 +0000 |
| commit | 0b4b2c007db9b76e8166d399c722fc750d4a2827 (patch) | |
| tree | 5114d3eea37c0f8c22518763686da15929b04da0 /meta/classes | |
| parent | fdcaaeebb61ae061cd7b705f556564c2a376db41 (diff) | |
| download | poky-0b4b2c007db9b76e8166d399c722fc750d4a2827.tar.gz | |
gtk-icon-cache: Fix GTKIC_CMD if-else condition
GTKIC_CMD variable gets the wrong assignation leading into a post
install script error. Fix if-else condition in GTKIC_CMD variable
to assign gtk4-update-icon-cache when GTKIC_VERSION is 4 but
gtk-update-icon-cache when is 3.
Also, rename gtk-update-icon-cache-3.0.0 to gtk-update-icon-cache-3.0
to match the gtk-update-icon-cache binary name deployed in
meta/recipes-gnome/gtk+/gtk+3.inc.
(From OE-Core rev: 34de16fd86775c0f2ede1670fec90217e4d11776)
Signed-off-by: Daniel Gomez <daniel@qtec.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/gtk-icon-cache.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass index 6808339b90..f999b891f3 100644 --- a/meta/classes/gtk-icon-cache.bbclass +++ b/meta/classes/gtk-icon-cache.bbclass | |||
| @@ -3,7 +3,7 @@ FILES:${PN} += "${datadir}/icons/hicolor" | |||
| 3 | GTKIC_VERSION ??= '3' | 3 | GTKIC_VERSION ??= '3' |
| 4 | 4 | ||
| 5 | GTKPN = "${@ 'gtk4' if d.getVar('GTKIC_VERSION') == '4' else 'gtk+3' }" | 5 | GTKPN = "${@ 'gtk4' if d.getVar('GTKIC_VERSION') == '4' else 'gtk+3' }" |
| 6 | GTKIC_CMD = "${@ 'gtk-update-icon-cache-3.0.0' if d.getVar('GTKIC_VERSION') == '4' else 'gtk4-update-icon-cache' }" | 6 | GTKIC_CMD = "${@ 'gtk4-update-icon-cache' if d.getVar('GTKIC_VERSION') == '4' else 'gtk-update-icon-cache-3.0' }" |
| 7 | 7 | ||
| 8 | #gtk+3/gtk4 require GTK3DISTROFEATURES, DEPENDS on it make all the | 8 | #gtk+3/gtk4 require GTK3DISTROFEATURES, DEPENDS on it make all the |
| 9 | #recipes inherit this class require GTK3DISTROFEATURES | 9 | #recipes inherit this class require GTK3DISTROFEATURES |