diff options
author | Chris Lord <chris@openedhand.com> | 2006-07-19 16:12:45 +0000 |
---|---|---|
committer | Chris Lord <chris@openedhand.com> | 2006-07-19 16:12:45 +0000 |
commit | a74991b103585bfd4451ed6ba58eb6780e8c378f (patch) | |
tree | 90d84920458da7110d94fe86134da017b0c36aaa /openembedded | |
parent | 5f3d79f3195e24dde7169971343f4db03847a02e (diff) | |
download | poky-a74991b103585bfd4451ed6ba58eb6780e8c378f.tar.gz |
- 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
Diffstat (limited to 'openembedded')
-rw-r--r-- | openembedded/classes/gconf.bbclass | 2 | ||||
-rw-r--r-- | openembedded/classes/gtk-icon-cache.bbclass | 38 | ||||
-rw-r--r-- | openembedded/conf/distro/poky.conf | 2 | ||||
-rwxr-xr-x | openembedded/packages/dates/dates_0.1.bb | 19 | ||||
-rwxr-xr-x | openembedded/packages/dates/dates_svn.bb | 13 |
5 files changed, 68 insertions, 6 deletions
diff --git a/openembedded/classes/gconf.bbclass b/openembedded/classes/gconf.bbclass index b0c5723873..686f8e6596 100644 --- a/openembedded/classes/gconf.bbclass +++ b/openembedded/classes/gconf.bbclass | |||
@@ -1,3 +1,5 @@ | |||
1 | DEPENDS += "gconf" | ||
2 | |||
1 | gconf_postinst() { | 3 | gconf_postinst() { |
2 | if [ "$1" = configure ]; then | 4 | if [ "$1" = configure ]; then |
3 | if [ "x$D" != "x" ]; then | 5 | 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 0000000000..0f68e6812b --- /dev/null +++ b/openembedded/classes/gtk-icon-cache.bbclass | |||
@@ -0,0 +1,38 @@ | |||
1 | FILES_${PN} += "${datadir}/icons/hicolor" | ||
2 | |||
3 | gtk-icon-cache_postinst() { | ||
4 | if [ "x$D" != "x" ]; then | ||
5 | exit 1 | ||
6 | fi | ||
7 | gtk-update-icon-cache -q /usr/share/icons/hicolor | ||
8 | } | ||
9 | |||
10 | gtk-icon-cache_postrm() { | ||
11 | gtk-update-icon-cache -q /usr/share/icons/hicolor | ||
12 | } | ||
13 | |||
14 | python populate_packages_append () { | ||
15 | import os.path | ||
16 | packages = bb.data.getVar('PACKAGES', d, 1).split() | ||
17 | workdir = bb.data.getVar('WORKDIR', d, 1) | ||
18 | |||
19 | for pkg in packages: | ||
20 | icon_dir = '%s/install/%s/%s/icons/hicolor' % (workdir, pkg, bb.data.getVar('datadir', d, 1)) | ||
21 | if not os.path.exists(icon_dir): | ||
22 | continue | ||
23 | |||
24 | bb.note("adding gtk-icon-cache postinst and postrm scripts to %s" % pkg) | ||
25 | |||
26 | postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1) | ||
27 | if not postinst: | ||
28 | postinst = '#!/bin/sh\n' | ||
29 | postinst += bb.data.getVar('gtk-icon-cache_postinst', d, 1) | ||
30 | bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d) | ||
31 | |||
32 | postrm = bb.data.getVar('pkg_postrm_%s' % pkg, d, 1) or bb.data.getVar('pkg_postrm', d, 1) | ||
33 | if not postrm: | ||
34 | postrm = '#!/bin/sh\n' | ||
35 | postrm += bb.data.getVar('gtk-icon-cache_postrm', d, 1) | ||
36 | bb.data.setVar('pkg_postrm_%s' % pkg, postrm, d) | ||
37 | } | ||
38 | |||
diff --git a/openembedded/conf/distro/poky.conf b/openembedded/conf/distro/poky.conf index 35eb247ba3..36af6b8b4a 100644 --- a/openembedded/conf/distro/poky.conf +++ b/openembedded/conf/distro/poky.conf | |||
@@ -71,7 +71,7 @@ PREFERRED_PROVIDER_tslib ?= tslib | |||
71 | SRCDATE_gconf-dbus ?= "20060119" | 71 | SRCDATE_gconf-dbus ?= "20060119" |
72 | SRCDATE_gnome-vfs-dbus ?= "20060119" | 72 | SRCDATE_gnome-vfs-dbus ?= "20060119" |
73 | SRCDATE_contacts ?= "20060707" | 73 | SRCDATE_contacts ?= "20060707" |
74 | SRCDATE_dates ?= "20060707" | 74 | SRCDATE_dates ?= "20060719" |
75 | SRCDATE_gtkhtml2 ?= "20060323" | 75 | SRCDATE_gtkhtml2 ?= "20060323" |
76 | SRCDATE_web ?= "20060613" | 76 | SRCDATE_web ?= "20060613" |
77 | SRCDATE_eds-dbus ?= "20060707" | 77 | 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 0000000000..b13fb01905 --- /dev/null +++ b/openembedded/packages/dates/dates_0.1.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | LICENSE = "LGPL" | ||
2 | SECTION = "x11" | ||
3 | DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" | ||
4 | MAINTAINER = "Chris Lord <chris@openedhand.com>" | ||
5 | DESCRIPTION = "Dates is a calendar application." | ||
6 | |||
7 | SRC_URI = "http://projects.o-hand.com/sources/dates/dates-0.1.tar.gz" | ||
8 | |||
9 | inherit autotools pkgconfig gtk-icon-cache | ||
10 | |||
11 | # EXTRA_OECONF = "--disable-debug" | ||
12 | |||
13 | FILES_${PN} += "${datadir}/pixmaps/dates.png" | ||
14 | |||
15 | do_install_append () { | ||
16 | install -d ${D}/${datadir}/pixmaps | ||
17 | install -m 0644 ${D}/${datadir}/icons/hicolor/48x48/apps/dates.png ${D}/${datadir}/pixmaps/ | ||
18 | } | ||
19 | |||
diff --git a/openembedded/packages/dates/dates_svn.bb b/openembedded/packages/dates/dates_svn.bb index 3d658aae54..408ba5da51 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" | |||
4 | MAINTAINER = "Chris Lord <chris@openedhand.com>" | 4 | MAINTAINER = "Chris Lord <chris@openedhand.com>" |
5 | DESCRIPTION = "Dates is a calendar application." | 5 | DESCRIPTION = "Dates is a calendar application." |
6 | 6 | ||
7 | PR = "r5" | 7 | PV = "0.1+svn${SRCDATE}" |
8 | |||
9 | PV = "0.0+svn${SRCDATE}" | ||
10 | S = "${WORKDIR}/trunk" | 8 | S = "${WORKDIR}/trunk" |
11 | 9 | ||
12 | SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http" | 10 | SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http" |
13 | 11 | ||
14 | inherit autotools pkgconfig | 12 | inherit autotools pkgconfig gtk-icon-cache |
13 | |||
14 | FILES_${PN} += "${datadir}/pixmaps/dates.png" | ||
15 | 15 | ||
16 | CFLAGS_prepend = " -DFRAMES=3 " | 16 | do_install_append () { |
17 | install -d ${D}/${datadir}/pixmaps | ||
18 | install -m 0644 ${D}/${datadir}/icons/hicolor/48x48/apps/dates.png ${D}/${datadir}/pixmaps/ | ||
19 | } | ||