From 2bcf50bbf1ea353c8c8d3c837b2ebdb0f32260d1 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 20 Jan 2010 00:31:28 -0800
Subject: cherokee_0.99.24.bb: Add missing DEPENDS

* 0.99 version uses openssl and there is no option to have gnutls
  so we configure it to use openssl.

* Add DEPENDS which were
  missing and override the default depends coming from cherokee.inc
  as it has gnutls in depends and would build this redundantly.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 recipes/cherokee/cherokee_0.99.24.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/recipes/cherokee/cherokee_0.99.24.bb b/recipes/cherokee/cherokee_0.99.24.bb
index b5d016006f..05349033b3 100644
--- a/recipes/cherokee/cherokee_0.99.24.bb
+++ b/recipes/cherokee/cherokee_0.99.24.bb
@@ -1,6 +1,8 @@
 require cherokee.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
+
+DEPENDS = "libpcre openssl mysql"
 
 SRC_URI = "http://www.cherokee-project.com/download/0.99/${PV}/cherokee-${PV}.tar.gz \
            file://cherokee.init "
@@ -9,4 +11,4 @@ CONFFILES_${PN} = " \
 ${sysconfdir}/cherokee/cherokee.conf \
 ${sysconfdir}/init.d/cherokee \
 "
-EXTRA_OECONF += "--with-mysql=${STAGING_INCDIR}/mysql"
+EXTRA_OECONF = "--enable-tls=openssl --disable-static --disable-nls --with-mysql=${STAGING_INCDIR}/mysql"
-- 
cgit v1.2.3


From 680760be3ab2431586f52c55f4311502cab1c50d Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 19 Jan 2010 13:17:43 +0100
Subject: libbonobo: update to 2.24.2 (automake 1.11.x fixes)

---
 conf/checksums.ini                | 4 ++++
 recipes/gnome/libbonobo_2.24.1.bb | 2 --
 recipes/gnome/libbonobo_2.24.2.bb | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)
 delete mode 100644 recipes/gnome/libbonobo_2.24.1.bb
 create mode 100644 recipes/gnome/libbonobo_2.24.2.bb

diff --git a/conf/checksums.ini b/conf/checksums.ini
index d78264d553..52dba4d15a 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -14646,6 +14646,10 @@ sha256=5a6d96b9b15afa5d1702eee3a1ee3e50c3cfedb65d7c3faad64036ccfb3294b4
 md5=8868b6083392964a6969547ceb8d7cd1
 sha256=42b2ac58b86b2cc93fbbc65f94a3d1fcf5e8f33f728384653b30dbe456e91274
 
+[http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.24/libbonobo-2.24.2.tar.bz2]
+md5=5c7c5ea9c2f78a3c1e9ff2f1e27ad751
+sha256=95c0230a31a657e1873fc601318bbaa16722986699219317053f1cd1aa2a28bf
+
 [http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.6/libbonobo-2.6.0.tar.bz2]
 md5=078942cb9c6a1a31f93958e993353f45
 sha256=cd579e8dff38882d685be01449db92dad7c78900885d5a9abf6160756f83a7a8
diff --git a/recipes/gnome/libbonobo_2.24.1.bb b/recipes/gnome/libbonobo_2.24.1.bb
deleted file mode 100644
index efc71d24a8..0000000000
--- a/recipes/gnome/libbonobo_2.24.1.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require libbonobo.inc
-
diff --git a/recipes/gnome/libbonobo_2.24.2.bb b/recipes/gnome/libbonobo_2.24.2.bb
new file mode 100644
index 0000000000..efc71d24a8
--- /dev/null
+++ b/recipes/gnome/libbonobo_2.24.2.bb
@@ -0,0 +1,2 @@
+require libbonobo.inc
+
-- 
cgit v1.2.3


From dfc707b84076939eb91c776c3d2d684588f0bada Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 19 Jan 2010 14:59:25 +0100
Subject: gnome-keyring 2.28: update to 2.28.2

