- Updates Dates svn package

- Add Dates 0.1 package
- Add gtk-icon-cache bbclass to run gtk-update-icon-cache in postinst/postrm
- Update gconf class to add gconf to DEPENDS


git-svn-id: https://svn.o-hand.com/repos/poky/trunk@513 311d38ba-8fff-0310-9ca6-ca027cbcb966

5 files changed, 68 insertions, 6 deletions

diff --git a/openembedded/classes/gconf.bbclass b/openembedded/classes/gconf.bbclass
index b0c572387..686f8e659 100644
--- a/openembedded/classes/gconf.bbclass
+++ b/openembedded/classes/gconf.bbclass
@@ -1,3 +1,5 @@
+DEPENDS += "gconf"
+
 gconf_postinst() {
 if [ "$1" = configure ]; then
 	if [ "x$D" != "x" ]; then
diff --git a/openembedded/classes/gtk-icon-cache.bbclass b/openembedded/classes/gtk-icon-cache.bbclass
new file mode 100644
index 000000000..0f68e6812
--- /dev/null
+++ b/openembedded/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)
+}
+
diff --git a/openembedded/conf/distro/poky.conf b/openembedded/conf/distro/poky.conf
index 35eb247ba..36af6b8b4 100644
--- a/openembedded/conf/distro/poky.conf
+++ b/openembedded/conf/distro/poky.conf
@@ -71,7 +71,7 @@ PREFERRED_PROVIDER_tslib ?= tslib
 SRCDATE_gconf-dbus ?= "20060119"
 SRCDATE_gnome-vfs-dbus ?= "20060119"
 SRCDATE_contacts ?= "20060707"
-SRCDATE_dates ?= "20060707"
+SRCDATE_dates ?= "20060719"
 SRCDATE_gtkhtml2 ?= "20060323"
 SRCDATE_web ?= "20060613"
 SRCDATE_eds-dbus ?= "20060707"
diff --git a/openembedded/packages/dates/dates_0.1.bb b/openembedded/packages/dates/dates_0.1.bb
new file mode 100755
index 000000000..b13fb0190
--- /dev/null
+++ b/openembedded/packages/dates/dates_0.1.bb
@@ -0,0 +1,19 @@
+LICENSE = "LGPL"
+SECTION = "x11"
+DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
+MAINTAINER = "Chris Lord <chris@openedhand.com>"
+DESCRIPTION = "Dates is a calendar application."
+
+SRC_URI = "http://projects.o-hand.com/sources/dates/dates-0.1.tar.gz"
+
+inherit autotools pkgconfig gtk-icon-cache
+
+# EXTRA_OECONF = "--disable-debug"
+
+FILES_${PN} += "${datadir}/pixmaps/dates.png"
+
+do_install_append () {
+	install -d ${D}/${datadir}/pixmaps
+	install -m 0644 ${D}/${datadir}/icons/hicolor/48x48/apps/dates.png ${D}/${datadir}/pixmaps/
+}
+
diff --git a/openembedded/packages/dates/dates_svn.bb b/openembedded/packages/dates/dates_svn.bb
index 3d658aae5..408ba5da5 100755
--- a/openembedded/packages/dates/dates_svn.bb
+++ b/openembedded/packages/dates/dates_svn.bb
@@ -4,13 +4,16 @@ DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
 MAINTAINER = "Chris Lord <chris@openedhand.com>"
 DESCRIPTION = "Dates is a calendar application."
 
-PR = "r5"
-
-PV = "0.0+svn${SRCDATE}"
+PV = "0.1+svn${SRCDATE}"
 S = "${WORKDIR}/trunk"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gtk-icon-cache
+
+FILES_${PN} += "${datadir}/pixmaps/dates.png"
 
-CFLAGS_prepend = " -DFRAMES=3 "
+do_install_append () {
+	install -d ${D}/${datadir}/pixmaps
+	install -m 0644 ${D}/${datadir}/icons/hicolor/48x48/apps/dates.png ${D}/${datadir}/pixmaps/
+}