aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gtk+
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-05-06 10:51:38 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-12 23:46:40 +0100
commit0c686118fa74745571ff4ce6786fd415d39dbeb9 (patch)
treec312d39f6b660527397816a0f79a47230a4ec850 /meta/recipes-gnome/gtk+
parent0cb5016283a80b04a41d37e332bb324a203e2ef8 (diff)
downloadopenembedded-core-contrib-0c686118fa74745571ff4ce6786fd415d39dbeb9.tar.gz
openembedded-core-contrib-0c686118fa74745571ff4ce6786fd415d39dbeb9.tar.bz2
openembedded-core-contrib-0c686118fa74745571ff4ce6786fd415d39dbeb9.zip
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. Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-gnome/gtk+')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3.inc17
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 \
${datadir}/icons/hicolor/*/apps/gtk3-demo*.png \
${datadir}/icons/hicolor/*/apps/gtk3-widget-factory*.png"
-# The demo uses PNG files and mime type sniffing, so ensure that these
-# dependencies are present.
-RDEPENDS_${PN}-demo += "gdk-pixbuf-loader-png shared-mime-info"
-
FILES_${PN}_append = " ${bindir}/gtk-update-icon-cache-3.0 \
${bindir}/gtk-query-immodules-3.0 \
${bindir}/gtk-launch \
@@ -86,7 +82,18 @@ FILES_${PN}-dev += " \
${bindir}/gtk-builder-tool \
"
-RRECOMMENDS_${PN} = "adwaita-icon-theme-symbolic"
+GTKBASE_RRECOMMENDS ?= "liberation-fonts \
+ gdk-pixbuf-loader-png \
+ gdk-pixbuf-loader-jpeg \
+ gdk-pixbuf-loader-gif \
+ gdk-pixbuf-loader-xpm \
+ shared-mime-info \
+ adwaita-icon-theme-symbolic \
+ "
+GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1"
+
+RRECOMMENDS_${PN} = "${GTKBASE_RRECOMMENDS}"
+RRECOMMENDS_${PN}_libc-glibc = "${GTKGLIBC_RRECOMMENDS}"
PACKAGES_DYNAMIC += "^gtk3-immodule-.* ^gtk3-printbackend-.*"