summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lord <chris@openedhand.com>2005-04-01 20:14:18 +0000
committerChris Lord <chris@openedhand.com>2005-04-01 20:14:18 +0000
commit1bcffd8a9dd29ae27c677e0aa99bfcdaa0a79b37 (patch)
tree3945dcc142d65898cc07e6cf8c7f63aeac01984d
parent17f2441c24dd491ba91eb303c594db125020b478 (diff)
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded 2005/04/01 21:13:36+01:00 (none)!cwiiis Add 'gsoko' game to OZ 3.5.3 gpe-image. 2005/04/01 21:12:41+01:00 (none)!cwiiis Add matchbox-themes-gtk that adds necessary files to make Angelistic the default theme. 2005/04/01 21:11:40+01:00 (none)!cwiiis Add -D_GNU_SOURCE to matchbox-panel_svn (fixes recent svn builds). BKrev: 424dab9aSDGJqXLu8hYU9bCdg_2O2g
-rw-r--r--conf/distro/openzaurus-3.5.3.conf1
-rw-r--r--packages/matchbox-panel/matchbox-panel_svn.bb1
-rw-r--r--packages/matchbox-themes-gtk/files/gtkrc0
-rw-r--r--packages/matchbox-themes-gtk/matchbox-themes-gtk.bb0
-rw-r--r--packages/meta/meta-gpe.bb1
5 files changed, 3 insertions, 0 deletions
diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf
index 45ad0b9c67..4fa56f2ba6 100644
--- a/conf/distro/openzaurus-3.5.3.conf
+++ b/conf/distro/openzaurus-3.5.3.conf
@@ -50,6 +50,7 @@ include conf/distro/preferred-opie-versions.inc
PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
+GPE_EXTRA_INSTALL += " gsoko"
include conf/distro/preferred-gpe-versions.inc
diff --git a/packages/matchbox-panel/matchbox-panel_svn.bb b/packages/matchbox-panel/matchbox-panel_svn.bb
index 71fa6560e5..9d18c90aae 100644
--- a/packages/matchbox-panel/matchbox-panel_svn.bb
+++ b/packages/matchbox-panel/matchbox-panel_svn.bb
@@ -12,6 +12,7 @@ S = ${WORKDIR}/${PN}
inherit autotools pkgconfig gettext
EXTRA_OECONF = "--enable-startup-notification --enable-dnotify --enable-small-icons"
+CFLAGS += " -D_GNU_SOURCE"
FILES_${PN} = "${bindir} \
${datadir}/applications \
diff --git a/packages/matchbox-themes-gtk/files/gtkrc b/packages/matchbox-themes-gtk/files/gtkrc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-themes-gtk/files/gtkrc
diff --git a/packages/matchbox-themes-gtk/matchbox-themes-gtk.bb b/packages/matchbox-themes-gtk/matchbox-themes-gtk.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-themes-gtk/matchbox-themes-gtk.bb
diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb
index 3c1bce49d2..e3abaedb3b 100644
--- a/packages/meta/meta-gpe.bb
+++ b/packages/meta/meta-gpe.bb
@@ -18,6 +18,7 @@ gpe-task-base = "\
xcursor-transparent-theme \
rxvt-unicode \
gtk2-theme-angelistic \
+ matchbox-themes-gtk \
xst \
xhost \
xrdb \