diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-05-06 10:51:38 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-12 23:47:18 +0100 |
commit | e501d6f4fd58fc3f614f428fe3d9fb62bf5d7ddd (patch) | |
tree | e26a208fc0c3e86df970646cb95b7758144db430 /meta/recipes-gnome | |
parent | b0c69fe6a5c206bd96bea768b117e56fbc6044a7 (diff) | |
download | poky-e501d6f4fd58fc3f614f428fe3d9fb62bf5d7ddd.tar.gz |
gtk+3: Add RRECOMMENDS to match gtk+
Rrecommend a similar set of packages as the gtk+ recipe.
Most importantly this actually makes icons render even when other
packages do not drag in the relevant gdkpixbuf loaders.
(From OE-Core rev: 0c686118fa74745571ff4ce6786fd415d39dbeb9)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3.inc | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc index bd29300d50..12fcaba929 100644 --- a/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/meta/recipes-gnome/gtk+/gtk+3.inc | |||
@@ -61,10 +61,6 @@ FILES_${PN}-demo = "${bindir}/gtk3-demo \ | |||
61 | ${datadir}/icons/hicolor/*/apps/gtk3-demo*.png \ | 61 | ${datadir}/icons/hicolor/*/apps/gtk3-demo*.png \ |
62 | ${datadir}/icons/hicolor/*/apps/gtk3-widget-factory*.png" | 62 | ${datadir}/icons/hicolor/*/apps/gtk3-widget-factory*.png" |
63 | 63 | ||
64 | # The demo uses PNG files and mime type sniffing, so ensure that these | ||
65 | # dependencies are present. | ||
66 | RDEPENDS_${PN}-demo += "gdk-pixbuf-loader-png shared-mime-info" | ||
67 | |||
68 | FILES_${PN}_append = " ${bindir}/gtk-update-icon-cache-3.0 \ | 64 | FILES_${PN}_append = " ${bindir}/gtk-update-icon-cache-3.0 \ |
69 | ${bindir}/gtk-query-immodules-3.0 \ | 65 | ${bindir}/gtk-query-immodules-3.0 \ |
70 | ${bindir}/gtk-launch \ | 66 | ${bindir}/gtk-launch \ |
@@ -86,7 +82,18 @@ FILES_${PN}-dev += " \ | |||
86 | ${bindir}/gtk-builder-tool \ | 82 | ${bindir}/gtk-builder-tool \ |
87 | " | 83 | " |
88 | 84 | ||
89 | RRECOMMENDS_${PN} = "adwaita-icon-theme-symbolic" | 85 | GTKBASE_RRECOMMENDS ?= "liberation-fonts \ |
86 | gdk-pixbuf-loader-png \ | ||
87 | gdk-pixbuf-loader-jpeg \ | ||
88 | gdk-pixbuf-loader-gif \ | ||
89 | gdk-pixbuf-loader-xpm \ | ||
90 | shared-mime-info \ | ||
91 | adwaita-icon-theme-symbolic \ | ||
92 | " | ||
93 | GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1" | ||
94 | |||
95 | RRECOMMENDS_${PN} = "${GTKBASE_RRECOMMENDS}" | ||
96 | RRECOMMENDS_${PN}_libc-glibc = "${GTKGLIBC_RRECOMMENDS}" | ||
90 | 97 | ||
91 | PACKAGES_DYNAMIC += "^gtk3-immodule-.* ^gtk3-printbackend-.*" | 98 | PACKAGES_DYNAMIC += "^gtk3-immodule-.* ^gtk3-printbackend-.*" |
92 | 99 | ||