apply lots of patches courtesy pb_

BKrev: 406964b2zzrDAOnwkUK6ASqCv3FYdA

12 files changed, 144 insertions, 7 deletions

diff --git a/gpe-login/gpe-login_0.66.oe b/gpe-login/gpe-login_0.66.oe
index ec9f96df4d..26833f1880 100644
--- a/gpe-login/gpe-login_0.66.oe
+++ b/gpe-login/gpe-login_0.66.oe
@@ -4,7 +4,8 @@ DESCRIPTION = "GPE user login screen"
 SECTION = "gpe"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "virtual/libc gtk+ libgpewidget gpe-ownerinfo"
+DEPENDS = "virtual/libc gtk+ libgpewidget gpe-ownerinfo xkbd"
+RDEPENDS = "xkbd"
 RPROVIDES = "gpe-session-starter"
 
 SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/gpe-login-${PV}.tar.gz"
diff --git a/gpe-session-scripts/gpe-session-scripts_0.61.oe b/gpe-session-scripts/gpe-session-scripts_0.61.oe
index e69de29bb2..b38272d954 100644
--- a/gpe-session-scripts/gpe-session-scripts_0.61.oe
+++ b/gpe-session-scripts/gpe-session-scripts_0.61.oe
@@ -0,0 +1,11 @@
+inherit gpe
+
+DESCRIPTION = "GPE session startup scripts"
+SECTION = "gpe"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+RDEPENDS = "matchbox gpe-session-starter gpe-bluetooth"
+# more rdepends: xtscal keylaunch ipaq-sleep gpe-question apmd blueprobe gpe-clock
+DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth"
+
+SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/gpe-session-scripts-${PV}.tar.gz"
diff --git a/gpe/files/device_table-minimal.txt b/gpe/files/device_table-minimal.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gpe/files/device_table-minimal.txt
diff --git a/gpe/gpe-image.oe b/gpe/gpe-image.oe
index e69de29bb2..e924fb6e74 100644
--- a/gpe/gpe-image.oe
+++ b/gpe/gpe-image.oe
@@ -0,0 +1,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'
+
+export IPKG_INSTALL = 'base-files base-passwd \
+		      busybox dropbear \
+		      libc6 hotplug ifupdown ipkg strace \
+		      initscripts kernel-modules \
+		      netbase resolvconf \
+		      tslib libgcc1 sysvinit tinylogin xserver-kdrive-fbdev \
+		      gpe-task-base'
+
+inherit image_ipk
diff --git a/gpe/meta-gpe.oe b/gpe/meta-gpe.oe
index e69de29bb2..0d0ee98b00 100644
--- a/gpe/meta-gpe.oe
+++ b/gpe/meta-gpe.oe
@@ -0,0 +1,57 @@
+PACKAGES = gpe-task-base
+DESCRIPTION = "Meta-package for GPE Palmtop Environment"
+DEPENDS = "gpe-bluetooth gpe-login gpe-dm gpe-session-scripts gpe-edit gpe-todo rxvt-unicode matchbox"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+
+ALLOW_EMPTY = 1
+
+RDEPENDS_gpe-task-base = "\
+    gpe-dm \
+    gpe-login \
+    gpe-session-scripts \
+    matchbox \
+    rxvt-unicode"
+
+#    gpe-collateral-gtk2 \
+#    gdk-pixbuf2-loader-jpeg \
+#    \
+#    gpe-bootsplash2 \
+#    gpe-terminal \
+#    \
+#    keylaunch \
+#    esd \
+#    detect-stylus \
+#    gpe-soundserver \
+#    gpe-mimedir-tools \
+#    teleport \
+#    gpe-keylock \
+#    \
+#    xmonobut \
+#    minilite \
+#    minibat \
+#    minipredict \
+#    matchbox-panel-hacks \
+#    mbinputmgr \
+#    \
+#    xstroke \
+#    rosetta \
+#    xkbd \
+#    mbmerlin \
+#    \
+#    startup-monitor \
+#    \
+#    xtscal \
+#    gpe-su2 \
+#    gpe-conf \
+#    gpe-confd \
+#    xst \
+#    \
+#    gpe-what \
+#    gpe-question2 \
+#    gpe-announce2 \
+#    \
+#    gpe-wlancfg \
+#    gpe-aerial \
+#    hotplug-dbus \
+#    gpe-autostarter \
+#    nsqld
diff --git a/gtk+/gtk+-2.2.4/no-xwc.patch b/gtk+/gtk+-2.2.4/no-xwc.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gtk+/gtk+-2.2.4/no-xwc.patch
diff --git a/gtk+/gtk+_2.2.4.oe b/gtk+/gtk+_2.2.4.oe
index 5d128f5548..3ebff631c7 100644
--- a/gtk+/gtk+_2.2.4.oe
+++ b/gtk+/gtk+_2.2.4.oe
@@ -12,7 +12,8 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.2/gtk+-${PV}.tar.bz2 \
 	   file://${FILESDIR}/automake-lossage.patch;patch=1;pnum=0 \
 	   file://${FILESDIR}/configure-lossage.patch;patch=1;pnum=0 \
 	   file://${FILESDIR}/no-demos.patch;patch=1 \
