gpe-patch

BKrev: 407e568fgZnIIW8HegHBEVo1cQJgbA

diff --git a/gpe-dm/gpe-dm_0.34.oe b/gpe-dm/gpe-dm_0.34.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gpe-session-scripts/gpe-session-scripts_0.61.oe b/gpe-session-scripts/gpe-session-scripts_0.61.oe
index b38272d..70058e8 100644 (file)
--- a/gpe-session-scripts/gpe-session-scripts_0.61.oe
+++ b/gpe-session-scripts/gpe-session-scripts_0.61.oe
@@ -4,8 +4,8 @@ DESCRIPTION = "GPE session startup scripts"
 SECTION = "gpe"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-RDEPENDS = "matchbox gpe-session-starter gpe-bluetooth"
+RDEPENDS = "matchbox gpe-session-starter gpe-bluetooth xstroke"
 # more rdepends: xtscal keylaunch ipaq-sleep gpe-question apmd blueprobe gpe-clock
-DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth"
+DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke"
 
 SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/gpe-session-scripts-${PV}.tar.gz"

diff --git a/gpe/meta-gpe.oe b/gpe/meta-gpe.oe
index 6a80d42..03778b2 100644 (file)
--- a/gpe/meta-gpe.oe
+++ b/gpe/meta-gpe.oe
@@ -1,17 +1,21 @@
-PACKAGES = gpe-task-base
+PACKAGES = gpe gpe-task-base gpe-task-utils
 DESCRIPTION = "Meta-package for GPE Palmtop Environment"
-DEPENDS_prepend = "coreutils-native "
-DEPENDS = "gpe-bluetooth gpe-login gpe-dm gpe-session-scripts gpe-edit gpe-todo rxvt matchbox"
+DEPENDS = "gpe-bluetooth gpe-login gpe-dm gpe-session-scripts gpe-edit gpe-todo rxvt matchbox gpe-icons"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 
 ALLOW_EMPTY = 1
 
+RDEPENDS_gpe = "gpe-task-base gpe-task-utils"
+
 RDEPENDS_gpe-task-base = "\
     gpe-dm \
     gpe-login \
     gpe-session-scripts \
     matchbox \
-    rxvt"
+    rxvt \
+    gpe-icons"
+
+RDEPENDS_gpe-task-utils = "gpe-edit"
 
 #    gpe-collateral-gtk2 \
 #    gdk-pixbuf2-loader-jpeg \

diff --git a/gtk+/gtk+_2.2.4.oe b/gtk+/gtk+_2.2.4.oe
index 99daecc..4fd40f4 100644 (file)
--- a/gtk+/gtk+_2.2.4.oe
+++ b/gtk+/gtk+_2.2.4.oe
@@ -67,6 +67,10 @@ do_stage () {
        install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/
 }
 
+do_install_append () {
+       install -d ${D}/etc/gtk-2.0
+}
+
 python populate_packages_prepend () {
        import os
        def do_split(root, pattern, format, description, postinst):

diff --git a/virtual/gpe-image.oe b/virtual/gpe-image.oe
index ead80a4..fd86558 100644 (file)
--- a/virtual/gpe-image.oe
+++ b/virtual/gpe-image.oe
@@ -4,15 +4,15 @@ DEPENDS = 'glibc base-files base-passwd-3.5.7 \
           busybox dropbear hotplug ifupdown ipkg initscripts strace \
           netbase tslib module-init-tools resolvconf sysvinit tinylogin \
           diet-x11-cvs xserver matchbox-wm matchbox-desktop matchbox-panel \
-          meta-gpe prelink ttf-bitstream-vera'
+          meta-gpe ttf-bitstream-vera lrzsz pcmcia-cs'
 
 export IPKG_INSTALL = 'base-files base-passwd \
-                     busybox dropbear \
+                     busybox dropbear pcmcia-cs \
                      libc6 hotplug ifupdown ipkg strace \
                      initscripts kernel-modules \
                      netbase resolvconf \
                      tslib libgcc1 sysvinit tinylogin xserver-kdrive-fbdev \
                      gpe-task-base prelink ttf-bitstream-vera pango-module-basic-xft \
-                     lrzsz glibc-gconv glibc-gconv-iso8859-1'
+                     lrzsz glibc-gconv glibc-gconv-iso8859-1 gdk-pixbuf-loader-png'
 
 inherit image_ipk