Skip to contentSkip to conversation

gtk-icon-cache bbclass: only add runtime dependencies on hicolor-icon-theme when installing icons

PATCH In review Koen Kooi 2 participants 5 messages Aug 1, 2011 – Aug 4, 2011

lore
Share & tools
lore

Koen Kooi

author
#0 lore raw

PATCH 1/1 gtk-icon-cache bbclass: only add runtime dependencies on hicolor-icon-theme when installing icons

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

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

---
 classes/gtk-icon-cache.bbclass |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
classes/gtk-icon-cache.bbclass +7 -4
index 2449e95..d9b5d1b 100644
@@ -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)
Signature · 1 line
1.6.6.1
Acked-by on v1 1/1
#1 lore raw
Quoted 5 lines · Koen Kooi

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

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

Thx for this. Would be nice, if this patch could find it's way to 2011.03-maintenance branch too.

Quoted 38 lines
---
 classes/gtk-icon-cache.bbclass |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
classes/gtk-icon-cache.bbclass +7 -4
index 2449e95..d9b5d1b 100644
@@ -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)
Signature · 7 lines
DResearch Fahrzeugelektronik GmbH
Otto-Schmirgal-Str. 3, 10319 Berlin, Germany
Tel: +49 30 515932-237 mailto:[email protected]
Fax: +49 30 515932-299
Geschäftsführer: Dr. Michael Weber, Werner Mögle;
Amtsgericht Berlin Charlottenburg; HRB 130120 B;
Ust.-IDNr. DE273952058
#2 lore raw
Quoted 8 lines · Steffen Sledz
Quoted 5 lines · Koen Kooi

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

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

Ping!

Quoted 42 lines

Thx for this. Would be nice, if this patch could find it's way to 2011.03-maintenance branch too.

Quoted 38 lines
---
 classes/gtk-icon-cache.bbclass |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
classes/gtk-icon-cache.bbclass +7 -4
index 2449e95..d9b5d1b 100644
@@ -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)
Signature · 7 lines
DResearch Fahrzeugelektronik GmbH
Otto-Schmirgal-Str. 3, 10319 Berlin, Germany
Tel: +49 30 515932-237 mailto:[email protected]
Fax: +49 30 515932-299
Geschäftsführer: Dr. Michael Weber, Werner Mögle;
Amtsgericht Berlin Charlottenburg; HRB 130120 B;
Ust.-IDNr. DE273952058
author
#3 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 04-08-11 09:15, Steffen Sledz schreef:

Quoted 13 lines · Steffen Sledz
Quoted 8 lines · Koen Kooi
Quoted 5 lines

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

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

Ping!

Quoted 1 line

Thx for this. Would be nice, if this patch could find it's way to 2011.03-maintenance branch too.

Wasn't this in the pull request you did this week?

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

--- classes/gtk-icon-cache.bbclass | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-)

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 renamed from classes/gtk-icon-cache.bbclass +0 -0

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

Quoted 9 lines
Quoted 7 lines
Quoted 5 lines

# 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)

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFOOkyOMkyGM64RGpERAu38AKCbLXcD5+k5mD+zqBZ1vrmqD2MhyQCfeu8q FWqQAhn7kDc46b8BkBlIuf8=
=NfMW
-----END PGP SIGNATURE-----

#4 lore raw
Quoted 9 lines · Koen Kooi

Op 04-08-11 09:15, Steffen Sledz schreef:

Quoted 8 lines · Steffen Sledz
Quoted 7 lines · Koen Kooi
Quoted 5 lines

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

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

Quoted 7 lines
Quoted 5 lines
Quoted 1 line

Ping!

Quoted 1 line

Thx for this. Would be nice, if this patch could find it's way to 2011.03-maintenance branch too.

Wasn't this in the pull request you did this week?

Not yet. I would like to wait until it made it's way to oe-dev master.

Signature · 7 lines
DResearch Fahrzeugelektronik GmbH
Otto-Schmirgal-Str. 3, 10319 Berlin, Germany
Tel: +49 30 515932-237 mailto:[email protected]
Fax: +49 30 515932-299
Geschäftsführer: Dr. Michael Weber, Werner Mögle;
Amtsgericht Berlin Charlottenburg; HRB 130120 B;
Ust.-IDNr. DE273952058