From c3352186941a100ee3812472531ca3359fef4b95 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Sun, 27 Aug 2006 16:00:40 +0000
Subject: gconf.bbclass: Add gconf to DEPENDS (from poky)

---
 classes/gconf.bbclass | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'classes')

diff --git a/classes/gconf.bbclass b/classes/gconf.bbclass
index b0c5723873..686f8e6596 100644
--- a/classes/gconf.bbclass
+++ b/classes/gconf.bbclass
@@ -1,3 +1,5 @@
+DEPENDS += "gconf"
+
 gconf_postinst() {
 if [ "$1" = configure ]; then
 	if [ "x$D" != "x" ]; then
-- 
cgit v1.2.3


From e609b8070d657674563ae304991f8b3307dc1b73 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Sun, 27 Aug 2006 16:02:10 +0000
Subject: base.bbclass: Add base_contains and base_both_containg - useful
 functions for the new task-machine code (from poky)

---
 classes/base.bbclass | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'classes')

diff --git a/classes/base.bbclass b/classes/base.bbclass
index e413afb2b3..670b97a72d 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -40,6 +40,20 @@ def base_conditional(variable, checkvalue, truevalue, falsevalue, d):
 	else:
 		return falsevalue
 
+def base_contains(variable, checkvalue, truevalue, falsevalue, d):
+       import bb
+       if bb.data.getVar(variable,d,1).find(checkvalue) != -1:
+               return truevalue
+       else:
+               return falsevalue
+
+def base_both_contain(variable1, variable2, checkvalue, d):
+       import bb
+       if bb.data.getVar(variable1,d,1).find(checkvalue) != -1 and bb.data.getVar(variable2,d,1).find(checkvalue) != -1:
+               return checkvalue
+       else:
+               return ""
+
 DEPENDS_prepend="${@base_dep_prepend(d)} "
 
 def base_set_filespath(path, d):
-- 
cgit v1.2.3


From e71a84f77fd700c1001a68795e3220c41915f105 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Sun, 27 Aug 2006 16:06:28 +0000
Subject: gtk-icon-cache.bbclass: Add from poky

---
 classes/gtk-icon-cache.bbclass | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 classes/gtk-icon-cache.bbclass

(limited to 'classes')

diff --git a/classes/gtk-icon-cache.bbclass b/classes/gtk-icon-cache.bbclass
new file mode 100644
index 0000000000..0f68e6812b
--- /dev/null
+++ b/classes/gtk-icon-cache.bbclass
@@ -0,0 +1,38 @@
+FILES_${PN} += "${datadir}/icons/hicolor"
+
+gtk-icon-cache_postinst() {
+if [ "x$D" != "x" ]; then
+        exit 1
+fi
+gtk-update-icon-cache -q /usr/share/icons/hicolor
+}
+
+gtk-icon-cache_postrm() {
+gtk-update-icon-cache -q /usr/share/icons/hicolor
+}
+
+python populate_packages_append () {
+	import os.path
+	packages = bb.data.getVar('PACKAGES', d, 1).split()
+	workdir = bb.data.getVar('WORKDIR', d, 1)
+	
+	for pkg in packages:
+		icon_dir = '%s/install/%s/%s/icons/hicolor' % (workdir, pkg, bb.data.getVar('datadir', d, 1))
+		if not os.path.exists(icon_dir):
+			continue
+		
+		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)
+		if not postinst:
+			postinst = '#!/bin/sh\n'
+		postinst += bb.data.getVar('gtk-icon-cache_postinst', d, 1)
+		bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d)
+
+		postrm = bb.data.getVar('pkg_postrm_%s' % pkg, d, 1) or bb.data.getVar('pkg_postrm', d, 1)
+		if not postrm:
+			postrm = '#!/bin/sh\n'
+		postrm += bb.data.getVar('gtk-icon-cache_postrm', d, 1)
+		bb.data.setVar('pkg_postrm_%s' % pkg, postrm, d)
+}
+
-- 
cgit v1.2.3