-	   file://${FILESDIR}/libtool-lossage.patch;patch=1;pnum=0"
+	   file://${FILESDIR}/libtool-lossage.patch;patch=1;pnum=0 \
+	   file://${FILESDIR}/no-xwc.patch;patch=1;pnum=0"
 
 inherit autotools libtool pkgconfig
 
@@ -69,7 +70,7 @@ do_stage () {
 
 python do_package () {
 	import string
-	def do_split(root, pattern, format, description):
+	def do_split(root, pattern, format, description, postinst):
 		dvar = oe.data.getVar('D', d, 1)
 		if not dvar:
 			oe.error("D not defined")
@@ -80,6 +81,7 @@ python do_package () {
 			oe.error("PACKAGES not defined")
 			return
 
+		postinst = '#!/bin/sh\n' + postinst
 		objs = os.listdir(dvar + root)
 		mainpkg = packages[0]
 		for o in objs:
@@ -93,6 +95,7 @@ python do_package () {
 			oe.data.setVar('FILES_' + pkg, os.path.join(root, o), d)
 			oe.data.setVar('RDEPENDS_' + pkg, mainpkg, d)
 			oe.data.setVar('DESCRIPTION_' + pkg, description % on, d)
+			oe.data.setVar('pkg_postinst_' + pkg, postinst, d)
 
 		oe.data.setVar('PACKAGES', string.join(packages, ' '), d)
 
@@ -105,8 +108,8 @@ python do_package () {
 	loaders_root = os.path.join(gtk_libdir, 'loaders')
 	immodules_root = os.path.join(gtk_libdir, 'immodules')
 
-	do_split(loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s')
-	do_split(immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s')
+	do_split(loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
+	do_split(immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules')
 
 	oe.build.exec_func("package_do_package", d)
 }
diff --git a/initscripts/initscripts-1.0-r0/device_table.txt b/initscripts/initscripts-1.0-r0/device_table.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/initscripts/initscripts-1.0-r0/device_table.txt
diff --git a/initscripts/initscripts-1.0-r0/devices b/initscripts/initscripts-1.0-r0/devices
index 5524af4162..241972679f 100644
--- a/initscripts/initscripts-1.0-r0/devices
+++ b/initscripts/initscripts-1.0-r0/devices
@@ -33,7 +33,7 @@ then
 	if test "$VERBOSE" != "no"; then echo "done"; fi
 else
 	if test "$VERBOSE" != "no"; then echo -n "Mounting /dev ramdisk: "; fi
-	mount -t ramfs ramfs /dev
+	mount -t ramfs ramfs /dev || mount -t tmpfs ramfs /dev
 	if test $? -ne 0; then
 		if test "$VERBOSE" != "no"; then echo "failed"; fi
 	else
diff --git a/initscripts/initscripts_1.0.oe b/initscripts/initscripts_1.0.oe
index af96a8637e..1593bda49a 100644
--- a/initscripts/initscripts_1.0.oe
+++ b/initscripts/initscripts_1.0.oe
@@ -1,5 +1,6 @@
 DESCRIPTION = "SysV init scripts"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+RDEPENDS = "makedevs"
 SRC_URI = "file://${FILESDIR}/halt \
 	   file://${FILESDIR}/ramdisk \
 	   file://${FILESDIR}/umountfs \
@@ -29,7 +30,8 @@ SRC_URI = "file://${FILESDIR}/halt \
 	   file://${FILESDIR}/extractfs \
 	   file://${FILESDIR}/checkroot.sh \
 	   file://${FILESDIR}/devices_h3600 \
-	   file://${FILESDIR}/umountnfs.sh"
+	   file://${FILESDIR}/umountnfs.sh \
+	   file://${FILESDIR}/device_table.txt"
 
 
 do_install () {
@@ -96,4 +98,6 @@ do_install () {
 #	ln -sf		../init.d/devices	${D}/etc/rcS.d/S01devices
 #	ln -sf		../init.d/devpts.sh	${D}/etc/rcS.d/S31devpts.sh
 #	ln -sf		../init.d/ramdisk	${D}/etc/rcS.d/S30ramdisk
+
+	install -m 0755    ${FILESDIR}/device_table.txt		${D}/etc/device_table
 }
diff --git a/makedevs/makedevs_1.0.0.oe b/makedevs/makedevs_1.0.0.oe
index e69de29bb2..39d92d5471 100644
--- a/makedevs/makedevs_1.0.0.oe
+++ b/makedevs/makedevs_1.0.0.oe
@@ -0,0 +1,15 @@
+SRC_URI = "file://${FILESDIR}/makedevs.c"
+S = "${WORKDIR}/makedevs-${PV}"
+
+do_configure() {
+	cp -f ${FILESDIR}/makedevs.c ${S}/
+}
+
+do_compile() {
+	${CC} ${CFLAGS} -o ${S}/makedevs ${S}/makedevs.c
+}
+
+do_install() {
+	install -d ${D}/sbin
+	install -m 0755 ${S}/makedevs ${D}/sbin/makedevs
+}
diff --git a/vera-fonts/ttf-bitstream-vera_1.10.oe b/vera-fonts/ttf-bitstream-vera_1.10.oe
index e69de29bb2..f423fa0264 100644
--- a/vera-fonts/ttf-bitstream-vera_1.10.oe
+++ b/vera-fonts/ttf-bitstream-vera_1.10.oe
@@ -0,0 +1,31 @@
+DESCRIPTION = "The Bitstream Vera fonts - TTF Edition"
+SECTION = "fonts"
+PRIORITY = "optional"
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-${PV}.tar.bz2" 
+
+
+FILES_${PN} = "/etc /usr/share/fonts" 
+
+
+do_install () { 
+        install -d ${D}${prefix}/share/fonts/ttf/ 
+        for i in *.ttf; do 
+                install -m 644 $i ${D}${prefix}/share/fonts/ttf/${i} 
+        done 
+
+	# fontconfig ships this too.  not sure what to do about it.
+        #install -d ${D}/etc/fonts 
+        #install -m 644 local.conf ${D}/etc/fonts/local.conf 
+
+
+        install -d ${D}${prefix}/share/doc/${PN}/ 
+        for i in *.TXT; do 
+                install -m 644 $i ${D}${prefix}/share/doc/${PN}/$i 
+        done 
+} 
+
+pkg_postinst () {
+#!/bin/sh
+fc-cache
+}