Merge bk://openembedded@openembedded.bkbits.net/packages

into chris.(none):/home/cwiiis/oe/packages

2004/09/18 17:42:41+01:00 (none)!cwiiis
Add libmatchbox 1.3
Add matchbox-desktop 0.8.1
Add matchbox-panel 0.8.3
Add matchbox-wm 0.8.3
Add gpe-go 0.05
Patch gtk+-2.4.4 for nice single-click behaviour

2004/09/18 11:38:57+01:00 (none)!cwiiis
Change gpe-image to work similarly to opie-image for ease of editing.

BKrev: 414c658fkom_EGx-19nrxl_iDSwjxw

14 files changed, 35 insertions, 22 deletions

diff --git a/gpe-conf/gpe-conf_0.1.19.oe b/gpe-conf/gpe-conf_0.1.19.oe
index e69de29bb2..6ce4df21b9 100644
--- a/gpe-conf/gpe-conf_0.1.19.oe
+++ b/gpe-conf/gpe-conf_0.1.19.oe
@@ -0,0 +1,21 @@
+
+inherit gpe pkgconfig
+
+DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ipaq-sleep ntp gpe-mixer"
+RDEPENDS = "xset xst ipaq-sleep ntpdate"
+SECTION = "gpe"
+PRIORITY = "optional"
+FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps ${datadir}/applications"
+FILES_${PN} += " ${datadir}/gpe/pixmaps ${datadir}/gpe-conf"
+PR = "r1"
+
+do_compile () {
+	oe_runmake PREFIX=${prefix}
+	oe_runmake all-desktop PREFIX=${prefix}
+}
+
+do_install () {
+        oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program
+	rm -f ${D}/${datadir}/applications/gpe-conf.desktop
+}
+
diff --git a/gpe-go/gpe-go-0.05/fix-make.patch b/gpe-go/gpe-go-0.05/fix-make.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gpe-go/gpe-go-0.05/fix-make.patch
diff --git a/gpe-go/gpe-go_0.05.oe b/gpe-go/gpe-go_0.05.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gpe-go/gpe-go_0.05.oe
diff --git a/gtk+/gtk+-2.4.4/single-click.patch b/gtk+/gtk+-2.4.4/single-click.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gtk+/gtk+-2.4.4/single-click.patch
diff --git a/gtk+/gtk+_2.4.4.oe b/gtk+/gtk+_2.4.4.oe
index e51ab57047..cef8470c3b 100644
--- a/gtk+/gtk+_2.4.4.oe
+++ b/gtk+/gtk+_2.4.4.oe
@@ -5,12 +5,13 @@ SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-${PV}.tar.bz2 \
            file://no-demos.patch;patch=1 \
            file://no-xwc.patch;patch=1;pnum=0 \
            file://automake-lossage.patch;patch=1 \
+	   file://single-click.patch;patch=1 \
            file://gtk+-handhelds.patch;patch=1 \
            file://hardcoded_libtool.patch;patch=1 \
 	   file://spinbutton.patch;patch=1 \
diff --git a/libmatchbox/libmatchbox_1.3.oe b/libmatchbox/libmatchbox_1.3.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libmatchbox/libmatchbox_1.3.oe
diff --git a/matchbox-desktop/matchbox-desktop-0.8.1/enable-file-manager.patch b/matchbox-desktop/matchbox-desktop-0.8.1/enable-file-manager.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/matchbox-desktop/matchbox-desktop-0.8.1/enable-file-manager.patch
diff --git a/matchbox-desktop/matchbox-desktop_0.8.1.oe b/matchbox-desktop/matchbox-desktop_0.8.1.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/matchbox-desktop/matchbox-desktop_0.8.1.oe
diff --git a/matchbox-panel/matchbox-panel-0.8.3/make-batteryapp-less-strict.patch b/matchbox-panel/matchbox-panel-0.8.3/make-batteryapp-less-strict.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/matchbox-panel/matchbox-panel-0.8.3/make-batteryapp-less-strict.patch
diff --git a/matchbox-panel/matchbox-panel_0.8.3.oe b/matchbox-panel/matchbox-panel_0.8.3.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/matchbox-panel/matchbox-panel_0.8.3.oe
diff --git a/matchbox-wm/matchbox-wm-0.8.3/kbdconfig_keylaunch_simpad.patch b/matchbox-wm/matchbox-wm-0.8.3/kbdconfig_keylaunch_simpad.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/matchbox-wm/matchbox-wm-0.8.3/kbdconfig_keylaunch_simpad.patch
diff --git a/matchbox-wm/matchbox-wm_0.8.3.oe b/matchbox-wm/matchbox-wm_0.8.3.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/matchbox-wm/matchbox-wm_0.8.3.oe
diff --git a/meta/gpe-collections.oe b/meta/gpe-collections.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/gpe-collections.oe
diff --git a/meta/gpe-image.oe b/meta/gpe-image.oe
index 0f70ef7a41..698e37837c 100644
--- a/meta/gpe-image.oe
+++ b/meta/gpe-image.oe
@@ -1,30 +1,21 @@
-export IMAGE_BASENAME = "gpe-image"
-
-GPE_MACHINE_CLASS ?= "none"
-
-GPE_EXTRA_DEPENDS += "${GPE_EXTRA_DEPENDS_${GPE_MACHINE_CLASS}}"
-GPE_EXTRA_INSTALL += "${GPE_EXTRA_DEPENDS_${GPE_MACHINE_CLASS}}"
+include gpe-collections.oe
 
-GPE_EXTRA_DEPENDS_bigscreen = "firefox linphone"
-GPE_EXTRA_INSTALL_bigscreen = "firefox linphone"
+PR = "r1"
 
-GPE_EXTRA_DEPENDS_smallscreen = "minimo linphone-hh"
-GPE_EXTRA_INSTALL_smallscreen = "minimo linphone-hh"
-
-GPE_EXTRA_DEPENDS_none = ""
-GPE_EXTRA_INSTALL_none = ""
+export IMAGE_BASENAME = "gpe-image"
 
-DEPENDS = 'task-bootstrap \
-	   diet-x11 xserver-kdrive matchbox-wm matchbox-desktop matchbox-panel \
-	   meta-gpe ttf-bitstream-vera ${GPE_EXTRA_DEPENDS}'
+DEPENDS = "task-bootstrap ${GPE_BASE_DEPENDS} ${GPE_BASE} ${GPE_PIM} \
+	   ${GPE_BASE_SETTINGS} ${GPE_EXTRA_SETTINGS} ${GPE_BASE_APPS} \
+	   ${GPE_EXTRA_DEPENDS}"
 
 XSERVER ?= "xserver-kdrive-fbdev"
 
-export IPKG_INSTALL = 'task-bootstrap ${XSERVER} \
-		      gpe ttf-bitstream-vera \
-		      pango-module-basic-x pango-module-basic-fc \
-		      glibc-gconv glibc-gconv-iso8859-1 gdk-pixbuf-loader-png \
-		      ${GPE_EXTRA_INSTALL}'
+export IPKG_INSTALL = "task-bootstrap ${GPE_BASE_DEPENDS} ${GPE_BASE} \
+           	       ${GPE_PIM} ${GPE_BASE_SETTINGS} ${GPE_EXTRA_SETTINGS} \
+	               ${GPE_BASE_APPS} ${GPE_EXTRA_DEPENDS} \
+		       ${XSERVER} \
+		       ${GPE_BASE_RDEPENDS} \
+		       ${GPE_EXTRA_INSTALL}"
 
 IMAGE_POSTPROCESS_COMMAND += "zap_root_password; "