Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/02/20 21:15:32+01:00 handhelds.org!zecke
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/ich/programming/oe/openembedded

2005/02/20 21:14:49+01:00 handhelds.org!zecke
Qt Embedded 2.3.10:
	Install Keyboard patch to change the keymap to reenable hardware button support

2005/02/20 19:49:07+00:00 nexus.co.uk!pb
update gtk-engines to 2.6.1

2005/02/20 19:48:24+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2005/02/20 19:48:13+00:00 nexus.co.uk!pb
remove gtk-industrial-engine from GPE_EXTRA_THEMES
remove gtk-industrial-engine from meta-gpe DEPENDS

BKrev: 4218f5b5yzn-XsfMg3MKHpvnHwUn5g

diff --git a/packages/gtk-engines/gtk-engines_2.6.1.bb b/packages/gtk-engines/gtk-engines_2.6.1.bb
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb
index ec6f865..49f3502 100644 (file)
--- a/packages/meta/gpe-image.bb
+++ b/packages/meta/gpe-image.bb
@@ -14,7 +14,7 @@ GUI_MACHINE_CLASS ?= "none"
 GPE_EXTRA_DEPENDS += "${GPE_EXTRA_DEPENDS_${GUI_MACHINE_CLASS}}"
 GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}"
 
-GPE_EXTRA_THEMES = "gtk-theme-industrial gtk-industrial-engine matchbox-themes-extra-industrial"
+GPE_EXTRA_THEMES = "gtk-theme-industrial matchbox-themes-extra-industrial"
 
 #GPE_EXTRA_DEPENDS_bigscreen = "firefox linphone"
 #GPE_EXTRA_INSTALL_bigscreen = "firefox linphone"

diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb
index 5e9de6e..bb02c26 100644 (file)
--- a/packages/meta/meta-gpe.bb
+++ b/packages/meta/meta-gpe.bb
@@ -101,6 +101,6 @@ gpe-task-games = "\
 RDEPENDS_gpe-task-games := "${gpe-task-games}"
 DEPENDS += " ${gpe-task-games}"
 
-DEPENDS += "matchbox-themes-extra gtk-industrial-engine"
+DEPENDS += "matchbox-themes-extra"
 
 LICENSE = MIT

diff --git a/packages/qte/qte-2.3.10/ipaq-keyboard.patch b/packages/qte/qte-2.3.10/ipaq-keyboard.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb
index 5bb7a5e..b58d960 100644 (file)
--- a/packages/qte/qte_2.3.10.bb
+++ b/packages/qte/qte_2.3.10.bb
@@ -36,6 +36,9 @@ SRC_URI_append_ramses           = "file://devfs.patch;patch=1 \
                                    file://ramses.patch;patch=1 \
                                    file://ramses-keyboard.patch;patch=1 \
                                    file://ramses-touchscreen.patch;patch=1 "
+SRC_URI_append_h3600            = "file://ipaq-keyboard.patch;patch=1 "
+SRC_URI_append_h3900            = "file://ipaq-keyboard.patch;patch=1 "
+
 
 S = "${WORKDIR}/qt-${PV}"