All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] gtk-icon-cache bbclass: only add runtime dependencies on hicolor-icon-theme when installing icons
@ 2011-08-01 11:08 Koen Kooi
  2011-08-04 14:47 ` Saul Wold
  2011-08-05  2:23 ` Saul Wold
  0 siblings, 2 replies; 22+ messages in thread
From: Koen Kooi @ 2011-08-01 11:08 UTC (permalink / raw)
  To: openembedded-core; +Cc: Koen Kooi, Koen Kooi

Tested with gnome-icon-theme and libsoup recipes on angstrom.

Signed-off-by: Koen Kooi <koen@openembedded.org>
---
 meta/classes/gtk-icon-cache.bbclass |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
index dcabaf5..d9b5d1b 100644
--- a/meta/classes/gtk-icon-cache.bbclass
+++ b/meta/classes/gtk-icon-cache.bbclass
@@ -1,5 +1,4 @@
 FILES_${PN} += "${datadir}/icons/hicolor"
-RDEPENDS += "hicolor-icon-theme"
 
 # This could run on the host as icon cache files are architecture independent,
 # but there is no gtk-update-icon-cache built natively.
@@ -34,7 +33,12 @@ python populate_packages_append () {
 		icon_dir = '%s/%s/%s/icons' % (pkgdest, pkg, bb.data.getVar('datadir', d, 1))
 		if not os.path.exists(icon_dir):
 			continue
-		
+
+		bb.note("adding hicolor-icon-theme dependency to %s" % pkg)	
+		rdepends = bb.data.getVar('RDEPENDS', d, 1)
+		rdepends += "hicolor-icon-theme"
+		bb.data.setVar('RDEPENDS', rdepends, d)
+	
 		bb.note("adding gtk-icon-cache postinst and postrm scripts to %s" % pkg)
 		
 		postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1)
-- 
1.6.6.1




^ permalink raw reply related	[flat|nested] 22+ messages in thread
* [PATCH] gtk-icon-cache bbclass: only add runtime dependencies on hicolor-icon-theme when installing icons
@ 2011-08-01  9:59 Koen Kooi
  2011-08-01 13:31 ` Steffen Sledz
  0 siblings, 1 reply; 22+ messages in thread
From: Koen Kooi @ 2011-08-01  9:59 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Koen Kooi

Also import a fix from OE-core for setting the loader dir.

Tested with gnome-icon-theme and libsoup recipes on angstrom.

Signed-off-by: Koen Kooi <koen@openembedded.org>
---
 classes/gtk-icon-cache.bbclass |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/classes/gtk-icon-cache.bbclass b/classes/gtk-icon-cache.bbclass
index 2449e95..d9b5d1b 100644
--- a/classes/gtk-icon-cache.bbclass
+++ b/classes/gtk-icon-cache.bbclass
@@ -1,6 +1,4 @@
 FILES_${PN} += "${datadir}/icons/hicolor"
-# Only add runtime dependency on hicolor-icon-theme for target recipes
-RDEPENDS_${PN} += "${@['', 'hicolor-icon-theme']['${PN}' == '${BPN}']}"
 
 # This could run on the host as icon cache files are architecture independent,
 # but there is no gtk-update-icon-cache built natively.
@@ -10,7 +8,7 @@ if [ "x$D" != "x" ]; then
 fi
 
 # Update the pixbuf loaders in case they haven't been registered yet
-gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
+GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders gdk-pixbuf-query-loaders --update-cache
 
 for icondir in /usr/share/icons/* ; do
     if [ -d $icondir ] ; then
@@ -35,7 +33,12 @@ python populate_packages_append () {
 		icon_dir = '%s/%s/%s/icons' % (pkgdest, pkg, bb.data.getVar('datadir', d, 1))
 		if not os.path.exists(icon_dir):
 			continue
-		
+
+		bb.note("adding hicolor-icon-theme dependency to %s" % pkg)	
+		rdepends = bb.data.getVar('RDEPENDS', d, 1)
+		rdepends += "hicolor-icon-theme"
+		bb.data.setVar('RDEPENDS', rdepends, d)
+	
 		bb.note("adding gtk-icon-cache postinst and postrm scripts to %s" % pkg)
 		
 		postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1)
-- 
1.6.6.1




^ permalink raw reply related	[flat|nested] 22+ messages in thread
end of thread, other threads:[~2011-08-05 17:38 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-08-01 11:08 [PATCH] gtk-icon-cache bbclass: only add runtime dependencies on hicolor-icon-theme when installing icons Koen Kooi
2011-08-04 14:47 ` Saul Wold
2011-08-05  2:23 ` Saul Wold
2011-08-05  5:28   ` Koen Kooi
2011-08-05  5:32     ` Saul Wold
2011-08-05  5:48       ` Koen Kooi
2011-08-05  5:51         ` Chris Larson
2011-08-05  5:55           ` Koen Kooi
2011-08-05  7:00             ` Chris Larson
2011-08-05  7:16               ` Koen Kooi
2011-08-05 16:27             ` Richard Purdie
2011-08-05 17:34               ` Koen Kooi
2011-08-05  6:44         ` Koen Kooi
2011-08-05  6:51           ` Koen Kooi
2011-08-05 12:42             ` Kumar Gala
2011-08-05 13:19               ` Richard Purdie
2011-08-05 14:16                 ` Koen Kooi
  -- strict thread matches above, loose matches on Subject: below --
2011-08-01  9:59 Koen Kooi
2011-08-01 13:31 ` Steffen Sledz
2011-08-04  7:15   ` Steffen Sledz
2011-08-04  7:38     ` Koen Kooi
2011-08-04  7:51       ` Steffen Sledz

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.