---
 conf/checksums.ini                    |  8 ++++++++
 recipes/gnome/gnome-keyring_2.28.0.bb | 28 ----------------------------
 recipes/gnome/gnome-keyring_2.28.2.bb | 25 +++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 28 deletions(-)
 delete mode 100644 recipes/gnome/gnome-keyring_2.28.0.bb
 create mode 100644 recipes/gnome/gnome-keyring_2.28.2.bb

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 52dba4d15a..75daba9f0d 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -9654,6 +9654,14 @@ sha256=7acda11db2eb07b2f68a1a506203fe95141954acb10c394850418fd04ed80a07
 md5=07fa253d8506c22640d74eb4fc90a092
 sha256=1b3234f1feac6a619a9a61a0b5f67ab8cd89d94aeeec9a5cc2d78b81d9d8cab4
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/2.28/gnome-keyring-2.28.2.tar.bz2]
+md5=97ea6823e88b39284187764c1ca95a59
+sha256=d2d686fb2528ee045bbcd9f18d0d452e0eb88c2265a1947f639152b61a5987f6
+
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/2.29/gnome-keyring-2.29.5.tar.bz2]
+md5=13c0da5743242313400fe86a363a5f69
+sha256=cf63c162845929a1b1f407a334afdafdc2bc3769001d51d214bc22284a9fba9f
+
 [http://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.26/gnome-media-2.26.0.tar.bz2]
 md5=3d519bc7d812aed8f6e4288b6d3cdf26
 sha256=39e7646d0790e05a010da1eb2d7552dcb5311abd72f001477c9c465d7146b9f7
diff --git a/recipes/gnome/gnome-keyring_2.28.0.bb b/recipes/gnome/gnome-keyring_2.28.0.bb
deleted file mode 100644
index 46d2de0fd0..0000000000
--- a/recipes/gnome/gnome-keyring_2.28.0.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "GNOME security credential management"
-LICENSE = "GPL"
-SECTION = "x11/gnome"
-DEPENDS = " libpam gconf gtk+ libtasn1 libtasn1-native libgcrypt"
-
-inherit autotools gnome pkgconfig
-
-EXTRA_OECONF = "--disable-gtk-doc --enable-pam --with-pam-dir=${libdir}/security/"
-
-SRC_URI += "file://tasn.m4 file://org.gnome.keyring.service"
-
-do_configure_prepend() {
-	cp ${WORKDIR}/tasn.m4 acinclude.m4
-}
-
-do_install_append () {
-	install -d ${D}${datadir}/dbus-1/services
-	install -m 0644 ${WORKDIR}/org.gnome.keyring.service ${D}${datadir}/dbus-1/services
-}
-
-FILES_${PN} += "${datadir}/dbus-1/services ${datadir}/gcr"
-PACKAGES =+ "gnome-keyring-pam-plugin"
-FILES_gnome-keyring-pam-plugin = "${libdir}/security/*.so"
-FILES_${PN}-dbg += "${libdir}/gnome-keyring/*/.debug ${libdir}/security/.debug"
-
-do_stage() {
-        autotools_stage_all
-}
diff --git a/recipes/gnome/gnome-keyring_2.28.2.bb b/recipes/gnome/gnome-keyring_2.28.2.bb
new file mode 100644
index 0000000000..70a7349a3b
--- /dev/null
+++ b/recipes/gnome/gnome-keyring_2.28.2.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "GNOME security credential management"
+LICENSE = "GPL"
+SECTION = "x11/gnome"
+DEPENDS = " libpam gconf gtk+ libtasn1 libtasn1-native libgcrypt"
+
+inherit gnome pkgconfig
+
+EXTRA_OECONF = "--disable-gtk-doc --enable-pam --with-pam-dir=${libdir}/security/"
+
+SRC_URI += "file://tasn.m4 file://org.gnome.keyring.service"
+
+do_configure_prepend() {
+	cp ${WORKDIR}/tasn.m4 acinclude.m4
+}
+
+do_install_append () {
+	install -d ${D}${datadir}/dbus-1/services
+	install -m 0644 ${WORKDIR}/org.gnome.keyring.service ${D}${datadir}/dbus-1/services
+}
+
+FILES_${PN} += "${datadir}/dbus-1/services ${datadir}/gcr"
+PACKAGES =+ "gnome-keyring-pam-plugin"
+FILES_gnome-keyring-pam-plugin = "${libdir}/security/*.so"
+FILES_${PN}-dbg += "${libdir}/gnome-keyring/*/.debug ${libdir}/security/.debug"
+
-- 
cgit v1.2.3


From a353f4ee7229c686bfc61417cab979ffa1735d55 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 20 Jan 2010 10:07:35 +0100
Subject: rygel: add hack to get rid of automake 1.11.x dependency

---
 recipes/rygel/rygel_0.4.8.bb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/recipes/rygel/rygel_0.4.8.bb b/recipes/rygel/rygel_0.4.8.bb
index 6d7dd6a930..2e305bbdb1 100644
--- a/recipes/rygel/rygel_0.4.8.bb
+++ b/recipes/rygel/rygel_0.4.8.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Collection of DLNA[1] (UPnP[2] AV) devices, implemented through a plug-in mechanism."
 SECTION = "network/multimedia"
-DEPENDS = "glib-2.0 gupnp gupnp-av gstreamer sqlite3 libsoup-2.4 automake-native-1.11.1"
+DEPENDS = "glib-2.0 gupnp gupnp-av gstreamer sqlite3 libsoup-2.4 "
 HOMEPAGE = "http://live.gnome.org/Rygel"
 
 SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/rygel/0.4/rygel-${PV}.tar.bz2 \
@@ -8,6 +8,11 @@ SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/rygel/0.4/rygel-${PV}.tar.bz2
 
 inherit autotools
 
+# Needs automake 1.11.x, which isn't safe to use yet in OE
+do_configure() {
+	oe_runconf
+}
+
 EXTRA_OECONF = "--enable-vala=no"
 
 FILES_${PN} += "${libdir}/rygel-1.0/librygel*.so ${datadir}/dbus-1/"
-- 
cgit v1.2.3


From f6c05a045df03c86b1a58af3cc164a2ad6005101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz>
Date: Tue, 19 Jan 2010 22:04:33 +0100
Subject: xinput_calibrator: switch to autotools
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Petr Štetiar <ynezz@true.cz>
Acked-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
---
 ...01-switch-to-autotools-based-build-system.patch | 162 +++++++++++++++++++++
 .../use-proper-compiler.patch                      |  20 ---
 .../xinput-calibrator/xinput-calibrator_0.5.0.bb   |   7 +-
 3 files changed, 166 insertions(+), 23 deletions(-)
 create mode 100644 recipes/xinput-calibrator/xinput-calibrator-0.5.0/0001-switch-to-autotools-based-build-system.patch
 delete mode 100644 recipes/xinput-calibrator/xinput-calibrator-0.5.0/use-proper-compiler.patch

diff --git a/recipes/xinput-calibrator/xinput-calibrator-0.5.0/0001-switch-to-autotools-based-build-system.patch b/recipes/xinput-calibrator/xinput-calibrator-0.5.0/0001-switch-to-autotools-based-build-system.patch
new file mode 100644
index 0000000000..adec403147
--- /dev/null
+++ b/recipes/xinput-calibrator/xinput-calibrator-0.5.0/0001-switch-to-autotools-based-build-system.patch
@@ -0,0 +1,162 @@
+From 1a85be450fba4585c64b3178316603a5ad7dd4e6 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz>
+Date: Tue, 19 Jan 2010 18:59:52 +0100
+Subject: [PATCH] switch to autotools based build system
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+This patch autotoolize xinput_calibrator for easier (cross)compiling.
+
+Signed-off-by: Petr Štetiar <ynezz@true.cz>
+---
+ Makefile     |   11 -----------
+ Makefile.am  |   41 +++++++++++++++++++++++++++++++++++++++++
+ autogen.sh   |   12 ++++++++++++
+ configure.ac |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 102 insertions(+), 11 deletions(-)
+ delete mode 100644 Makefile
+ create mode 100644 Makefile.am
+ create mode 100755 autogen.sh
+ create mode 100644 configure.ac
+
+diff --git a/Makefile b/Makefile
+deleted file mode 100644
+index c6eabed..0000000
+--- a/Makefile
++++ /dev/null
+@@ -1,11 +0,0 @@
+-all: x11 gtkmm
+-
+-x11: main_x11.cpp gui_x11.cpp
+-	g++ -Wall main_x11.cpp -lX11 -lXi -o xinput_calibrator.x11
+-	cp xinput_calibrator.x11 xinput_calibrator
+-
+-gtkmm: main_gtkmm.cpp gui_gtkmm.cpp
+-	g++ -Wall main_gtkmm.cpp `pkg-config --cflags --libs gtkmm-2.4` -o xinput_calibrator.gtkmm
+-
+-clean:
+-	rm -f xinput_calibrator xinput_calibrator.x11 xinput_calibrator.gtkmm
+diff --git a/Makefile.am b/Makefile.am
+new file mode 100644
+index 0000000..ef8f531
+--- /dev/null
++++ b/Makefile.am
+@@ -0,0 +1,41 @@
++#
++# Copyright (c) 2010 Petr Stetiar <ynezz@true.cz>
++#
++# Permission is hereby granted, free of charge, to any person
++# obtaining a copy of this software and associated documentation
++# files (the "Software"), to deal in the Software without
++# restriction, including without limitation the rights to use,
++# copy, modify, merge, publish, distribute, sublicense, and/or sell
++# copies of the Software, and to permit persons to whom the
++# Software is furnished to do so, subject to the following
++# conditions:
++# 
++# The above copyright notice and this permission notice shall be
++# included in all copies or substantial portions of the Software.
++# 
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++# OTHER DEALINGS IN THE SOFTWARE.
++#
++
++#AM_CFLAGS = -Wall -ansi -pedantic -W -Wmissing-prototypes -Wmissing-declarations -Werror -std=gnu99
++
++if BUILD_GTKMM
++bin_PROGRAMS = xinput_calibrator_x11 xinput_calibrator_gtkmm
++xinput_calibrator_gtkmm_SOURCES = main_gtkmm.cpp
++xinput_calibrator_gtkmm_CXXFLAGS = $(GTKMM_CFLAGS)
++xinput_calibrator_gtkmm_LDADD = $(GTKMM_LIBS)
++else
++bin_PROGRAMS = xinput_calibrator_x11
++endif
++
++xinput_calibrator_x11_LDADD = $(XORG_LIBS)
++xinput_calibrator_x11_CFLAGS = $(XORG_CFLAGS)
++xinput_calibrator_x11_SOURCES = main_x11.cpp
++
++EXTRA_DIST = autogen.sh
+diff --git a/autogen.sh b/autogen.sh
+new file mode 100755
+index 0000000..904cd67
+--- /dev/null
++++ b/autogen.sh
+@@ -0,0 +1,12 @@
++#! /bin/sh
++
++srcdir=`dirname $0`
++test -z "$srcdir" && srcdir=.
++
++ORIGDIR=`pwd`
++cd $srcdir
++
++autoreconf -v --install || exit 1
++cd $ORIGDIR || exit $?
++
++$srcdir/configure --enable-maintainer-mode "$@"
+diff --git a/configure.ac b/configure.ac
+new file mode 100644
+index 0000000..13257b4
+--- /dev/null
++++ b/configure.ac
+@@ -0,0 +1,49 @@
++#
++# Copyright (c) 2010 Petr Stetiar <ynezz@true.cz>
++#
++# Permission is hereby granted, free of charge, to any person
++# obtaining a copy of this software and associated documentation
++# files (the "Software"), to deal in the Software without
++# restriction, including without limitation the rights to use,
++# copy, modify, merge, publish, distribute, sublicense, and/or sell
++# copies of the Software, and to permit persons to whom the
++# Software is furnished to do so, subject to the following
++# conditions:
++# 
++# The above copyright notice and this permission notice shall be
++# included in all copies or substantial portions of the Software.
++# 
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++# OTHER DEALINGS IN THE SOFTWARE.
++#
++
++AC_PREREQ([2.57])
++AC_INIT(xinput_calibrator,[0.5.0], [http://github.com/tias/xinput_calibrator])
++AM_INIT_AUTOMAKE([foreign dist-bzip2])
++AM_MAINTAINER_MODE
++
++AC_PROG_CC
++AC_PROG_CXX
++AC_PROG_INSTALL
++
++AC_ARG_ENABLE([gtkmm], AS_HELP_STRING([--enable-gtkmm], [Enable GTKMM GUI]))
++AS_IF([test "x$enable_gtkmm" = "xyes"], [
++	PKG_CHECK_MODULES(GTKMM, [gtkmm-2.4])
++	AC_SUBST(GTKMM_CFLAGS)
++	AC_SUBST(GTKMM_LIBS)
++])
++
++AM_CONDITIONAL([BUILD_GTKMM], [test "x$enable_gtkmm" = "xyes"])
++
++PKG_CHECK_MODULES(XORG, [x11 xi])
++AC_SUBST(XORG_CFLAGS)
++AC_SUBST(XORG_LIBS)
++
++AC_CONFIG_FILES(Makefile)
++AC_OUTPUT
+-- 
+1.6.0.4
+
diff --git a/recipes/xinput-calibrator/xinput-calibrator-0.5.0/use-proper-compiler.patch b/recipes/xinput-calibrator/xinput-calibrator-0.5.0/use-proper-compiler.patch
deleted file mode 100644
index a7912fb4c7..0000000000
--- a/recipes/xinput-calibrator/xinput-calibrator-0.5.0/use-proper-compiler.patch
+++ /dev/null
@@ -1,20 +0,0 @@
----
- Makefile |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- git.orig/Makefile
-+++ git/Makefile
-@@ -1,11 +1,11 @@
- all: x11 gtkmm
- 
- x11: main_x11.cpp gui_x11.cpp
--	g++ -Wall main_x11.cpp -lX11 -lXi -o xinput_calibrator.x11
-+	$(CXX) $(CFLAGS) $(LDFLAGS) -Wall main_x11.cpp -lX11 -lXi -o xinput_calibrator.x11
- 	cp xinput_calibrator.x11 xinput_calibrator
- 
- gtkmm: main_gtkmm.cpp gui_gtkmm.cpp
--	g++ -Wall main_gtkmm.cpp `pkg-config --cflags --libs gtkmm-2.4` -o xinput_calibrator.gtkmm
-+	$(CXX) $(CFLAGS) $(LDFLAGS) -Wall main_gtkmm.cpp `pkg-config --cflags --libs gtkmm-2.4` -o xinput_calibrator.gtkmm
- 
- clean:
- 	rm -f xinput_calibrator xinput_calibrator.x11 xinput_calibrator.gtkmm
diff --git a/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb b/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb
index 59a28569c9..2d6924711d 100644
--- a/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb
+++ b/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb
@@ -2,12 +2,13 @@ DEPENDS = "virtual/libx11 libxi"
 
 SRCREV  = "6af268f1b435f7bdd83335092ddc684054df2110"
 SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git \
-           file://use-proper-compiler.patch;patch=1"
+           file://0001-switch-to-autotools-based-build-system.patch;patch=1"
 
+PR = "r1"
+inherit autotools
 S = "${WORKDIR}/git/"
-EXTRA_OEMAKE = "x11"
 
 do_install() {
 	install -d ${D}${bindir}
-	install -m 0755 xinput_calibrator ${D}${bindir}
+	install -m 0755 xinput_calibrator_x11 ${D}${bindir}/xinput_calibrator
 }
-- 
cgit v1.2.3


From c4408fc35e6ce5fa3f08a5f8635471a6bb346dd3 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin@buglabs.net>
Date: Fri, 15 Jan 2010 18:14:38 +0100
Subject: qt3e.bbclass: fix paths for staging

Without that patch uicmoc3-native fails to build.
---
 classes/qt3e.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/qt3e.bbclass b/classes/qt3e.bbclass
index 35958b34ab..d3d4a14e8a 100644
--- a/classes/qt3e.bbclass
+++ b/classes/qt3e.bbclass
@@ -6,6 +6,6 @@ export QTEDIR="${STAGING_DIR_HOST}/qte3"
 export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic3"
 export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc3"
 export OE_QMAKE_CXXFLAGS="${CXXFLAGS} "
-export OE_QMAKE_INCDIR_QT="${QTEDIR}/include"
-export OE_QMAKE_LIBDIR_QT="${QTEDIR}/lib"
+export OE_QMAKE_INCDIR_QT="${STAGING_INCDIR}/qte3/include"
+export OE_QMAKE_LIBDIR_QT="${STAGING_LIBDIR}/qte3/lib"
 export OE_QMAKE_LIBS_QT="qte"
-- 
cgit v1.2.3


From 1b426b8382d2a7864b63051b0707e577f2c0ce69 Mon Sep 17 00:00:00 2001
From: Martin Jansa <martin.jansa@gmail.com>
Date: Fri, 15 Jan 2010 18:10:29 +0100
Subject: sanity.bbclass: handle lack of permission to read
 /proc/sys/vm/mmap_min_addr

* With 2.6.33-rc2-00252-ge9e5521 on my host I noticed that
  "cat /proc/sys/vm/mmap_min_addr" returns now
  "cat: /proc/sys/vm/mmap_min_addr: Operation not permitted"
  Its probably becuse of
  http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0e1a6ef2dea88101b056b6d9984f3325c5efced3
  But I'm not sure if checking CAP_SYS_RAWIO even for reading this value
  is intentional or just bug which should be fixed in kernel.

This patch makes bitbake ignore reading error. Possible QEmu failure is not
handled yet.

Acked-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
---
 classes/sanity.bbclass | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index f65df61c1d..f57d8e47d0 100644
--- a/classes/sanity.bbclass
+++ b/classes/sanity.bbclass
@@ -96,11 +96,14 @@ def check_sanity(e):
 			if not check_app_exists("qemu-arm", e.data):
 				messages = messages + "qemu-native was in ASSUME_PROVIDED but the QEMU binaries (qemu-arm) can't be found in PATH"
 
-		if os.path.exists("/proc/sys/vm/mmap_min_addr"):
-			f = file("/proc/sys/vm/mmap_min_addr", "r")
-			if (f.read().strip() != "0"):
-				messages = messages + "/proc/sys/vm/mmap_min_addr is not 0. This will cause problems with qemu so please fix the value (as root).\n\nTo fix this in later reboots, set vm.mmap_min_addr = 0 in /etc/sysctl.conf.\n"
-			f.close()
+		try:
+			if os.path.exists("/proc/sys/vm/mmap_min_addr"):
+				f = file("/proc/sys/vm/mmap_min_addr", "r")
+				if (f.read().strip() != "0"):
+					messages = messages + "/proc/sys/vm/mmap_min_addr is not 0. This will cause problems with qemu so please fix the value (as root).\n\nTo fix this in later reboots, set vm.mmap_min_addr = 0 in /etc/sysctl.conf.\n"
+				f.close()
+		except:
+			pass
 
 	for util in required_utilities.split():
 		if not check_app_exists( util, e.data ):
-- 
cgit v1.2.3


From 33d74d678b593815f4ac005c026ed3c4c9e0d945 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Tue, 19 Jan 2010 11:13:34 +0100
Subject: linux-openmoko-2.6.32: bump SRCREV for suspend/resume fix, enable
 MMC_UNSAFE_RESUME

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 conf/distro/include/sane-srcrevs.inc                   | 2 +-
 recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 207c320a66..677134650d 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -148,7 +148,7 @@ SRCREV_pn-linux-ixp4xx ?= "1089"
 SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
 SRCREV_pn-linux-openmoko-2.6.28 ?= "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5"
 SRCREV_pn-linux-openmoko-2.6.31 ?= "dd32737aa524e09c1d141a0e735dd58674552244"
-SRCREV_pn-linux-openmoko-2.6.32 ?= "5827b20d022fb47ce9c9731d0fb894d361e16ffe"
+SRCREV_pn-linux-openmoko-2.6.32 ?= "058cbf4220fd2f1cd970bf553c044cb178e3804e"
 SRCREV_pn-linux-openmoko-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88"
 SRCREV_pn-linux-openmoko-shr-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88"
 SRCREV_pn-linux-openmoko-shr-drm-devel ?= "e62a4ae1c6783f41b41a9ac3d258786586b65a40"
diff --git a/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig b/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig
index c7a32421bb..e63bbd73dc 100644
--- a/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig
+++ b/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig
@@ -1332,7 +1332,7 @@ CONFIG_USB_ETH_RNDIS=y
 # CONFIG_NOP_USB_XCEIV is not set
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
+CONFIG_MMC_UNSAFE_RESUME=y
 
 #
 # MMC/SD/SDIO Card Drivers
-- 
cgit v1.2.3


From 4750e2e563904042a2375100213f0f5cfadde176 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Wed, 20 Jan 2010 12:55:58 +0100
Subject: checksums.ini: add checksums for upcomming xorg upgrades

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 conf/checksums.ini | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 75daba9f0d..8c81ddd264 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -5814,6 +5814,10 @@ sha256=1954a7e96d7fe70611c483836ed143e84a069eed6d3dab22c05a531bfb6da9e4
 md5=5cb7987d29db068153bdc8f23c767c43
 sha256=2b33f7c7658fb8f004c3aaf2717711262baeb5d77cf3fd24e9b6cc263895122d
 
+[http://xorg.freedesktop.org/releases/individual/proto/dri2proto-2.2.tar.bz2]
+md5=3ca8ddb42cd4ee31b8690031303221af
+sha256=f352950ffee4437d9da3e216d9a348ba0c7cf80c8c0fb30385c77ce3b780b2a1
+
 [http://www.ex-parrot.com/~chris/driftnet/driftnet-0.1.6.tar.gz]
 md5=8e11d77770452f97bb3c23f510489815
 sha256=dbdf7ead3ae14b109f88c86dedeb7524be8c257aa773a781891216f013373d6d
@@ -9314,6 +9318,10 @@ sha256=9d9ef356cc4478499442573556787125dc76c8acd1e55e5001fb11f1e224d27f
 md5=c9f8cebfba72bfab674bc0170551fb8d
 sha256=7fb83a28ae24d4f56eca88bc48f0fe414faee1afb2574bfb6257b52e8c716fcf
 
+[http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.11.tar.bz2]
+md5=78e7c4dc7dcb74b1869fee7897e00f59
+sha256=fe481d89d74f01db4f3a671ef1f29df29da74dff5b678517ee659a6f9d819451
+
 [http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.8.tar.bz2]
 md5=3dfbd17203c0c88b94b6f579f24c11cc
 sha256=2f5d84413853b688b7bb46c66fee108a499190e1f7810afffb775910778f053c
@@ -13930,6 +13938,10 @@ sha256=e4863cdf5d471763806e9bcae25ea47606a56cd91a5546a34c093aa3de181051
 md5=001d780829f936e34851ef7cd37b4dfd
 sha256=4def4d5c9fce85d690f1f29d675154594acdea3d3fe792d0cb513732c7b4bcb2
 
+[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.3.3.tar.bz2]
+md5=5d74971360f194ce33d2bd2e4d9b066c
+sha256=8c7f867918a3739dc7cabe955179539d4a7ecc52cb42becfd261e5dfbff511ac
+
 [http://xorg.freedesktop.org/releases/individual/lib/libX11-1.3.tar.bz2]
 md5=0545089013213e90aac19b8f8045d32e
 sha256=34656d022ff2f94430b534612821428fe15ade028d86a42907958167f2e497ac
@@ -14922,6 +14934,10 @@ sha256=ddfd398383729707846e1f1689e9acb3bc672e4f255a632c8f0d0c55ddf8718c
 md5=e0e66fae165d0b665b61e9516bf33ade
 sha256=5e07ec4b644f50160900d4281a74dd1cbf1535cfe4ab24e0c28ae5b038836a8c
 
+[http://dri.freedesktop.org/libdrm/libdrm-2.4.17.tar.bz2]
+md5=667d81f993f7fd8a1b1b1b830a28a748
+sha256=b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a
+
 [http://www.metzlerbros.org/dvb/libdvb-0.5.5.1.tar.gz]
 md5=47612d2f8a4d4dee746a166d8b7f6f77
 sha256=941e8020129111377652bd7253ea85e6c133fd1c23c66bd9fc0ca9eabab1385a
@@ -22034,6 +22050,10 @@ sha256=3438437c131c9847b34106225a728c11e522776ac454bb8740a9bc7aea409f22
 md5=02bd3669f53c404c19980d5efb6f86fb
 sha256=05f78c2fd3a5f054c0d716e8ba1b67a0c04a7a7e642d6946828ec383b389d185
 
+[http://cairographics.org/releases/pixman-0.17.4.tar.gz]
+md5=734f70667d0a6454a1b1e332f8d50083
+sha256=dd2f4a7c9c9373d20720d78718c0e9603741a83d66da3316a020b097b1c918a9
+
 [http://xorg.freedesktop.org/releases/individual/lib/pixman-0.9.4.tar.bz2]
 md5=c354ab5b0da10227226d3ef604254875
 sha256=261d239e9e3070a0a81e5b3eab92e6236c6295979bdae0a1ded05cbef93f67aa
@@ -27370,6 +27390,10 @@ sha256=57d2629849796b4dc919261eadd1eea3ee6e634d58979797287f7e09408cde67
 md5=8ac38951e753f250aaefbd4ba0afda94
 sha256=d49ab68cad724ae51f6cb69f7f5cfff7629cbb066f4c5c8bda81d62675a21986
 
+[http://xorg.freedesktop.org/releases/individual/util/util-macros-1.5.0.tar.gz]
+md5=ffef78135535c60c2b68d0a2a4ecae9b
+sha256=d47116ce5df198859a6082af7a72505575d1685b8c82bb4ef6fbedfa3316617e
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/util/util-macros-X11R7.0-1.0.1.tar.bz2]
 md5=bc6be634532d4936eb753de54e1663d3
 sha256=e95a45db65b33be472a3134492e348c4cd6edc200d02a85654ffe62bc2e6fdcd
@@ -29674,6 +29698,10 @@ sha256=738463dbf1980b9d0f95936a2d951dc51bd776c7949215c2456580948660669e
 md5=4d76953e97ee760efb7627e7ac721dbf
 sha256=ea2b875a8bb8ab9d987192dbcb4fb595e511b382d06260baf23a936f7e61fa14
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.10.0.tar.bz2]
+md5=78309d4f04dd8ae6585d120377042741
+sha256=e46dd691dc93db7cd6f5f22b84fea7e9f4bfd34f28026cfd680993b3ccfc48ab
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.2.1.tar.bz2]
 md5=3334dc5142871b78fc609fd1b3dac3f2
 sha256=d976c5f5e9c84f3817aba6ad22855446f1c2b9bfa0d53bd11c37c62cfdefa60a
@@ -30234,6 +30262,10 @@ sha256=8b3e077d2534722033d7b1c647aa7f31fc7fbb5014da096b7a53170005e80226
 md5=61a1dc9a22991bd04d0ff98f800775c1
 sha256=a3657971232e9c7db3e7517a8aedd86d3ef4d159f7099ec974cdd03aafa41080
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-2.3.0.tar.bz2]
+md5=07fa32958aff9b463dd3af5481ef6626
+sha256=8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-vesa-X11R7.0-1.0.1.3.tar.bz2]
 md5=049ada4df1abb5aa2b6633ba90353e78
 sha256=c6601cd278ebc30a0d20b49b6284bc21b4910f8ef5d24d1c62daa1591a251452
@@ -30286,6 +30318,10 @@ sha256=3e4e9abfd806b36076083ef6cacc93b713bfa4ddefe7005edfc15c64f5174366
 md5=25287a202c986b33bd79fbe379c96a16
 sha256=956443948d94f7459b0056d8cb8ff2cd9fba4621d8b61f0257cb84469ea7da07
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-10.16.9.tar.bz2]
+md5=3b3d38abfa1f8be4b1e26dcd236bc94f
+sha256=835a5e45b54837cbbd963a48bd09db709717e097e931dd76e68e397a167e8bc1
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-vmware-X11R7.0-10.11.1.3.tar.bz2]
 md5=4df79349e26add4c23f6be8bec347ad4
 sha256=79b0bf59d866d3760fa8a55b4a19d56ae7fa6a962d629a9de5c188cec5c98c9a
@@ -31342,6 +31378,10 @@ sha256=f4fb49209a6f3cb1c5b039b1f43870774e2eac1540b4d3235a2f13bc441da159
 md5=4c63b22cad9ed8ae8b86561f0f92c327
 sha256=4b644113cd030fc77615c03c7b6529e063dc1d471ec6a990e6f62eb45a9c2db4
 
+[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.7.4.tar.bz2]
+md5=75d27c3a1c12293f620a2d6518fcbdfa
+sha256=b8ec11b3f2c6f84c21e8cd9804672ba6e27fda3e913d58dd947205ea253e33f8
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/xserver/xorg-server-X11R7.0-1.0.1.tar.bz2]
 md5=0e7527480fb845a3c2e333bd0f47ff50
 sha256=0419124e1bab473f8f9e2d7de1dba8bae2ed1375b72d55cdfb9471dac357ed47
@@ -31894,6 +31934,10 @@ sha256=487bf07b2f9ead6a59682d091081e47cfe4ca5777de32e6cec5bef55fa51c82f
 md5=e0744594f4e5969b20df28d897781318
 sha256=6d0feb42c2f1d6011d97c776b9d580fd589cdf3cfe246cd99437c406a2740d36
 
+[http://xorg.freedesktop.org/releases/individual/app/xvidtune-1.0.2.tar.bz2]
+md5=e40eeb4454f2a7cdde3a14f5dfd3aadd
+sha256=73ca41bd5e73560663bea0d98149b099cfef5743a2282ca67547e97732618a53
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xvidtune-X11R7.0-1.0.1.tar.bz2]
 md5=a12e27fb732cb115b6adc4c724c44c5d
 sha256=f7b3925d7e9981d146d3e5774de0521e6d48e2ed99841f538f267e8bc58bf5cd
-- 
cgit v1.2.3


From c0002bd2f71a05d8bb125ba40f1c489a29436a9e Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Wed, 20 Jan 2010 12:55:45 +0100
Subject: stopwatch: new recipe for QT4 based stopwatch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Author: Christof Musik
* can be used as stop watch
* has countdown capability (e.g. for next holiday)
* survives suspend/resume

Signed-off-by: Christian Rüb <christian.rueb@gmx.net>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 conf/distro/include/sane-srcrevs.inc |  1 +
 recipes/stopwatch/stopwatch_git.bb   | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 recipes/stopwatch/stopwatch_git.bb

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 677134650d..f4d79268a2 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -312,6 +312,7 @@ SRCREV_pn-socketcan-modules ?= "917"
 SRCREV_pn-socketcan-utils-test ?= "917"
 SRCREV_pn-sphyrna-python ?= "45"
 SRCREV_pn-starling ?= "9574"
+SRCREV_pn-stopwatch ?= "89644b91e02151fc72989755f20c1ffb144ef5e2"
 SRCREV_pn-table ?= "2191"
 SRCREV_pn-tichy ?= "ab68d849502009cf3214df48ffa8075a10cc2177"
 SRCREV_pn-tmut ?= "60"
diff --git a/recipes/stopwatch/stopwatch_git.bb b/recipes/stopwatch/stopwatch_git.bb
new file mode 100644
index 0000000000..f0d40da54b
--- /dev/null
+++ b/recipes/stopwatch/stopwatch_git.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "Simple Qt based stop watch"
+AUTHOR = "Christof Musik"
+SECTION = "x11/applications"
+PRIORITY = "optional"
+HOMEPAGE = "http://git.senfdax.de"
+LICENSE = "GPL QPL"
+DEPENDS = "qt4-x11-free"
+PV = "1.3.1+gitr${SRCREV}"
+PR = "r0"
+
+inherit qt4x11
+
+SRC_URI = "git://git.senfdax.de/git/stopwatch;protocol=http;tag=master;branch=master"
+S = "${WORKDIR}/git/"
+
+do_configure() {
+    ${OE_QMAKE_QMAKE}
+}
+
+do_compile() {
+    oe_runmake
+}
+
+do_install() {
+    install -d ${D}${bindir}
+    install -m 0755 ${S}stopwatch ${D}${bindir}
+    install -d ${D}${datadir}/applications
+    install ${S}desktop/stopwatch.desktop ${D}${datadir}/applications/
+    install -d ${D}${datadir}/pixmaps
+    install ${S}desktop/stopwatch.png ${D}${datadir}/pixmaps/
+    install -d ${D}${datadir}/${PN}
+    install ${S}desktop/om.style ${D}${datadir}/${PN}/
+}
-- 
cgit v1.2.3


From 0eaeda31b9f8d286a8a58d787637b4c4d0516b2d Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan.hovold@lundinova.se>
Date: Thu, 17 Dec 2009 05:18:14 +0000
Subject: wxwidgets: add 2.9.0 and clean up recipes

- Add wxwidget-2.9.0 include with derived rather than hardcoded lib and
   config script names (depends on debug and charset configure flags)
 - Use regular expression for LEAD_SONAME rather than hardcoded name.
 - Fix autoconf issue where configure could not find staging root.
 - Use INC_PR.

 - Add wxwidgets-2.9.0 (unicode)
 - Add wxwidgets-ansi-2.9.0 (non-unicode)
 - Add wxwidgets-opengl-2.9.0 (unicode, opengl)

Signed-off-by: Johan Hovold <johan.hovold@lundinova.se>
Signed-off-by: Marco Cavallini <m.cavallini@koansoftware.com>
---
 conf/checksums.ini                                 |  4 ++
 recipes/wxwidgets/wxwidgets-2.9.0.inc              | 44 ++++++++++++++++++++++
 .../wxwidgets-2.9.0/configure-cross_root.patch     | 30 +++++++++++++++
 recipes/wxwidgets/wxwidgets-ansi_2.9.0.bb          |  5 +++
 recipes/wxwidgets/wxwidgets-opengl_2.9.0.bb        |  7 ++++
 recipes/wxwidgets/wxwidgets_2.9.0.bb               |  3 ++
 6 files changed, 93 insertions(+)
 create mode 100644 recipes/wxwidgets/wxwidgets-2.9.0.inc
 create mode 100644 recipes/wxwidgets/wxwidgets-2.9.0/configure-cross_root.patch
 create mode 100644 recipes/wxwidgets/wxwidgets-ansi_2.9.0.bb
 create mode 100644 recipes/wxwidgets/wxwidgets-opengl_2.9.0.bb
 create mode 100644 recipes/wxwidgets/wxwidgets_2.9.0.bb

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 8c81ddd264..924bfccc33 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -28230,6 +28230,10 @@ sha256=9b4096bb1e273914adf101182c27d457f46fcc44d1b3ea027bae3d34ace8c6f7
 md5=3ad40ea2b1728eefa94f60beb9951ff7
 sha256=9b4096bb1e273914adf101182c27d457f46fcc44d1b3ea027bae3d34ace8c6f7
 
+[http://downloads.sourceforge.net/wxwindows/wxWidgets-2.9.0.tar.bz2]
+md5=09058928eeb72853142c062bdec056ce
+sha256=8cf5c1dcf6357b2d27efd0c737b95baf1d2d1e88b5bf24560824b5eb6f2dc782
+
 [http://xorg.freedesktop.org/releases/individual/app/x11perf-1.4.1.tar.bz2]
 md5=fd06c8b8e3572a0e14af65a49e0dd7d1
 sha256=c81819618ec596fda55b950ef80f2ee02e5ce149ea99f1f741cedb459b4d3064
diff --git a/recipes/wxwidgets/wxwidgets-2.9.0.inc b/recipes/wxwidgets/wxwidgets-2.9.0.inc
new file mode 100644
index 0000000000..cb6a971e7a
--- /dev/null
+++ b/recipes/wxwidgets/wxwidgets-2.9.0.inc
@@ -0,0 +1,44 @@
+require wxwidgets.inc
+
+INC_PR = "r0"
+
+PROVIDES += "wxwidgets"
+
+TOOLKIT ?= "gtk2"
+UNICODE ?= "${@base_contains('EXTRA_OECONF', '--disable-unicode', 'ansi', 'unicode', d)}"
+DEBUG ?= "${@base_contains('EXTRA_OECONF', '--enable-debug', 'debug', 'release', d)}"
+RELEASE ?= "${@bb.data.getVar('PV',d,1).rsplit('.', 1)[0]}"
+
+WXCONFIG ?= "${TOOLKIT}-${UNICODE}-${DEBUG}-${RELEASE}"
+
+LEAD_SONAME = "libwx_.*_core-.*\.so"
+
+# Patch and regenerate configure script so that it finds staging root.
+FILESDIR = "${FILE_DIRNAME}/wxwidgets-${PV}"
+SRC_URI += "file://configure-cross_root.patch;patch=1"
+
+do_configure_prepend() {
+	./autogen.sh
+}
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/wx-${RELEASE}/wx
+	cp -pR include/wx ${STAGING_INCDIR}/wx-${RELEASE}
+	cp -pR lib/libwx* ${STAGING_LIBDIR}
+	cp -pR lib/wx     ${STAGING_LIBDIR}
+	cp -pR build/bakefiles/wxpresets/presets ${STAGING_DATADIR}/bakefile
+	cp -p wxwin.m4                          ${STAGING_DATADIR}/aclocal
+	ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}${WXCONFIG} \
+		${STAGING_BINDIR_CROSS}/wx-config
+	sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
+		-e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
+		-e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \
+		-e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \
+		-i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}${WXCONFIG}
+}
+
+do_install() {
+	oe_runmake 'DESTDIR=${D}' install
+	ln -sf  ${libdir}/wx/config/${TARGET_PREFIX}${WXCONFIG} \
+		${D}${bindir}/wx-config
+}
diff --git a/recipes/wxwidgets/wxwidgets-2.9.0/configure-cross_root.patch b/recipes/wxwidgets/wxwidgets-2.9.0/configure-cross_root.patch
new file mode 100644
index 0000000000..e91a95cfbb
--- /dev/null
+++ b/recipes/wxwidgets/wxwidgets-2.9.0/configure-cross_root.patch
@@ -0,0 +1,30 @@
+diff -pu a/configure.in b/configure.in
+--- a/configure.in	2009-12-04 11:02:26.000000000 +0100
++++ b/configure.in	2009-12-03 22:08:05.000000000 +0100
+@@ -2117,14 +2117,21 @@ if test "$build" != "$host" -a "$GCC" = 
+     dnl the linker. Stripping off the trailing '/bin/ld' gives us a candiate
+     dnl for a 'root' below which libraries and headers for the target system
+     dnl might be installed.
+-    if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then
++    m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
++    if test ! -z "$PKG_CONFIG_SYSROOT_DIR"; then
++	    cross_root="$PKG_CONFIG_SYSROOT_DIR"
++    elif cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then
+         cross_root=`dirname $cross_root`
+         cross_root=`dirname $cross_root`
++    else
++	cross_root=""
++    fi
+ 
+-        dnl substitute this candiate root for '^/usr' in the search lists,
+-        dnl strip out any that don't start '^/usr'.
+-        SEARCH_LIB=`for x in $SEARCH_LIB; do echo $x; done | sed -ne "s|^/usr|$cross_root|p"`
+-        SEARCH_INCLUDE=`for x in $SEARCH_INCLUDE; do echo $x; done | sed -ne "s|^/usr|$cross_root|p"`
++    if test ! -z "$cross_root"; then
++        dnl substitute this candiate root for '^/' in the search lists,
++        dnl strip out any that don't start '^/'.
++        SEARCH_LIB=`for x in $SEARCH_LIB; do echo $x; done | sed -ne "s|^/|$cross_root/|p"`
++        SEARCH_INCLUDE=`for x in $SEARCH_INCLUDE; do echo $x; done | sed -ne "s|^/|$cross_root/|p"`
+         SEARCH_INCLUDE="$SEARCH_INCLUDE $cross_root/include"
+ 
+         dnl also have pkg-config search for *.pc files under this 'root'
diff --git a/recipes/wxwidgets/wxwidgets-ansi_2.9.0.bb b/recipes/wxwidgets/wxwidgets-ansi_2.9.0.bb
new file mode 100644
index 0000000000..aafbe5b238
--- /dev/null
+++ b/recipes/wxwidgets/wxwidgets-ansi_2.9.0.bb
@@ -0,0 +1,5 @@
+require wxwidgets-${PV}.inc
+
+PR = "${INC_PR}.0"
+
+EXTRA_OECONF += "--disable-unicode"
diff --git a/recipes/wxwidgets/wxwidgets-opengl_2.9.0.bb b/recipes/wxwidgets/wxwidgets-opengl_2.9.0.bb
new file mode 100644
index 0000000000..e85658c36a
--- /dev/null
+++ b/recipes/wxwidgets/wxwidgets-opengl_2.9.0.bb
@@ -0,0 +1,7 @@
+require wxwidgets-${PV}.inc
+
+DEPENDS += "virtual/libgl"
+
+PR = "${INC_PR}.0"
+
+EXTRA_OECONF += "--with-opengl"
diff --git a/recipes/wxwidgets/wxwidgets_2.9.0.bb b/recipes/wxwidgets/wxwidgets_2.9.0.bb
new file mode 100644
index 0000000000..c23c969861
--- /dev/null
+++ b/recipes/wxwidgets/wxwidgets_2.9.0.bb
@@ -0,0 +1,3 @@
+require wxwidgets-${PV}.inc
+
+PR = "${INC_PR}.0"
-- 
cgit v1.2.3


From 78c0a878694ec91eb3c793e37642819bc3edc87a Mon Sep 17 00:00:00 2001
From: Marco Cavallini <m.cavallini@koansoftware.com>
Date: Wed, 20 Jan 2010 14:28:52 +0100
Subject: kaeilos-2009-preferred-versions.inc: added
 PREFERRED_VERSION_wxwidgets 2.8.10

---
 conf/distro/include/kaeilos-2009-preferred-versions.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/conf/distro/include/kaeilos-2009-preferred-versions.inc b/conf/distro/include/kaeilos-2009-preferred-versions.inc
index 8b120f2eb2..1838213156 100644
--- a/conf/distro/include/kaeilos-2009-preferred-versions.inc
+++ b/conf/distro/include/kaeilos-2009-preferred-versions.inc
@@ -4,7 +4,7 @@
 #@NAME: KaeilOS(R) - http://www.kaeilos.com
 #@DESCRIPTION: KaeilOS Linux Distribution preferred version
 #@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com>
-#@VERSION: 11-01-2010
+#@VERSION: 20-01-2010
 #
 # KaeilOS is a registered trade mark of KOAN - Bergamo - Italia
 # Product website : http://www.KaeilOS.com 
@@ -46,6 +46,9 @@ PREFERRED_VERSION_python = "2.6.2"
 PREFERRED_VERSION_samba		= "3.3.9"
 PREFERRED_VERSION_tiff 		= "3.8.2+4.0.0beta2"
 
+KAEILOS_WX_VERSION ?= "2.8.10"
+PREFERRED_VERSION_wxwidgets ?= "${KAEILOS_WX_VERSION}"
+
 KAEILOS_QT_VERSION ?= "4.6.0"
 PREFERRED_VERSION_qt4-tools-native = "${KAEILOS_QT_VERSION}"
 PREFERRED_VERSION_qt4-tools-sdk = "${KAEILOS_QT_VERSION}"
-- 
cgit v1.2.3


From c87ea56a9e59dd4b3ddf67d900f4e14c1168bcd0 Mon Sep 17 00:00:00 2001
From: Simon 'Morphis' Busch <morphis@gravedo.de>
Date: Wed, 20 Jan 2010 18:14:42 +0100
Subject: preboot: new recipe; a dual boot solution for the palm pre (WIP)

---
 recipes/preboot/files/etc/init.d/usbnet         |  9 ++++
 recipes/preboot/files/etc/miniboot.sh           | 43 +++++++++++++++
 recipes/preboot/initramfs-preboot-image.bb      | 69 +++++++++++++++++++++++++
 recipes/preboot/linux-preboot-palmpre_2.6.24.bb | 24 +++++++++
 recipes/preboot/linux-preboot.inc               | 54 +++++++++++++++++++
 5 files changed, 199 insertions(+)
 create mode 100644 recipes/preboot/files/etc/init.d/usbnet
 create mode 100644 recipes/preboot/files/etc/miniboot.sh
 create mode 100644 recipes/preboot/initramfs-preboot-image.bb
 create mode 100644 recipes/preboot/linux-preboot-palmpre_2.6.24.bb
 create mode 100644 recipes/preboot/linux-preboot.inc

diff --git a/recipes/preboot/files/etc/init.d/usbnet b/recipes/preboot/files/etc/init.d/usbnet
new file mode 100644
index 0000000000..e6c7f4e412
--- /dev/null
+++ b/recipes/preboot/files/etc/init.d/usbnet
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# usb gadget configuration:
+# there already different configurations on the palm pre defined, we choose nr 5
+# cause it provides the usbnet, novacom and storage gadget
+if [ -e /sys/class/usb_gadget/config_num ]; then
+        echo 5 > /sys/class/usb_gadget/config_num
+fi
+
diff --git a/recipes/preboot/files/etc/miniboot.sh b/recipes/preboot/files/etc/miniboot.sh
new file mode 100644
index 0000000000..1997ff8646
--- /dev/null
+++ b/recipes/preboot/files/etc/miniboot.sh
@@ -0,0 +1,43 @@
+#!/bin/sh                                
+
+# Mount proc
+mount -t proc proc /proc -o rw,noexec,nosuid,nodev
+# Mount sys
+mount -t sysfs sys /sys -o rw,noexec,nosuid,nodev
+
+# Mount root rw
+mount / -o remount,rw
+
+# Prep modules
+depmod -A
+
+# Populate /dev
+/etc/init.d/udev start
+
+# Mount everything
+# mount -a
+
+# Setup a proper /tmp using tmpfs
+cat /proc/mounts | grep -q "\s/tmp\s"
+[ "x$?" != "x0" ] && mount -t tmpfs tmpfs /tmp
+
+cat /proc/mounts | grep -q "\s/dev/pts\s"
+[ "x$?" != "x0" ] && mount -t devpts devpts /dev/pts
+
+# Set the hostname
+hostname -F /etc/hostname
+
+# USB gadget configuration
+if [ -e /sys/class/usb_gadget/config_num ]; then
+	echo 5 > /sys/class/usb_gadget/config_num
+fi
+
+# USB network configuration
+ifup -f usb0
+ifconfig usb0 192.168.0.202
+
+# Dropbear ssh service
+/etc/init.d/dropbear start
+
+# Spin relaunching login
+while true; do getty 115200 console; done
diff --git a/recipes/preboot/initramfs-preboot-image.bb b/recipes/preboot/initramfs-preboot-image.bb
new file mode 100644
index 0000000000..0675916680
--- /dev/null
+++ b/recipes/preboot/initramfs-preboot-image.bb
@@ -0,0 +1,69 @@
+#initramfs image which mounts the rootfilesystem and kexecs a kernel from there
+PR = "r1"
+
+ONLINE_PACKAGE_MANAGEMENT = "none"
+IMAGE_FSTYPES = "cpio.gz"
+
+export IMAGE_BASENAME = "initramfs-preboot-image"
+
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
+
+# avoid circular dependencies
+EXTRA_IMAGEDEPENDS = ""
+
+IMAGE_INSTALL = " \
+	task-boot \
+	util-linux-ng-mount util-linux-ng-umount \
+	dropbear \
+	fontconfig \
+	ttf-freefonts \
+	eina \
+	evas \
+	edje \
+	efreet \
+	eet \
+	edbus \
+	elementary \
+	elementary-themes \
+	elementary-tests \
+	fbset \
+	fbset-init \
+    msmcommd \
+#	lvm2 \
+#	preboot \
+	"
+
+IMAGE_LINGUAS = ""
+
+inherit image
+
+preboot_palmpre_rootfs_postprocess() {
+	# copy all our files to the rootfs
+	dirs=`find ${FILESDIR} -type d -printf "%P\n" | grep -v "^.$" | grep -v ".git"`
+	for dir in $dirs; do
+		mkdir -p ${IMAGE_ROOTFS}/$dir
+	done
+	files=`find ${FILESDIR} -type f -printf "%P\n" | grep -v ".git"`
+	for file in $files; do
+		cp -f ${FILESDIR}/$file ${IMAGE_ROOTFS}/$file
+	done
+
+	curdir=$PWD
+	cd ${IMAGE_ROOTFS}
+
+	# install our usbnet initscript
+	chmod +x etc/init.d/usbnet
+#	ln -sf ../init.d/usbnet ${IMAGE_ROOTFS}/etc/rcS.d/S15usbnet
+
+	# miniboot sequence (just for debugging)
+	rm ${IMAGE_ROOTFS}/sbin/init
+	chmod +x ${IMAGE_ROOTFS}/etc/miniboot.sh 
+	ln -sf /etc/miniboot.sh ${IMAGE_ROOTFS}/init
+	ln -sf ../etc/miniboot.sh ${IMAGE_ROOTFS}/sbin/init
+
+	cd $curdir
+}
+
+ROOTFS_POSTPROCESS_COMMAND_palmpre += " preboot_palmpre_rootfs_postprocess"
+
+
diff --git a/recipes/preboot/linux-preboot-palmpre_2.6.24.bb b/recipes/preboot/linux-preboot-palmpre_2.6.24.bb
new file mode 100644
index 0000000000..e2d278cb68
--- /dev/null
+++ b/recipes/preboot/linux-preboot-palmpre_2.6.24.bb
@@ -0,0 +1,24 @@
+require linux-preboot.inc
+
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_palmpre = "-1"
+
+# Hacks should clearly named and at the bottom
+SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
+           "
+
+SRC_URI_append_palmpre = "\
+http://palm.cdnetworks.net/opensource/1.3.1/linuxkernel-2.6.24-patch.gz;patch=1 \
+"
+S = "${WORKDIR}/linux-2.6.24"
+
+# We try to build the identical kernel as Palms here, use their defconfig.
+do_configure_prepend() {
+        install -m 0644 ${S}/arch/arm/configs/omap_sirloin_3430_defconfig ${WORKDIR}/defconfig
+}
+
+# linux.inc overrides LOCAVERSION but we like to stay with the one used originally
+do_compile_prepend() {
+	sed -i -e '/CONFIG_LOCALVERSION=/d' ${S}/.config
+	echo 'CONFIG_LOCALVERSION="-joplin-3430"' >>${S}/.config
+}
diff --git a/recipes/preboot/linux-preboot.inc b/recipes/preboot/linux-preboot.inc
new file mode 100644
index 0000000000..4f99b71773
--- /dev/null
+++ b/recipes/preboot/linux-preboot.inc
@@ -0,0 +1,54 @@
+# We set PR here, since a change in the kexecboot recipe will need to get picked up by *all* the kernels:
+PR = "r15"
+
+SRC_URI = "file://defconfig"
+
+LOGO_SIZE = '${@base_conditional("GUI_MACHINE_CLASS", "bigscreen", "vga", "qvga", d)}'
+
+require ../linux/linux.inc
+
+DONT_CHECK_KERNELSIZE = ""
+INITRAMFS_IMAGE = "initramfs-preboot-image"
+
+# here we set master console on serial
+CMDLINE = "console=tty1 console=ttyS0,115200n8"
+
+PACKAGES = ""
+PROVIDES = ""
+
+KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-preboot-${PV}-${PR}-${MACHINE}"
+KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-preboot-${MACHINE}"
+
+do_configure[depends] += "${INITRAMFS_IMAGE}:do_rootfs"
+
+do_configure_append() {
+sed -i -e /CONFIG_BLK_DEV_INITRD/d \
+       -e /CONFIG_KEXEC/d \
+       -e /CONFIG_INITRAMFS_SOURCE/d \
+       -e /=m/d \
+       -e /CONFIG_MODULES/d \
+       -e /CONFIG_DEBUG_ERRORS/d \
+       -e /CONFIG_DEBUG_BUGVERBOSE/d \
+       -e /CONFIG_DEBUG_KERNEL/d \
+       ${S}/.config
+
+# Remove last tag appended by linux.inc (output messes screen)
+sed -i -e /CONFIG_CMDLINE/s/quiet/loglevel=3/1 ${S}/.config
+sed -i -e /CONFIG_CMDLINE/s/debug/loglevel=3/1 ${S}/.config
+
+echo 'CONFIG_BLK_DEV_INITRD=y
+CONFIG_KEXEC=y
+CONFIG_INITRAMFS_SOURCE="initramfs.cpio.gz"
+CONFIG_MODULES=n' >> ${S}/.config
+
+        yes '' | oe_runmake oldconfig
+}
+
+do_stage() {
+}
+
+do_install() {
+}
+
+python do_package() {
+}
-- 
cgit v1.2.3


From 91c888e06f609d20146837ffeac84a911fc4f745 Mon Sep 17 00:00:00 2001
From: Marco Cavallini <m.cavallini@koansoftware.com>
Date: Wed, 20 Jan 2010 19:58:41 +0100
Subject: kaeilos-2009-preferred-versions.inc: errata in
 PREFERRED_VERSION_wxwidgets

---
 conf/distro/include/kaeilos-2009-preferred-versions.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/distro/include/kaeilos-2009-preferred-versions.inc b/conf/distro/include/kaeilos-2009-preferred-versions.inc
index 1838213156..870ac04036 100644
--- a/conf/distro/include/kaeilos-2009-preferred-versions.inc
+++ b/conf/distro/include/kaeilos-2009-preferred-versions.inc
@@ -47,7 +47,7 @@ PREFERRED_VERSION_samba		= "3.3.9"
 PREFERRED_VERSION_tiff 		= "3.8.2+4.0.0beta2"
 
 KAEILOS_WX_VERSION ?= "2.8.10"
-PREFERRED_VERSION_wxwidgets ?= "${KAEILOS_WX_VERSION}"
+PREFERRED_VERSION_wxwidgets = "${KAEILOS_WX_VERSION}"
 
 KAEILOS_QT_VERSION ?= "4.6.0"
 PREFERRED_VERSION_qt4-tools-native = "${KAEILOS_QT_VERSION}"
-- 
cgit v1.2.3


From fae0d64b586f990359f476e34439ba8f10b2621b Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan@datenfreihafen.org>
Date: Wed, 20 Jan 2010 20:06:16 +0100
Subject: checksums.ini: Add missing sum for linuxkernel-2.6.24-patch

---
 conf/checksums.ini | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 924bfccc33..68babd16af 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -17762,6 +17762,10 @@ sha256=9dbd0f6c92b33ae8b96c5a045a341a00b2454492c2229839d056e4fd1488bca5
 md5=5d86ca7bb4ed458743acd922ff09dae6
 sha256=e4b6ab08eaff2766c3bf85ea8d63ab31ae774266b8351772117fcc94d1318ade
 
+[http://palm.cdnetworks.net/opensource/1.3.1/linuxkernel-2.6.24-patch.gz]
+md5=651e9c518db317d11ae5b9076fb0e3ee
+sha256=f9c0327a9fa379f2db6bf4b599bd1e37b65e7224aa3fd2bd860a5e0dc5b06040
+
 [http://linuxtv.org/downloads/linuxtv-dvb-apps-1.1.1.tar.bz2]
 md5=de958cdb8d00e74792dd69f3c945b037
 sha256=371f8133db705bde6c2f79cccb0b1a1f626a0d94bf41acceba5d76a69155f057
-- 
cgit v1.2.3


From 1a6ebaa5ed73ef1aaaf7023d81fc0679cc86786d Mon Sep 17 00:00:00 2001
From: Thomas Zimmermann <ml@vdm-design.de>
Date: Wed, 20 Jan 2010 17:56:32 +0000
Subject: mickeydbus2: add new recipe

Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>
---
 conf/distro/include/sane-srcrevs-fso.inc  |  1 +
 recipes/freesmartphone/mickeydbus2_git.bb | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 recipes/freesmartphone/mickeydbus2_git.bb

diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
index 733b15e78b..06e3f1c8e0 100644
--- a/conf/distro/include/sane-srcrevs-fso.inc
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -16,6 +16,7 @@ SRCREV_pn-libfsobasics ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-libfsoframework ?= "c227502c59f4d1de3b3097b3329c2461d6cfa2a2"
 SRCREV_pn-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-libfsoresource ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-mickeydbus2 ?= "${FSO_CORNUCOPIA_SRCREV}"
 
 # FSO Projects -- Misc
 SRCREV_pn-dbus-hlid ?= "5df7f49fe8881804aaab544a569fd164c3e93afb"
diff --git a/recipes/freesmartphone/mickeydbus2_git.bb b/recipes/freesmartphone/mickeydbus2_git.bb
new file mode 100644
index 0000000000..799cbe72c1
--- /dev/null
+++ b/recipes/freesmartphone/mickeydbus2_git.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Mickey's DBus introspection and calling Program rewritten in vala"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
+HOMEPAGE = "http://www.freesmartphone.org"
+SECTION = "console/network"
+LICENSE = "GPLv2"
+
+DEPENDS = "vala-native glib-2.0 dbus dbus-glib"
+
+PV = "2.0.0+gitr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master"
+S = "${WORKDIR}/git/tools/mdbus2"
+
+inherit autotools
+
+
-- 
cgit v1.2.3


From c71044be4d589d8207ed9d60e418d36003948c1b Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <utx@penguin.cz>
Date: Wed, 20 Jan 2010 20:51:27 +0000
Subject: xf86-input-tslib: Fix double free crash while on chvt or exit. * For
 more see recipes/xorg-driver/xf86-input-tslib/double-free-crash.patch

---
 .../xf86-input-tslib/double-free-crash.patch         | 20 ++++++++++++++++++++
 recipes/xorg-driver/xf86-input-tslib_0.0.6.bb        |  3 ++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 recipes/xorg-driver/xf86-input-tslib/double-free-crash.patch

diff --git a/recipes/xorg-driver/xf86-input-tslib/double-free-crash.patch b/recipes/xorg-driver/xf86-input-tslib/double-free-crash.patch
new file mode 100644
index 0000000000..07754731dd
--- /dev/null
+++ b/recipes/xorg-driver/xf86-input-tslib/double-free-crash.patch
@@ -0,0 +1,20 @@
+xorg-server-1.7.3/hw/xfree86/common/xf86Helper.c contains this code
+causing a double free crash on chvt or exit:
+
+    /* This should *really* be handled in drv->UnInit(dev) call instead, but
+     * if the driver forgets about it make sure we free it or at least crash
+     * with flying colors */
+    if (pInp->private)
+	xfree(pInp->private);
+Index: xf86-input-tslib-0.0.6/src/tslib.c
+===================================================================
+--- xf86-input-tslib-0.0.6.orig/src/tslib.c
++++ xf86-input-tslib-0.0.6/src/tslib.c
+@@ -435,6 +435,7 @@ xf86TslibUninit(InputDriverPtr drv, Inpu
+ 	xf86TslibControlProc(pInfo->dev, DEVICE_OFF);
+ 	ts_close(priv->ts);
+ 	xfree(pInfo->private);
++	pInfo->private = NULL;
+ 	xf86DeleteInput(pInfo, 0);
+ }
+ 
diff --git a/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb b/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb
index 84d2da0ffd..cce5e9bdd1 100644
--- a/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb
+++ b/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb
@@ -4,9 +4,10 @@ DESCRIPTION = "X.Org X server -- tslib input driver"
 RRECOMMENDS += "hal tslib-calibrate"
 DEPENDS += "tslib"
 
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-${PV}.tar.bz2 \
+	   file://double-free-crash.patch;patch=1 \
            file://10-x11-input-tslib.fdi"
 
 do_configure_prepend() {
-- 
cgit v1.2.3


From a197e5c95cb56d5952dadccb928923721e2a9ea4 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <utx@penguin.cz>
Date: Wed, 20 Jan 2010 20:54:25 +0000
Subject: xserver-xorg: Worked around server termination after chvt on some
 fbdev devices. * The patch is just a quick hack that fixes chvt on some fbdev
 devices. * For more read
 recipes/xorg-xserver/xserver-xorg/hack-fbdev-ignore-return-mode.patch

---
 .../hack-fbdev-ignore-return-mode.patch            | 39 ++++++++++++++++++++++
 recipes/xorg-xserver/xserver-xorg_1.7.3.bb         |  3 +-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 recipes/xorg-xserver/xserver-xorg/hack-fbdev-ignore-return-mode.patch

diff --git a/recipes/xorg-xserver/xserver-xorg/hack-fbdev-ignore-return-mode.patch b/recipes/xorg-xserver/xserver-xorg/hack-fbdev-ignore-return-mode.patch
new file mode 100644
index 0000000000..d3661cbea2
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg/hack-fbdev-ignore-return-mode.patch
@@ -0,0 +1,39 @@
+Ugly hack that prevents server termination with xf86-video-fbdev-0.4.1
+(and probably other) while returning from chvt or resume on some
+hardware (e. g. zaurus).
+
+Correct fix would require debugging of fbdev mode during LeaveVT and
+EnterVT.
+
+This patch may cause staying in incorrect or corrupted display mode
+after EnterVT, but on man affected devices it does not cause any visible
+problems.
+
+Hacked code is never called on properly written drivers.
+
+Devices affected and testers involved for future patch removal:
+Sharp Zaurus (spitz/akita): Stanislav Brabec <utx@penguin.cz>
+
+See also:
+https://bugzilla.redhat.com/show_bug.cgi?id=238451
+
+The bug (first line indicates that your device is affected):
+
+(EE) FBDEV(0): FBIOPUT_VSCREENINFO succeeded but modified mode
+
+Fatal server error:
+EnterVT failed for screen 0
+
+Index: xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c
+===================================================================
+--- xorg-server-1.7.3.orig/hw/xfree86/fbdevhw/fbdevhw.c
++++ xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c
+@@ -571,7 +571,7 @@ fbdevHWSetMode(ScrnInfoPtr pScrn, Displa
+ #if DEBUG
+ 		print_fbdev_mode("returned", &set_var);
+ #endif
+-		return FALSE;
++		/* return FALSE; UGLY HACK to allow return from chvt */
+ 	}
+ 
+ 	if (!check)
diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.3.bb b/recipes/xorg-xserver/xserver-xorg_1.7.3.bb
index edede8b3ff..2ecb169a84 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.7.3.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.7.3.bb
@@ -3,11 +3,12 @@ require xorg-xserver-common.inc
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts"
 PE = "2"
-PR = "r4"
+PR = "r5"
 
 SRC_URI += "file://sysroot_fix.patch;patch=1 \
             file://dolt-fix-1.7.0.patch;patch=1 \
             file://randr-support-1.7.0.patch;patch=1 \
+            file://hack-fbdev-ignore-return-mode.patch;patch=1 \
            "
 
 SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1"
-- 
cgit v1.2.3


From 8364b075ed456c160c1354f8a7c9dccfe48ad57d Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 20 Jan 2010 13:50:56 -0800
Subject: gdb: Add RRECOMMENDS for uclibc-thread-db when using uclibc for
 system C library.

* Fix PR 3273

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 recipes/gdb/gdb.inc       | 6 ++++--
 recipes/gdb/gdbserver.inc | 6 +++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/recipes/gdb/gdb.inc b/recipes/gdb/gdb.inc
index 77a9ca6a3e..a63fb6159b 100644
--- a/recipes/gdb/gdb.inc
+++ b/recipes/gdb/gdb.inc
@@ -10,6 +10,10 @@ FILES_gdbserver = "${bindir}/gdbserver"
 RRECOMMENDS_gdb_append_linux = " glibc-thread-db "
 RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db "
 
+RRECOMMENDS_gdb_append_linux-uclibc = " uclibc-thread-db "
+RRECOMMENDS_gdb_append_linux-uclibceabi = " uclibc-thread-db "
+RRECOMMENDS_gdb_append_linux-spe = " uclibc-thread-db "
+
 inherit gettext
 
 SRC_URI += "file://kill_arm_map_symbols.patch;patch=1 \
@@ -43,5 +47,3 @@ do_install () {
 	install -d ${D}${bindir}
 	install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir}
 }
-
-
diff --git a/recipes/gdb/gdbserver.inc b/recipes/gdb/gdbserver.inc
index b98058fe5d..f477c3aa9c 100644
--- a/recipes/gdb/gdbserver.inc
+++ b/recipes/gdb/gdbserver.inc
@@ -1,6 +1,6 @@
 require gdb-common.inc
 
-INC_PR = "r1"
+INC_PR = "r2"
 
 DEFAULT_PREFERENCE_avr32 = "-99"
 
@@ -9,6 +9,10 @@ FILES_gdbserver = "${bindir}/gdbserver"
 RRECOMMENDS_gdb_append_linux = " glibc-thread-db "
 RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db "
 
+RRECOMMENDS_gdb_append_linux-uclibc = " uclibc-thread-db "
+RRECOMMENDS_gdb_append_linux-uclibceabi = " uclibc-thread-db "
+RRECOMMENDS_gdb_append_linux-spe = " uclibc-thread-db "
+
 inherit gettext
 
 FILESPATHPKG =. "gdb-${PV}:"
-- 
cgit v1.2.3


From 2f6df5f0713355be81814f65df25143aba5ea4fb Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@mvista.com>
Date: Wed, 20 Jan 2010 16:14:08 -0700
Subject: rpm-native: kill unnecessary varprefix/localstatedir manipulation

Signed-off-by: Chris Larson <clarson@mvista.com>
---
 recipes/rpm/rpm-native_4.4.2.3.bb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/recipes/rpm/rpm-native_4.4.2.3.bb b/recipes/rpm/rpm-native_4.4.2.3.bb
index 62cef86a72..ec98cb8817 100644
--- a/recipes/rpm/rpm-native_4.4.2.3.bb
+++ b/recipes/rpm/rpm-native_4.4.2.3.bb
@@ -4,6 +4,3 @@ require rpm-${PV}.inc
 
 DEPENDS = "beecrypt-native gettext-native zlib-native file-native popt-native python-native"
 PACKAGES = ""
-
-export localstatedir = "${layout_localstatedir}"
-export varprefix = "${layout_localstatedir}"
-- 
cgit v1.2.3


From 0b76c230a456f09e7d3704955cc22ebf875eea16 Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@mvista.com>
Date: Wed, 20 Jan 2010 16:19:52 -0700
Subject: konq-e 20060404: don't override the exec_prefix var

Signed-off-by: Chris Larson <clarson@mvista.com>
---
 recipes/konqueror/konqueror-embedded_20060404.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/konqueror/konqueror-embedded_20060404.bb b/recipes/konqueror/konqueror-embedded_20060404.bb
index a84f47d471..9f6ed35aeb 100644
--- a/recipes/konqueror/konqueror-embedded_20060404.bb
+++ b/recipes/konqueror/konqueror-embedded_20060404.bb
@@ -21,7 +21,7 @@ S = "${WORKDIR}/kdenox"
 export QMAKE = "${STAGING_BINDIR_NATIVE}/qmake"
 export MOC = "${STAGING_BINDIR_NATIVE}/moc"
 export UIC = "${STAGING_BINDIR_NATIVE}/uic"
-export exec_prefix = "${palmtopdir}"
+#export exec_prefix = "${palmtopdir}"
 export CXXFLAGS = "-fexceptions -frtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DQT_NO_DOM -DENABLE_BOOKMARKS"
 export PCRE_CONFIG = "invalid"
 # uncomment this for a static build
-- 
cgit v1.2.3