From 40d3de312d7892436cb00b8bdb77eda0746564b1 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 27 Jul 2007 12:19:58 +0000
Subject: gnuradio: fixes * update PV to 3.0.4 * patch out doc generation for
 gr-trellis subdir * packages all libs seperately * package python files as
 well

---
 packages/gnuradio/gnuradio/.mtn2git_empty       |  0
 packages/gnuradio/gnuradio/no-trellis-doc.patch |  9 +++++++++
 packages/gnuradio/gnuradio_svn.bb               | 20 +++++++++++++++++---
 3 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 packages/gnuradio/gnuradio/.mtn2git_empty
 create mode 100644 packages/gnuradio/gnuradio/no-trellis-doc.patch

diff --git a/packages/gnuradio/gnuradio/.mtn2git_empty b/packages/gnuradio/gnuradio/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/gnuradio/gnuradio/no-trellis-doc.patch b/packages/gnuradio/gnuradio/no-trellis-doc.patch
new file mode 100644
index 0000000000..1e5148d3f9
--- /dev/null
+++ b/packages/gnuradio/gnuradio/no-trellis-doc.patch
@@ -0,0 +1,9 @@
+--- /tmp/Makefile.am	2007-07-27 13:44:31.000000000 +0200
++++ trunk/gr-trellis/Makefile.am	2007-07-27 13:50:06.795215000 +0200
+@@ -21,5 +21,5 @@
+ 
+ include $(top_srcdir)/Makefile.common
+ 
+-SUBDIRS = src doc
++SUBDIRS = src
+ 
diff --git a/packages/gnuradio/gnuradio_svn.bb b/packages/gnuradio/gnuradio_svn.bb
index f3d4873e5a..0eed243618 100644
--- a/packages/gnuradio/gnuradio_svn.bb
+++ b/packages/gnuradio/gnuradio_svn.bb
@@ -3,13 +3,16 @@ SECTION =  "apps"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "fftwf python boost cppunit sdcc-native swig swig-native"
-RDEPENDS = "libfftwf python swig"
 
-PV = "0.0+svn${SRCDATE}"
+RDEPENDS_${PN} = "python-core swig"
+
+PV = "3.0.4+svn${SRCDATE}"
 PR = "r0"
 
 
-SRC_URI = "svn://gnuradio.org/svn/gnuradio;module=trunk;proto=http"
+SRC_URI = "svn://gnuradio.org/svn/gnuradio;module=trunk;proto=http \
+	   file://no-trellis-doc.patch;patch=1 \
+	   "
 
 inherit autotools pkgconfig
 
@@ -22,3 +25,14 @@ export HOST_SYS := "${HOST_SYS}"
 
 EXTRA_OECONF = "--disable-gr-atsc --disable-gr-video-sdl"
 
+PACKAGES =+ "libgromnithread libgnuradio-core libgnuradio-core-qa"
+FILES_libgnuradio-core = "${libdir}/libgnuradio-core.so.*"
+FILES_libgnuradio-core-qa = "${libdir}/libgnuradio-core-qa.so.*"
+FILES_libgromnithread = "${libdir}/libgromnithread.so*"
+
+FILES_${PN} += "${libdir}/python*/site-packages/gnuradio/*"
+FILES_${PN}-dbg += "${libdir}/python*/site-packages/gnuradio/.debug \
+                   ${libdir}/python*/site-packages/gnuradio/*/.debug \
+		   "
+
+
-- 
cgit v1.2.3


From 5b3b42e47ea79502308f2f2c13687c200947aeaf Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 27 Jul 2007 13:30:33 +0000
Subject: omext: add proof of concept extension handler for openmoko

---
 packages/openmoko-apps/omext_0.2.bb | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 packages/openmoko-apps/omext_0.2.bb

diff --git a/packages/openmoko-apps/omext_0.2.bb b/packages/openmoko-apps/omext_0.2.bb
new file mode 100644
index 0000000000..203b84e3df
--- /dev/null
+++ b/packages/openmoko-apps/omext_0.2.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Openmoko extensionhandler"
+LICENSE = "GPLv2"
+
+DEPENDS = "dbus-glib"
+
+SRC_URI = "http://www.devzero.net/openmoko/dist/omext-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+S = "{WORKDIR}/openmoko-extensionhandler"
+
+
-- 
cgit v1.2.3


From d9fcc52a43dfde71cdded97290c751cf63a6d1dc Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 27 Jul 2007 14:13:03 +0000
Subject: gnuradio: add enough python stuff to silence dial_tone.py

---
 packages/gnuradio/gnuradio_svn.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/gnuradio/gnuradio_svn.bb b/packages/gnuradio/gnuradio_svn.bb
index 0eed243618..30fe6ba916 100644
--- a/packages/gnuradio/gnuradio_svn.bb
+++ b/packages/gnuradio/gnuradio_svn.bb
@@ -4,10 +4,10 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "fftwf python boost cppunit sdcc-native swig swig-native"
 
-RDEPENDS_${PN} = "python-core swig"
+RDEPENDS_${PN} = "python-core python-audio python-codecs python-lang python-textutils swig"
 
 PV = "3.0.4+svn${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 
 SRC_URI = "svn://gnuradio.org/svn/gnuradio;module=trunk;proto=http \
-- 
cgit v1.2.3


From b15a1a219c9591b5401eb2979b29e86923cd542f Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Fri, 27 Jul 2007 21:06:04 +0000
Subject: opie-taskbar-images 1.2.3: Add missing recipe.

---
 packages/opie-taskbar/opie-taskbar-images_1.2.3.bb | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 packages/opie-taskbar/opie-taskbar-images_1.2.3.bb

diff --git a/packages/opie-taskbar/opie-taskbar-images_1.2.3.bb b/packages/opie-taskbar/opie-taskbar-images_1.2.3.bb
new file mode 100644
index 0000000000..85bf14375c
--- /dev/null
+++ b/packages/opie-taskbar/opie-taskbar-images_1.2.3.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+PR = "r0"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
-- 
cgit v1.2.3


From 7bd690260c5bdb94138ec70009b07a8835540e29 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Fri, 27 Jul 2007 21:21:50 +0000
Subject: linux-handhelds-2.6: Add 2.6.20-hh10, latest tag of 2.6.20 branch
 (historical). * For completeness.

---
 packages/linux/linux-handhelds-2.6_2.6.20-hh10.bb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 packages/linux/linux-handhelds-2.6_2.6.20-hh10.bb

diff --git a/packages/linux/linux-handhelds-2.6_2.6.20-hh10.bb b/packages/linux/linux-handhelds-2.6_2.6.20-hh10.bb
new file mode 100644
index 0000000000..8e760267f4
--- /dev/null
+++ b/packages/linux/linux-handhelds-2.6_2.6.20-hh10.bb
@@ -0,0 +1,15 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
+LICENSE = "GPL"
+PR = "r1"
+
+DEFAULT_PREFERENCE = "-1"
+
+# Override where to look for defconfigs and patches,
+# we have per-kernel-release sets.
+FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.20/${MACHINE}:${FILE_DIRNAME}/linux-handhelds-2.6-2.6.20"
+
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+           file://defconfig"
+
+require linux-handhelds-2.6.inc
-- 
cgit v1.2.3


From 0734251c17d0c8139574825920616b00baef02f7 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Fri, 27 Jul 2007 21:23:06 +0000
Subject: linux-handhelds-2.6 2.6.20-hh6: Drop old version.

---
 packages/linux/linux-handhelds-2.6_2.6.20-hh6.bb | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 packages/linux/linux-handhelds-2.6_2.6.20-hh6.bb

diff --git a/packages/linux/linux-handhelds-2.6_2.6.20-hh6.bb b/packages/linux/linux-handhelds-2.6_2.6.20-hh6.bb
deleted file mode 100644
index 8e760267f4..0000000000
--- a/packages/linux/linux-handhelds-2.6_2.6.20-hh6.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SECTION = "kernel"
-DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
-LICENSE = "GPL"
-PR = "r1"
-
-DEFAULT_PREFERENCE = "-1"
-
-# Override where to look for defconfigs and patches,
-# we have per-kernel-release sets.
-FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.20/${MACHINE}:${FILE_DIRNAME}/linux-handhelds-2.6-2.6.20"
-
-SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
-           file://defconfig"
-
-require linux-handhelds-2.6.inc
-- 
cgit v1.2.3


From 8caffa254ca4072d1530f4c3273e4ba87700252f Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Fri, 27 Jul 2007 21:23:43 +0000
Subject: linux-handhelds-2.6 cvs: CVS HEAD is 2.6.21-hh14.

---
 packages/linux/linux-handhelds-2.6_cvs.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/linux/linux-handhelds-2.6_cvs.bb b/packages/linux/linux-handhelds-2.6_cvs.bb
index d7062ec675..4e008f5b6e 100644
--- a/packages/linux/linux-handhelds-2.6_cvs.bb
+++ b/packages/linux/linux-handhelds-2.6_cvs.bb
@@ -9,7 +9,7 @@ DEFAULT_PREFERENCE = "-1"
 K_MAJOR = "2"
 K_MINOR = "6"
 K_MICRO = "21"
-HHV     = "2"
+HHV     = "14"
 
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26  \
            file://defconfig"
-- 
cgit v1.2.3


From 0ab03e40bdf2d81e5168a1bdd5686f1fd3ad2229 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 27 Jul 2007 21:49:13 +0000
Subject: guile-native: update to 1.8.2

---
 packages/guile/guile-native_1.8.2.bb | 133 +++++++++++++++++++++++++++++++++++
 1 file changed, 133 insertions(+)
 create mode 100644 packages/guile/guile-native_1.8.2.bb

diff --git a/packages/guile/guile-native_1.8.2.bb b/packages/guile/guile-native_1.8.2.bb
new file mode 100644
index 0000000000..99d77b0da0
--- /dev/null
+++ b/packages/guile/guile-native_1.8.2.bb
@@ -0,0 +1,133 @@
+SECTION = "unknown"
+LICENSE = "GPL"
+SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
+           "
+
+inherit autotools native
+
+S="${WORKDIR}/guile-${PV}"
+
+OE_LT_RPATH_ALLOW = "any"
+LDFLAGS += " -L${STAGING_LIBDIR} "
+
+do_configure() {
+	# no autoreconf, thanks
+	oe_runconf
+}
+
+LIBGUILE_HEADERS = "\
+__scm.h \
+alist.h \
+arbiters.h \
+async.h \
+backtrace.h \
+boolean.h \
+chars.h \
+continuations.h \
+debug-malloc.h \
+debug.h \
+deprecation.h \
+dynl.h \
+dynwind.h \
+environments.h \
+eq.h \
+error.h \
+eval.h \
+evalext.h \
+extensions.h \
+feature.h \
+filesys.h \
+fluids.h \
+fports.h \
+gc.h \
+gdb_interface.h \
+gdbint.h \
+goops.h \
+gsubr.h \
+guardians.h \
+hash.h \
+hashtab.h \
+hooks.h \
+init.h \
+ioext.h \
+iselect.h \
+keywords.h \
+lang.h \
+list.h \
+load.h \
+macros.h \
+mallocs.h \
+modules.h \
+net_db.h \
+numbers.h \
+objects.h \
+objprop.h \
+options.h \
+pairs.h \
+ports.h \
+posix.h \
+print.h \
+procprop.h \
+procs.h \
+properties.h \
+ramap.h \
+random.h \
+rdelim.h \
+read.h \
+regex-posix.h \
+root.h \
+rw.h \
+scmconfig.h \
+scmsigs.h \
+script.h \
+simpos.h \
+smob.h \
+snarf.h \
+socket.h \
+sort.h \
+srcprop.h \
+stackchk.h \
+stacks.h \
+stime.h \
+strings.h \
+strorder.h \
+strports.h \
+struct.h \
+symbols.h \
+tags.h \
+threads.h \
+throw.h \
+unif.h \
+validate.h \
+values.h \
+variable.h \
+vectors.h \
+version.h \
+vports.h \
+weaks.h \
+"
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/libguile
+	for i in ${LIBGUILE_HEADERS}; do
+		install -m 0644 libguile/$i ${STAGING_INCDIR}/libguile/$i
+	done
+
+        install -d ${STAGING_BINDIR_NATIVE}
+	install -m 0755 ${S}/libguile/.libs/guile ${STAGING_BINDIR_NATIVE}/
+
+	install -m 0644 libguile.h ${STAGING_INCDIR}/libguile.h
+	install -d ${STAGING_INCDIR}/guile
+	install -m 0644 libguile/gh.h ${STAGING_INCDIR}/guile/
+	install -d ${STAGING_INCDIR}/guile/srfi
+	install -d ${STAGING_INCDIR}/guile-readline
+	install -m 0644 guile-readline/readline.h ${STAGING_INCDIR}/guile-readline/
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 0644 guile-config/guile.m4 ${STAGING_DATADIR}/aclocal
+	
+	install -d ${STAGING_DATADIR}/guile/1.8
+        cp -pPr  ${S}/ice-9 ${STAGING_DATADIR}/guile/1.8/
+	
+	oe_libinstall -C guile-readline -so -a libguilereadline-v-17 ${STAGING_LIBDIR}
+	oe_libinstall -C libguile -so -a libguile ${STAGING_LIBDIR}
+}
-- 
cgit v1.2.3


From 9e59a4d34711a3c8e1f673ccb10dea0445e1a74b Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 27 Jul 2007 21:49:38 +0000
Subject: gnuradio: enable usrp and package its lib seperately

---
 packages/gnuradio/gnuradio/no-trellis-doc.patch | 11 +++++++++++
 packages/gnuradio/gnuradio_svn.bb               | 26 ++++++++++++++++++-------
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/packages/gnuradio/gnuradio/no-trellis-doc.patch b/packages/gnuradio/gnuradio/no-trellis-doc.patch
index 1e5148d3f9..039aed9c8e 100644
--- a/packages/gnuradio/gnuradio/no-trellis-doc.patch
+++ b/packages/gnuradio/gnuradio/no-trellis-doc.patch
@@ -7,3 +7,14 @@
 -SUBDIRS = src doc
 +SUBDIRS = src
  
+--- /tmp/Makefile.am	2007-07-27 19:18:00.000000000 +0200
++++ trunk/usrp/Makefile.am	2007-07-27 19:18:20.995215000 +0200
+@@ -20,7 +20,7 @@
+ # 
+ 
+ EXTRA_DIST = usrp.pc.in usrp.iss.in usrp.inf
+-SUBDIRS = host firmware fpga doc
++SUBDIRS = host firmware fpga 
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = usrp.pc
diff --git a/packages/gnuradio/gnuradio_svn.bb b/packages/gnuradio/gnuradio_svn.bb
index 30fe6ba916..a773a36321 100644
--- a/packages/gnuradio/gnuradio_svn.bb
+++ b/packages/gnuradio/gnuradio_svn.bb
@@ -2,13 +2,12 @@ DESCRIPTION = "GNU Radio"
 SECTION =  "apps"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "fftwf python boost cppunit sdcc-native swig swig-native"
+DEPENDS = " guile-native fftwf python libusb virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native"
 
-RDEPENDS_${PN} = "python-core python-audio python-codecs python-lang python-textutils swig"
+RDEPENDS_${PN} = "python-core python-audio python-codecs python-lang python-textutils"
 
 PV = "3.0.4+svn${SRCDATE}"
-PR = "r1"
-
+PR = "r2"
 
 SRC_URI = "svn://gnuradio.org/svn/gnuradio;module=trunk;proto=http \
 	   file://no-trellis-doc.patch;patch=1 \
@@ -23,9 +22,22 @@ CXXFLAGS_powerpc += "-lstdc++"
 export BUILD_SYS := "${BUILD_SYS}"
 export HOST_SYS := "${HOST_SYS}"
 
-EXTRA_OECONF = "--disable-gr-atsc --disable-gr-video-sdl"
-
-PACKAGES =+ "libgromnithread libgnuradio-core libgnuradio-core-qa"
+EXTRA_OECONF = " \
+                --disable-gr-atsc \
+		--enable-gr-video-sdl \
+		--enable-gr-audio-alsa  \
+                --enable-gr-audio-jack \
+                --enable-gr-audio-oss \
+                --enable-mblock \
+	        "
+
+do_configure_append() {
+        find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
+}
+
+PACKAGES =+ "libusrp libusrp-inband libgromnithread libgnuradio-core libgnuradio-core-qa"
+FILES_libusrp = "${libdir}/libusrp.so.*"
+FILES_libusrp-inband = "${libdir}/libusrp_inband.so.*"
 FILES_libgnuradio-core = "${libdir}/libgnuradio-core.so.*"
 FILES_libgnuradio-core-qa = "${libdir}/libgnuradio-core-qa.so.*"
 FILES_libgromnithread = "${libdir}/libgromnithread.so*"
-- 
cgit v1.2.3


From 1a78c97ede586276544211916b44d8467e60c3bf Mon Sep 17 00:00:00 2001
From: Sergey Lapin <slapinid@gmail.com>
Date: Fri, 27 Jul 2007 21:53:07 +0000
Subject: opie-taskbar-images: Added Opie backgrounds for devices with 320x320
 screen.

---
 packages/opie-taskbar/opie-taskbar-images.inc           |  10 ++++++----
 .../opie-taskbar/opie-taskbar-images/.mtn2git_empty     |   0
 .../opie-taskbar-images/firstuse-320x320.jpg            | Bin 0 -> 16113 bytes
 .../opie-taskbar-images/opie-background-320x320.jpg     | Bin 0 -> 7807 bytes
 packages/opie-taskbar/opie-taskbar-images_1.2.3.bb      |   2 +-
 packages/opie-taskbar/opie-taskbar-images_cvs.bb        |   2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 packages/opie-taskbar/opie-taskbar-images/.mtn2git_empty
 create mode 100644 packages/opie-taskbar/opie-taskbar-images/firstuse-320x320.jpg
 create mode 100644 packages/opie-taskbar/opie-taskbar-images/opie-background-320x320.jpg

diff --git a/packages/opie-taskbar/opie-taskbar-images.inc b/packages/opie-taskbar/opie-taskbar-images.inc
index 576220d2f0..769b5ff2c0 100644
--- a/packages/opie-taskbar/opie-taskbar-images.inc
+++ b/packages/opie-taskbar/opie-taskbar-images.inc
@@ -18,18 +18,20 @@ PIXMAP_SIZE_asus730     = "-480x640"
 PIXMAP_SIZE_htcuniversal= "-480x640"
 PIXMAP_SIZE_hx4700      = "-480x640"
 
-PACKAGES = "${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-600x800 ${PN}-320x240 ${PN}-240x320"
+PACKAGES = "${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-600x800 ${PN}-320x240 ${PN}-240x320 ${PN}-320x320"
 
 do_install() {
 	install -d ${D}${palmtopdir}/pics/launcher
-
+	
+	install -m 0644 ${FILESDIR}/firstuse-320x320.jpg ${D}${palmtopdir}/pics/launcher/firstuse-320x320.jpg
+	install -m 0644 ${FILESDIR}/opie-background-320x320.jpg ${D}${palmtopdir}/pics/launcher/opie-background-320x320.jpg
 	install -m 0644 ${WORKDIR}/pics/launcher/firstuse.jpg ${D}${palmtopdir}/pics/launcher/firstuse-240x320.jpg
 	install -m 0644 ${WORKDIR}/pics/launcher/opie-background.jpg ${D}${palmtopdir}/pics/launcher/opie-background-240x320.jpg
 	# TODO: those should be correct images for the resolution:
 	install -m 0644 ${WORKDIR}/pics/launcher/firstuse.jpg ${D}${palmtopdir}/pics/launcher/firstuse-320x240.jpg
 	install -m 0644 ${WORKDIR}/pics/launcher/opie-background.jpg ${D}${palmtopdir}/pics/launcher/opie-background-320x240.jpg
 
-        for res in 480x640 640x480 800x600 ; do
+        for res in 480x640 640x480 800x600; do
          install -m 0644 ${WORKDIR}/pics/launcher/firstuse-${res}.jpg ${D}${palmtopdir}/pics/launcher/firstuse-${res}.jpg
          install -m 0644 ${WORKDIR}/pics/launcher/opie-background-${res}.jpg ${D}${palmtopdir}/pics/launcher/opie-background-${res}.jpg
         done
@@ -39,7 +41,7 @@ do_install() {
 }
 
 python do_package_prepend () {
-        reslist = ['240x320','320x240', '480x640','640x480', '800x600','600x800']
+        reslist = ['240x320','320x240', '320x320', '480x640','640x480', '800x600','600x800']
         dir = bb.data.expand('${palmtopdir}/pics/launcher/', d)
         ft = bb.data.expand('${palmtopdir}/pics/*/*-%s.*', d)
         pn = bb.data.getVar('PN', d, 1)
diff --git a/packages/opie-taskbar/opie-taskbar-images/.mtn2git_empty b/packages/opie-taskbar/opie-taskbar-images/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/opie-taskbar/opie-taskbar-images/firstuse-320x320.jpg b/packages/opie-taskbar/opie-taskbar-images/firstuse-320x320.jpg
new file mode 100644
index 0000000000..67523f1291
Binary files /dev/null and b/packages/opie-taskbar/opie-taskbar-images/firstuse-320x320.jpg differ
diff --git a/packages/opie-taskbar/opie-taskbar-images/opie-background-320x320.jpg b/packages/opie-taskbar/opie-taskbar-images/opie-background-320x320.jpg
new file mode 100644
index 0000000000..194816f1e1
Binary files /dev/null and b/packages/opie-taskbar/opie-taskbar-images/opie-background-320x320.jpg differ
diff --git a/packages/opie-taskbar/opie-taskbar-images_1.2.3.bb b/packages/opie-taskbar/opie-taskbar-images_1.2.3.bb
index 85bf14375c..0c5b93780d 100644
--- a/packages/opie-taskbar/opie-taskbar-images_1.2.3.bb
+++ b/packages/opie-taskbar/opie-taskbar-images_1.2.3.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-PR = "r0"
+PR = "r1"
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
 
diff --git a/packages/opie-taskbar/opie-taskbar-images_cvs.bb b/packages/opie-taskbar/opie-taskbar-images_cvs.bb
index 33588d9e12..ff7ea9e17b 100644
--- a/packages/opie-taskbar/opie-taskbar-images_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar-images_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 PV = "${OPIE_CVS_PV}"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/pics"
-- 
cgit v1.2.3


From 2a84ad5c196c6a0dc3ba43c89624bc45d0d06dd3 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 28 Jul 2007 08:09:17 +0000
Subject: gnuradio: packaging fixes: * package all libs seperately * make the
 usrp python stuff have its own package * add 3.0.4 tarball release * create a
 .inc for common stuff

---
 packages/gnuradio/gnuradio.inc      | 60 +++++++++++++++++++++++++++++++++++++
 packages/gnuradio/gnuradio_3.0.4.bb |  8 +++++
 packages/gnuradio/gnuradio_svn.bb   | 40 ++-----------------------
 3 files changed, 70 insertions(+), 38 deletions(-)
 create mode 100644 packages/gnuradio/gnuradio.inc
 create mode 100644 packages/gnuradio/gnuradio_3.0.4.bb

diff --git a/packages/gnuradio/gnuradio.inc b/packages/gnuradio/gnuradio.inc
new file mode 100644
index 0000000000..fff5331ce0
--- /dev/null
+++ b/packages/gnuradio/gnuradio.inc
@@ -0,0 +1,60 @@
+DESCRIPTION = "GNU Radio"
+SECTION =  "apps"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = " guile-native fftwf python libusb virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native"
+
+RDEPENDS_${PN} = "python-core python-audio python-codecs python-lang python-textutils"
+
+inherit autotools pkgconfig
+
+CXXFLAGS_powerpc += "-lstdc++"
+
+export BUILD_SYS := "${BUILD_SYS}"
+export HOST_SYS := "${HOST_SYS}"
+
+EXTRA_OECONF = " \
+                --disable-gr-atsc \
+		--enable-gr-video-sdl \
+		--enable-gr-audio-alsa  \
+                --enable-gr-audio-jack \
+                --enable-gr-audio-oss \
+                --enable-mblock \
+	        "
+
+do_configure_append() {
+        find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
+}
+
+PACKAGES =+ "libpmt libpmt-qa \
+             libmblock libmblock-qa \
+	     libgr-audio-alsa \
+	     libusrp libusrp-inband libusrp-inband-qa \
+	     libgromnithread \
+	     libgnuradio-core libgnuradio-core-qa \
+	     gnuradio-usrp-dbg gnuradio-usrp"
+
+FILES_libpmt = "${libdir}/libpmt.so"
+FILES_libpmt-qa = "${libdir}/libpmt-qa.so"
+FILES_libmblock = "${libdir}/libmblock.so"
+FILES_libmblock-qa = "${libdir}/libmblock-qa.so"
+FILES_libgr-audio-alsa = "${libdir}/libgr_audio_alsa.so"
+
+FILES_libusrp = "${libdir}/libusrp.so.*"
+FILES_libusrp-inband = "${libdir}/libusrp_inband.so.*"
+FILES_libusrp-inband-qa = "${libdir}/libusrp_inband-qa.so"
+FILES_libgnuradio-core = "${libdir}/libgnuradio-core.so.*"
+FILES_libgnuradio-core-qa = "${libdir}/libgnuradio-core-qa.so.*"
+FILES_libgromnithread = "${libdir}/libgromnithread.so*"
+
+FILES_${PN} += "${libdir}/python*/site-packages/gnuradio/*"
+FILES_${PN}-dbg += "${libdir}/python*/site-packages/gnuradio/.debug \
+                   ${libdir}/python*/site-packages/gnuradio/*/.debug \
+		   "
+
+FILES_gnuradio-usrp = "${libdir}/python*/site-packages/usrpm/* \
+                       ${datadir}/usrp""
+FILES_gnuradio-usrp-dbg = ${libdir}/python*/site-packages/usrpm/.debug"
+
+
+
diff --git a/packages/gnuradio/gnuradio_3.0.4.bb b/packages/gnuradio/gnuradio_3.0.4.bb
new file mode 100644
index 0000000000..30a6d0ab5e
--- /dev/null
+++ b/packages/gnuradio/gnuradio_3.0.4.bb
@@ -0,0 +1,8 @@
+require gnuradio.inc
+
+PR = "r0"
+
+SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-${PV}.tar.gz \
+	   file://no-trellis-doc.patch;patch=1 \
+	   "
+
diff --git a/packages/gnuradio/gnuradio_svn.bb b/packages/gnuradio/gnuradio_svn.bb
index a773a36321..e40d151acb 100644
--- a/packages/gnuradio/gnuradio_svn.bb
+++ b/packages/gnuradio/gnuradio_svn.bb
@@ -1,10 +1,6 @@
-DESCRIPTION = "GNU Radio"
-SECTION =  "apps"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = " guile-native fftwf python libusb virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native"
+require gnuradio.inc
 
-RDEPENDS_${PN} = "python-core python-audio python-codecs python-lang python-textutils"
+DEFAULT_PREFERENCE = "-1"
 
 PV = "3.0.4+svn${SRCDATE}"
 PR = "r2"
@@ -13,38 +9,6 @@ SRC_URI = "svn://gnuradio.org/svn/gnuradio;module=trunk;proto=http \
 	   file://no-trellis-doc.patch;patch=1 \
 	   "
 
-inherit autotools pkgconfig
-
 S="${WORKDIR}/trunk"
 
-CXXFLAGS_powerpc += "-lstdc++"
-
-export BUILD_SYS := "${BUILD_SYS}"
-export HOST_SYS := "${HOST_SYS}"
-
-EXTRA_OECONF = " \
-                --disable-gr-atsc \
-		--enable-gr-video-sdl \
-		--enable-gr-audio-alsa  \
-                --enable-gr-audio-jack \
-                --enable-gr-audio-oss \
-                --enable-mblock \
-	        "
-
-do_configure_append() {
-        find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
-}
-
-PACKAGES =+ "libusrp libusrp-inband libgromnithread libgnuradio-core libgnuradio-core-qa"
-FILES_libusrp = "${libdir}/libusrp.so.*"
-FILES_libusrp-inband = "${libdir}/libusrp_inband.so.*"
-FILES_libgnuradio-core = "${libdir}/libgnuradio-core.so.*"
-FILES_libgnuradio-core-qa = "${libdir}/libgnuradio-core-qa.so.*"
-FILES_libgromnithread = "${libdir}/libgromnithread.so*"
-
-FILES_${PN} += "${libdir}/python*/site-packages/gnuradio/*"
-FILES_${PN}-dbg += "${libdir}/python*/site-packages/gnuradio/.debug \
-                   ${libdir}/python*/site-packages/gnuradio/*/.debug \
-		   "
-
 
-- 
cgit v1.2.3


From 8112a34e6415059b234b13f25c483d25e34f0353 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 28 Jul 2007 09:10:58 +0000
Subject: gnuradio: gnuradio-usrp also needs python-core

---
 packages/gnuradio/gnuradio.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/gnuradio/gnuradio.inc b/packages/gnuradio/gnuradio.inc
index fff5331ce0..b5642deb09 100644
--- a/packages/gnuradio/gnuradio.inc
+++ b/packages/gnuradio/gnuradio.inc
@@ -5,6 +5,7 @@ LICENSE = "GPL"
 DEPENDS = " guile-native fftwf python libusb virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native"
 
 RDEPENDS_${PN} = "python-core python-audio python-codecs python-lang python-textutils"
+RDEPENDS_gnuradio-usrp = "python-core"
 
 inherit autotools pkgconfig
 
-- 
cgit v1.2.3


From ce8dcb72b5ce2368d9f34fe661c16da8b894c425 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 28 Jul 2007 10:06:24 +0000
Subject: xserver-kdrive 1.2.0: bump PR to get Xw100 rebuilt against a more
 recent xrandr

---
 packages/xorg-xserver/xserver-kdrive_1.2.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb
index fb6bde07e8..a51ece76cf 100644
--- a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb
@@ -3,7 +3,7 @@ require xserver-kdrive-common.inc
 DEPENDS += "libxkbfile libxcalibrate"
 
 PE = "1"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
-- 
cgit v1.2.3


From da2c653f899b4fcc10e2aeda1f7cb7a231f808ab Mon Sep 17 00:00:00 2001
From: Michael Krelin <hacker@klever.net>
Date: Sat, 28 Jul 2007 10:42:11 +0000
Subject: opie-reader: unicode patch went upstream. Close #2694

---
 packages/opie-reader/files/opie-reader-unicode-copy.patch | 11 -----------
 packages/opie-reader/opie-reader_1.2.3.bb                 |  5 ++---
 packages/opie-reader/opie-reader_cvs.bb                   |  5 ++---
 3 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 packages/opie-reader/files/opie-reader-unicode-copy.patch

diff --git a/packages/opie-reader/files/opie-reader-unicode-copy.patch b/packages/opie-reader/files/opie-reader-unicode-copy.patch
deleted file mode 100644
index d7d1ae24bd..0000000000
--- a/packages/opie-reader/files/opie-reader-unicode-copy.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- opie-reader/QTReaderApp.cpp.orig	2005-05-18 00:48:25.000000000 +0200
-+++ opie-reader/QTReaderApp.cpp	2006-04-08 15:55:43.000000000 +0200
-@@ -2558,7 +2558,7 @@
- 	reader->jumpto(m_savedpos);
- 	while (reader->explocate() < endpos && (ch = reader->getch()) != UEOF)
- 	{
--	    text += ch;
-+	    text += QChar(ch);
- 	}
- 	cb->setText(text);
- 	reader->locate(currentpos);
diff --git a/packages/opie-reader/opie-reader_1.2.3.bb b/packages/opie-reader/opie-reader_1.2.3.bb
index e1ec40d831..43632416c5 100644
--- a/packages/opie-reader/opie-reader_1.2.3.bb
+++ b/packages/opie-reader/opie-reader_1.2.3.bb
@@ -1,9 +1,8 @@
 require ${PN}.inc
 
-PR = r1
+PR = r2
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-reader \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
-	   file://opie-reader-unicode-copy.patch;patch=1"
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
 
diff --git a/packages/opie-reader/opie-reader_cvs.bb b/packages/opie-reader/opie-reader_cvs.bb
index 82b3547ae1..36c8c06157 100644
--- a/packages/opie-reader/opie-reader_cvs.bb
+++ b/packages/opie-reader/opie-reader_cvs.bb
@@ -1,10 +1,9 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = r1
+PR = r2
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-reader \
            ${HANDHELDS_CVS};module=opie/pics \
-           ${HANDHELDS_CVS};module=opie/apps \
-	   file://opie-reader-unicode-copy.patch;patch=1"
+           ${HANDHELDS_CVS};module=opie/apps"
 
-- 
cgit v1.2.3


From 14b8cf01f0745d97ad21d17f979b469dfcc3bbc4 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 28 Jul 2007 12:09:24 +0000
Subject: gtk 2.10.14: add some patches from poky to have some widgets behave
 better on high-dpi screens

---
 packages/gtk+/gtk+-2.10.14/combo-arrow-size.patch  |  67 ++++++++++++++
 packages/gtk+/gtk+-2.10.14/range-no-redraw.patch   |  41 +++++++++
 .../gtk+/gtk+-2.10.14/scrolled-placement.patch     |  35 ++++++++
 packages/gtk+/gtk+-2.10.14/toggle-font.diff        | 100 +++++++++++++++++++++
 packages/gtk+/gtk+_2.10.14.bb                      |   8 +-
 5 files changed, 249 insertions(+), 2 deletions(-)
 create mode 100644 packages/gtk+/gtk+-2.10.14/combo-arrow-size.patch
 create mode 100644 packages/gtk+/gtk+-2.10.14/range-no-redraw.patch
 create mode 100644 packages/gtk+/gtk+-2.10.14/scrolled-placement.patch
 create mode 100644 packages/gtk+/gtk+-2.10.14/toggle-font.diff

diff --git a/packages/gtk+/gtk+-2.10.14/combo-arrow-size.patch b/packages/gtk+/gtk+-2.10.14/combo-arrow-size.patch
new file mode 100644
index 0000000000..d44c454ce3
--- /dev/null
+++ b/packages/gtk+/gtk+-2.10.14/combo-arrow-size.patch
@@ -0,0 +1,67 @@
+Index: gtk/gtkcombobox.c
+===================================================================
+RCS file: /cvs/gnome/gtk+/gtk/gtkcombobox.c,v
+retrieving revision 1.185
+diff -u -p -r1.185 gtkcombobox.c
+--- gtk/gtkcombobox.c	12 Oct 2006 13:48:07 -0000	1.185
++++ gtk/gtkcombobox.c	1 Nov 2006 19:01:09 -0000
+@@ -756,6 +756,25 @@ gtk_combo_box_class_init (GtkComboBoxCla
+                                                                  FALSE,
+                                                                  GTK_PARAM_READABLE));
+ 
++  /**
++   * GtkComboBox:arrow-size:
++   *
++   * Sets the minimum size of the arrow in the combo box.  Note
++   * that the arrow size is coupled to the font size, so in case
++   * a larger font is used, the arrow will be larger than set
++   * by arrow size.
++   *
++   * Since: 2.12
++   */
++  gtk_widget_class_install_style_property (widget_class,
++					   g_param_spec_int ("arrow-size",
++							     P_("Arrow Size"),
++							     P_("The minimum size of the arrow in the combo box"),
++							     0,
++							     G_MAXINT,
++							     15,
++							     GTK_PARAM_READABLE));
++
+   g_type_class_add_private (object_class, sizeof (GtkComboBoxPrivate));
+ }
+ 
+@@ -1897,7 +1916,12 @@ gtk_combo_box_size_request (GtkWidget   
+ {
+   gint width, height;
+   gint focus_width, focus_pad;
++  gint font_size;
++  gint arrow_size;
+   GtkRequisition bin_req;
++  PangoContext *context;
++  PangoFontMetrics *metrics;
++  PangoFontDescription *font_desc;
+ 
+   GtkComboBox *combo_box = GTK_COMBO_BOX (widget);
+  
+@@ -1910,7 +1934,20 @@ gtk_combo_box_size_request (GtkWidget   
+   gtk_widget_style_get (GTK_WIDGET (widget),
+ 			"focus-line-width", &focus_width,
+ 			"focus-padding", &focus_pad,
++			"arrow-size", &arrow_size,
+ 			NULL);
++
++  font_desc = GTK_BIN (widget)->child->style->font_desc;
++  context = gtk_widget_get_pango_context (widget);
++  metrics = pango_context_get_metrics (context, font_desc,
++				       pango_context_get_language (context));
++  font_size = PANGO_PIXELS (pango_font_metrics_get_ascent (metrics) +
++			    pango_font_metrics_get_descent (metrics));
++  pango_font_metrics_unref (metrics);
++
++  arrow_size = MAX (arrow_size, font_size);
++
++  gtk_widget_set_size_request (combo_box->priv->arrow, arrow_size, arrow_size);
+ 
+   if (!combo_box->priv->tree_view)
+     {
diff --git a/packages/gtk+/gtk+-2.10.14/range-no-redraw.patch b/packages/gtk+/gtk+-2.10.14/range-no-redraw.patch
new file mode 100644
index 0000000000..e3603d7700
--- /dev/null
+++ b/packages/gtk+/gtk+-2.10.14/range-no-redraw.patch
@@ -0,0 +1,41 @@
+Index: gtk/gtkrange.c
+===================================================================
+--- gtk/gtkrange.c	(revision 18523)
++++ gtk/gtkrange.c	(working copy)
+@@ -99,6 +99,8 @@
+ 
+   GtkSensitivityType lower_sensitivity;
+   GtkSensitivityType upper_sensitivity;
++
++  guint motion_idle;
+ };
+ 
+ 
+@@ -1721,6 +1723,16 @@
+                  &handled);
+ }
+ 
++static gboolean
++update_slider_position_idle (GtkRange *range)
++{
++  update_slider_position (range, range->layout->mouse_x,range->layout->mouse_y); 
++
++  range->layout->motion_idle = 0;
++
++  return FALSE;
++}
++
+ static void 
+ stop_scrolling (GtkRange *range)
+ {
+@@ -1860,8 +1872,8 @@
+   if (gtk_range_update_mouse_location (range))
+     gtk_widget_queue_draw (widget);
+ 
+-  if (range->layout->grab_location == MOUSE_SLIDER)
+-    update_slider_position (range, x, y);
++  if (range->layout->grab_location == MOUSE_SLIDER && !range->layout->motion_idle)
++    range->layout->motion_idle = g_idle_add ((GSourceFunc)update_slider_position_idle, range);
+ 
+   /* We handled the event if the mouse was in the range_rect */
+   return range->layout->mouse_location != MOUSE_OUTSIDE;
diff --git a/packages/gtk+/gtk+-2.10.14/scrolled-placement.patch b/packages/gtk+/gtk+-2.10.14/scrolled-placement.patch
new file mode 100644
index 0000000000..09ded531ea
--- /dev/null
+++ b/packages/gtk+/gtk+-2.10.14/scrolled-placement.patch
@@ -0,0 +1,35 @@
+Index: gtk/gtkscrolledwindow.c
+===================================================================
+--- gtk/gtkscrolledwindow.c	(revision 18493)
++++ gtk/gtkscrolledwindow.c	(working copy)
+@@ -885,7 +885,7 @@
+   if (GTK_IS_SCROLLED_WINDOW (widget))
+     {
+       gtk_scrolled_window_update_real_placement (GTK_SCROLLED_WINDOW (widget));
+-      gtk_widget_queue_draw (widget);
++      gtk_widget_queue_resize (widget);
+     }
+   else if (GTK_IS_CONTAINER (widget))
+     gtk_container_forall (GTK_CONTAINER (widget), traverse_container, NULL);
+Index: gdk/x11/gdksettings.c
+===================================================================
+--- gdk/x11/gdksettings.c	(revision 18493)
++++ gdk/x11/gdksettings.c	(working copy)
+@@ -65,7 +65,8 @@
+   "Xft/RGBA\0"                "gtk-xft-rgba\0"
+   "Xft/DPI\0"                 "gtk-xft-dpi\0"
+   "Net/FallbackIconTheme\0"   "gtk-fallback-icon-theme\0"
+-  "Gtk/TouchscreenMode\0"     "gtk-touchscreen-mode\0";
++  "Gtk/TouchscreenMode\0"     "gtk-touchscreen-mode\0"
++  "Gtk/ScrolledWindowPlacement\0" "gtk-scrolled-window-placement\0";
+ 
+ static const struct
+ {
+@@ -107,5 +108,6 @@
+   { 1197, 1206 },
+   { 1219, 1227 },
+   { 1239, 1261 },
+-  { 1285, 1305 }
++  { 1285, 1305 },
++  { 1326, 1354 }
+ };
diff --git a/packages/gtk+/gtk+-2.10.14/toggle-font.diff b/packages/gtk+/gtk+-2.10.14/toggle-font.diff
new file mode 100644
index 0000000000..928da72430
--- /dev/null
+++ b/packages/gtk+/gtk+-2.10.14/toggle-font.diff
@@ -0,0 +1,100 @@
+Index: gtk/gtkcellrenderertoggle.c
+===================================================================
+--- gtk/gtkcellrenderertoggle.c	(revision 18523)
++++ gtk/gtkcellrenderertoggle.c	(working copy)
+@@ -71,6 +71,8 @@
+   PROP_INDICATOR_SIZE
+ };
+ 
++/* This is a hard-coded default which promptly gets overridden by a size
++   calculated from the font size. */
+ #define TOGGLE_WIDTH 12
+ 
+ static guint toggle_cell_signals[LAST_SIGNAL] = { 0 };
+@@ -80,8 +82,9 @@
+ typedef struct _GtkCellRendererTogglePrivate GtkCellRendererTogglePrivate;
+ struct _GtkCellRendererTogglePrivate
+ {
+-  gint indicator_size;
+-
++  gint indicator_size; /* This is the real size */
++  gint override_size; /* This is the size set from the indicator-size property */
++  GtkWidget *cached_widget;
+   guint inconsistent : 1;
+ };
+ 
+@@ -104,6 +107,7 @@
+   GTK_CELL_RENDERER (celltoggle)->ypad = 2;
+ 
+   priv->indicator_size = TOGGLE_WIDTH;
++  priv->override_size = 0;
+   priv->inconsistent = FALSE;
+ }
+ 
+@@ -210,7 +214,7 @@
+       g_value_set_boolean (value, celltoggle->radio);
+       break;
+     case PROP_INDICATOR_SIZE:
+-      g_value_set_int (value, priv->indicator_size);
++      g_value_set_int (value, priv->override_size ? priv->override_size : priv->indicator_size);
+       break;
+     default:
+       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+@@ -245,7 +249,7 @@
+       celltoggle->radio = g_value_get_boolean (value);
+       break;
+     case PROP_INDICATOR_SIZE:
+-      priv->indicator_size = g_value_get_int (value);
++      priv->override_size = g_value_get_int (value);
+       break;
+     default:
+       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+@@ -273,6 +277,27 @@
+ }
+ 
+ static void
++on_widget_style_set (GtkWidget *widget, GtkStyle *previous, gpointer user_data)
++{
++  GtkCellRendererTogglePrivate *priv = user_data;
++  PangoContext *context;
++  PangoFontMetrics *metrics;
++  int height;
++  
++  context = gtk_widget_get_pango_context (widget);
++  metrics = pango_context_get_metrics (context,
++                                       widget->style->font_desc,
++                                       pango_context_get_language (context));
++
++  height = pango_font_metrics_get_ascent (metrics) +
++    pango_font_metrics_get_descent (metrics);
++  
++  pango_font_metrics_unref (metrics);
++  
++  priv->indicator_size = PANGO_PIXELS (height * 0.85);
++}
++
++static void
+ gtk_cell_renderer_toggle_get_size (GtkCellRenderer *cell,
+ 				   GtkWidget       *widget,
+ 				   GdkRectangle    *cell_area,
+@@ -287,6 +312,20 @@
+ 
+   priv = GTK_CELL_RENDERER_TOGGLE_GET_PRIVATE (cell);
+ 
++  if (priv->override_size) {
++    priv->indicator_size = priv->override_size;
++  } else if (priv->cached_widget != widget) {
++    if (priv->cached_widget) {
++      g_object_remove_weak_pointer (widget, &priv->cached_widget);
++      g_signal_handlers_disconnect_by_func (priv->cached_widget, on_widget_style_set, priv);
++    }
++    priv->cached_widget = widget;
++    g_object_add_weak_pointer (widget, &priv->cached_widget);
++    g_signal_connect (widget, "style-set", on_widget_style_set, priv);
++    
++    on_widget_style_set (widget, NULL, priv);
++  }
++
+   calc_width = (gint) cell->xpad * 2 + priv->indicator_size;
+   calc_height = (gint) cell->ypad * 2 + priv->indicator_size;
+ 
diff --git a/packages/gtk+/gtk+_2.10.14.bb b/packages/gtk+/gtk+_2.10.14.bb
index 4e85db45af..3aaa0d6bec 100644
--- a/packages/gtk+/gtk+_2.10.14.bb
+++ b/packages/gtk+/gtk+_2.10.14.bb
@@ -1,6 +1,6 @@
 require gtk-2.10.inc
 
-PR = "r0"
+PR = "r1"
 
 # disable per default - untested and not all patches included.
 DEFAULT_PREFERENCE = "-1"
@@ -22,7 +22,11 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
            file://spinbutton.patch;patch=1 \
            file://gtk+-handhelds.patch;patch=1 \
            file://filesel-fix-segfault.patch;patch=1 \
-	   "
+           file://toggle-font.diff;patch=1;pnum=0 \
+           file://combo-arrow-size.patch;patch=1;pnum=0 \
+           file://range-no-redraw.patch;patch=1;pnum=0 \
+           file://scrolled-placement.patch;patch=1;pnum=0 \
+           "
 
 #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
 require gtk-fpu.inc
-- 
cgit v1.2.3


From 4a8afd1f3dcc280356b8f239b141e86a9f5bf9f1 Mon Sep 17 00:00:00 2001
From: Michael Krelin <hacker@klever.net>
Date: Sat, 28 Jul 2007 12:35:25 +0000
Subject: preferred-opie-versions-1.2.3: bump preferred konqueror version.
 Closes #2696

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

diff --git a/conf/distro/include/preferred-opie-versions-1.2.3.inc b/conf/distro/include/preferred-opie-versions-1.2.3.inc
index da946d4784..1f39916f4f 100644
--- a/conf/distro/include/preferred-opie-versions-1.2.3.inc
+++ b/conf/distro/include/preferred-opie-versions-1.2.3.inc
@@ -208,4 +208,4 @@ PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}"
-PREFERRED_VERSION_konqueror-embedded = "20060404"
+PREFERRED_VERSION_konqueror-embedded = "20070212"
-- 
cgit v1.2.3


From 95e40a54837b7616ee30424e144ab9e11671c1f0 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 28 Jul 2007 15:27:52 +0000
Subject: jack: add -ldl, needed for some archs

---
 packages/jack/jack_0.103.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/jack/jack_0.103.0.bb b/packages/jack/jack_0.103.0.bb
index 9bb7c0f532..ccd6379447 100644
--- a/packages/jack/jack_0.103.0.bb
+++ b/packages/jack/jack_0.103.0.bb
@@ -18,7 +18,7 @@ EXTRA_OECONF = "--enable-timestamps --disable-capabilities --disable-oldtrans \
 		--disable-portaudio --disable-coreaudio --enable-oss --enable-alsa"
 
 EXTRA_OEMAKE = 'transform="s,^,,"'
-LDFLAGS_append = " -L${STAGING_LIBDIR}"
+LDFLAGS_append = " -ldl -L${STAGING_LIBDIR}"
 
 PACKAGES =+ "libjack jack-server jack-examples"
 
-- 
cgit v1.2.3


From 58cec64a24c24a460f187f2f714bccdcc251bc5c Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 28 Jul 2007 16:39:48 +0000
Subject: bluez-libs: update to 3.13

---
 packages/bluez/bluez-libs_3.13.bb | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 packages/bluez/bluez-libs_3.13.bb

diff --git a/packages/bluez/bluez-libs_3.13.bb b/packages/bluez/bluez-libs_3.13.bb
new file mode 100644
index 0000000000..6ddf62a4fb
--- /dev/null
+++ b/packages/bluez/bluez-libs_3.13.bb
@@ -0,0 +1 @@
+require bluez-libs.inc
-- 
cgit v1.2.3


From 6e074f2fc6e12cac7b6722b432f6a0b3757ac652 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 28 Jul 2007 16:40:12 +0000
Subject: bluez-utils: update to 3.13

---
 packages/bluez/bluez-utils_3.13.bb | 114 +++++++++++++++++++++++++++++++++++++
 1 file changed, 114 insertions(+)
 create mode 100644 packages/bluez/bluez-utils_3.13.bb

diff --git a/packages/bluez/bluez-utils_3.13.bb b/packages/bluez/bluez-utils_3.13.bb
new file mode 100644
index 0000000000..5ea1429641
--- /dev/null
+++ b/packages/bluez/bluez-utils_3.13.bb
@@ -0,0 +1,114 @@
+require bluez-utils.inc
+
+DEPENDS += "glib-2.0"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
+           file://hcid.conf \
+          "
+PR = "r0"
+
+EXTRA_OECONF = " \
+                 --enable-bccmd \
+		 --enable-hid2hci \
+                 --enable-alsa \ 
+		 --enable-cups \
+		 --enable-glib \
+		 --disable-sdpd \
+	         --enable-network \
+	         --enable-serial \
+	         --enable-input \
+	         --enable-audio \
+	         --enable-echo \
+                 --enable-configfile \
+	         --enable-initscripts \
+		 --enable-test \
+		" 
+
+# The config options are explained below:
+
+#  --enable-obex           enable OBEX support
+#  --enable-alsa           enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1
+#  --enable-cups           install CUPS backend support
+#  --enable-bccmd          install BCCMD interface utility
+#  --enable-avctrl         install Audio/Video control utility
+#  --enable-hid2hci        install HID mode switching utility
+#  --enable-dfutool        install DFU firmware upgrade utility
+
+#  --enable-glib           For systems that use and install GLib anyway
+#  --disable-sdpd          The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server
+
+#Following services can be enabled so far:
+#	--enable-network
+#	--enable-serial
+#	--enable-input
+#	--enable-audio
+#	--enable-echo
+
+#There is no need to modify any init script. They will be started
+#automatically or on demand. Only /etc/bluetooth/*.service files should
+#be patched to change name or the autostart value.
+#	--enable-configfile
+#	--enable-initscripts
+
+#For even smaller -doc packages
+#	--disable-manpages
+#	--disable-pcmciarules
+
+#I haven't seen any embedded device with HID proxy support. So simply
+#disable it:
+#	--disable-hid2hci
+
+
+PACKAGES =+ "${PN}-compat ${PN}-alsa"
+
+CONFFILES_${PN} = " \
+                   ${sysconfdir}/bluetooth/hcid.conf \
+                   ${sysconfdir}/default/bluetooth \
+                  "
+
+CONFFILES_${PN}-compat = " \
+                          ${sysconfdir}/bluetooth/rfcomm.conf \
+			 " 
+
+FILES_${PN} = " \
+               ${base_sbindir}/hcid \
+               ${libdir}/bluetooth \
+               ${sysconfdir}/init.d/bluetooth \
+               ${sysconfdir}/bluetooth/*.service \
+               ${sysconfdir}/bluetooth/hcid.conf \
+               ${sysconfdir}/default \
+               ${sysconfdir}/dbus-1 \
+	       ${base_sbindir}/hciattach \
+              "
+
+FILES_${PN}-dbg += " \
+                   ${libdir}/bluetooth/.debug \
+		   ${libdir}/cups/backend/.debug \
+		   ${libdir}/alsa-lib/.debug \
+		  " 
+
+FILES_${PN}-compat = " \
+                    ${base_bindir}/sdptool \
+                    ${base_bindir}/dund \
+		    ${base_bindir}/rctest \
+		    ${base_bindir}/ciptool \
+		    ${base_bindir}/l2test \
+		    ${base_bindir}/rfcomm \
+		    ${base_bindir}/hcitool \
+		    ${base_bindir}/pand \
+		    ${base_bindir}/hidd \
+		    ${base_bindir}/l2ping \
+		    ${base_sbindir}/hciconfig \
+                    ${base_sbindir}/bccmd \
+		    ${base_sbindir}/hciemu \
+		    ${base_sbindir}/hid2hci \
+		    ${base_bindir}/passkey-agent \
+		    ${sysconfdir}/bluetooth/rfcomm.conf \
+		   " 
+
+FILES_${PN}-alsa = "${libdir}/alsa-lib/libasound*"
+
+FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth"
+RDEPENDS_bluez-cups-backend = "cups"
+
+
-- 
cgit v1.2.3


From 3ee793af2816e0ba05b1b51f17639deeda7dbe1e Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 28 Jul 2007 16:40:40 +0000
Subject: bluez-hcidump: update to 1.38

---
 packages/bluez/bluez-hcidump_1.38.bb | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 packages/bluez/bluez-hcidump_1.38.bb

diff --git a/packages/bluez/bluez-hcidump_1.38.bb b/packages/bluez/bluez-hcidump_1.38.bb
new file mode 100644
index 0000000000..877c8db33c
--- /dev/null
+++ b/packages/bluez/bluez-hcidump_1.38.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool."
+SECTION = "console"
+PRIORITY = "optional"
+DEPENDS = "bluez-libs"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz"
+S = "${WORKDIR}/bluez-hcidump-${PV}"
+
+EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
+
+inherit autotools
-- 
cgit v1.2.3


From 2e88065a351d225db870574fd67a85a1df132751 Mon Sep 17 00:00:00 2001
From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Sat, 28 Jul 2007 16:48:02 +0000
Subject: -introduce new recipes for classpath-minimal -classpath-minimal now
 at 0.95 -seperate install location so no confusion with normal-classpath
 -chosse a sane glibj.zip-location, but we have no java policy yet -provide no
 packages, because it is only for building java virtual machines -second step
 to get MIDP2 support in OE

---
 .../classpath/classpath-minimal-native_0.95.bb     |  8 +++++
 packages/classpath/classpath-minimal.inc           | 39 ++++++++++++++++++++++
 packages/classpath/classpath-minimal_0.95.bb       |  5 +++
 3 files changed, 52 insertions(+)
 create mode 100644 packages/classpath/classpath-minimal-native_0.95.bb
 create mode 100644 packages/classpath/classpath-minimal.inc
 create mode 100644 packages/classpath/classpath-minimal_0.95.bb

diff --git a/packages/classpath/classpath-minimal-native_0.95.bb b/packages/classpath/classpath-minimal-native_0.95.bb
new file mode 100644
index 0000000000..c7716ed639
--- /dev/null
+++ b/packages/classpath/classpath-minimal-native_0.95.bb
@@ -0,0 +1,8 @@
+
+# classpath-minimal-native has no packages
+# primary goal is to speed up building of java virtual machines
+
+inherit native
+
+require classpath-minimal.inc
+
diff --git a/packages/classpath/classpath-minimal.inc b/packages/classpath/classpath-minimal.inc
new file mode 100644
index 0000000000..5a2587b56c
--- /dev/null
+++ b/packages/classpath/classpath-minimal.inc
@@ -0,0 +1,39 @@
+DESCRIPTION = "GNU Classpath standard Java libraries"
+HOMEPAGE = "http://www.gnu.org/software/classpath/"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "Classpath"
+PROVIDES = "classpath"
+RPROVIDES = "classpath"
+
+S = "${WORKDIR}/classpath-${PV}"
+
+SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
+
+DEPENDS = "ecj-native zip-native"
+
+inherit autotools
+
+
+EXTRA_OECONF = "--with-glibj \
+                --with-ecj=${STAGING_BINDIR_NATIVE}/ecj \
+                --disable-alsa \
+                --disable-gconf-peer \
+                --disable-gtk-peer \
+                --disable-plugin \
+                --disable-dssi \
+                --disable-examples \
+               "
+do_install() {
+        :
+}
+
+do_stage() {
+        install -d ${STAGING_INCDIR}/classpath-minimal/
+        install -m 0644 include/jni.h ${STAGING_INCDIR}/classpath-minimal/
+        install -m 0644 include/jni_md.h ${STAGING_INCDIR}/classpath-minimal/
+        install -d ${STAGING_LIBDIR}/java/classpath-minimal/
+        install -m 0644 lib/glibj.zip ${STAGING_LIBDIR}/java/classpath-minimal/
+}
+
+PACKAGES = " "
diff --git a/packages/classpath/classpath-minimal_0.95.bb b/packages/classpath/classpath-minimal_0.95.bb
new file mode 100644
index 0000000000..e489a4efc9
--- /dev/null
+++ b/packages/classpath/classpath-minimal_0.95.bb
@@ -0,0 +1,5 @@
+
+# classpath-minimal-native has no packages
+# primary goal is to speed up building of java virtual machines
+
+require classpath-minimal.inc
-- 
cgit v1.2.3


From ce284e43f66b60d67f0f326057345dd0bcc33a7d Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 28 Jul 2007 18:07:34 +0000
Subject: site: we all have /dev/random, so put it in common

---
 site/common | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/site/common b/site/common
index f73a36abed..565b053623 100644
--- a/site/common
+++ b/site/common
@@ -1,2 +1,4 @@
 # libelf
 mr_cv_target_elf=${mr_cv_target_elf=yes}
+
+ac_cv_file__dev_random=${ac_cv_file__dev_random=yes}
-- 
cgit v1.2.3


From 0a9f9fd784650d804b67c1f4c433f229741e9b6c Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 28 Jul 2007 18:11:21 +0000
Subject: gnome-keyring: update to 0.6.0

---
 packages/gnome/gnome-keyring_0.6.0.bb | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 packages/gnome/gnome-keyring_0.6.0.bb

diff --git a/packages/gnome/gnome-keyring_0.6.0.bb b/packages/gnome/gnome-keyring_0.6.0.bb
new file mode 100644
index 0000000000..dd6235263d
--- /dev/null
+++ b/packages/gnome/gnome-keyring_0.6.0.bb
@@ -0,0 +1,13 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome"
+
+inherit gnome
+
+DEPENDS = "gtk+"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+
+do_stage() {
+        autotools_stage_all
+}
-- 
cgit v1.2.3


From b4e0ee5f0f61d1ee977ee7129c6881bc7a7e4726 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 28 Jul 2007 18:28:16 +0000
Subject: gnome-desktop: add more DEPENDS

---
 packages/gnome/gnome-desktop_2.18.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/gnome/gnome-desktop_2.18.3.bb b/packages/gnome/gnome-desktop_2.18.3.bb
index 4d4b80efbc..02beafa044 100644
--- a/packages/gnome/gnome-desktop_2.18.3.bb
+++ b/packages/gnome/gnome-desktop_2.18.3.bb
@@ -4,7 +4,7 @@ PR = "r2"
 DESCRIPTION = "GNOME library for reading .desktop files"
 inherit gnome pkgconfig
 
-DEPENDS = "gnome-common gnome-doc-utils libgnomeui"
+DEPENDS = "gnome-common gnome-doc-utils gnome-vfs libgnomeui"
 
 SRC_URI += "file://scrollkeeper.patch;patch=1 \
             file://no-desktop-docs.patch;patch=1;pnum=0"
-- 
cgit v1.2.3


From 25e7d287d8307628e083822d656d671cd75d4961 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 28 Jul 2007 18:42:58 +0000
Subject: gnome-vfs: update to 2.18.1

---
 packages/gnome/gnome-vfs-2.18.1/.mtn2git_empty     |  0
 .../gnome/gnome-vfs-2.18.1/gconftool-lossage.patch | 11 +++++
 .../gnome-vfs-2.18.1/gnome-vfs-no-kerberos.patch   | 51 ++++++++++++++++++++++
 packages/gnome/gnome-vfs_2.18.1.bb                 | 38 ++++++++++++++++
 4 files changed, 100 insertions(+)
 create mode 100644 packages/gnome/gnome-vfs-2.18.1/.mtn2git_empty
 create mode 100644 packages/gnome/gnome-vfs-2.18.1/gconftool-lossage.patch
 create mode 100644 packages/gnome/gnome-vfs-2.18.1/gnome-vfs-no-kerberos.patch
 create mode 100644 packages/gnome/gnome-vfs_2.18.1.bb

diff --git a/packages/gnome/gnome-vfs-2.18.1/.mtn2git_empty b/packages/gnome/gnome-vfs-2.18.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/gnome/gnome-vfs-2.18.1/gconftool-lossage.patch b/packages/gnome/gnome-vfs-2.18.1/gconftool-lossage.patch
new file mode 100644
index 0000000000..3dbc130ddc
--- /dev/null
+++ b/packages/gnome/gnome-vfs-2.18.1/gconftool-lossage.patch
@@ -0,0 +1,11 @@
+--- gnome-vfs-2.6.0/configure.in~	2004-03-22 12:36:23.000000000 +0000
++++ gnome-vfs-2.6.0/configure.in	2004-06-07 16:04:34.000000000 +0100
+@@ -154,7 +154,7 @@
+ AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+ 
+ if test x"$GCONFTOOL" = xno; then
+-  AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
++  AC_MSG_WARN([gconftool-2 executable not found in your path - should be installed with GConf])
+ fi
+ 
+ AM_GCONF_SOURCE_2
diff --git a/packages/gnome/gnome-vfs-2.18.1/gnome-vfs-no-kerberos.patch b/packages/gnome/gnome-vfs-2.18.1/gnome-vfs-no-kerberos.patch
new file mode 100644
index 0000000000..e25ecdd66f
--- /dev/null
+++ b/packages/gnome/gnome-vfs-2.18.1/gnome-vfs-no-kerberos.patch
@@ -0,0 +1,51 @@
+removes kerberos completely to avoid conflicts with installed kerberos
+--- configure.in.orig	2007-01-05 19:42:26.418541610 +0200
++++ configure.in	2007-01-05 19:42:56.604261797 +0200
+@@ -436,47 +436,6 @@
+ ])
+ AM_CONDITIONAL(HAVE_CDDA, test $have_cdda = yes)
+ AC_SUBST(CDDA_LIBS)
+-
+-dnl GSSAPI
+-dnl Check for Kerberos installation
+-have_gssapi=no
+-AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin)
+-					   
+-if test "x$KRB5_CONFIG" != "xnone"; then
+-   GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`"
+-   GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`"
+-   
+-   saved_CPPFLAGS="$CPPFLAGS"
+-   saved_LIBS="$LIBS"
+-   LIBS="$LIBS $GSSAPI_LIBS"
+-   CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS"
+-   # MIT and Heimdal put gssapi.h in different places
+-   AC_CHECK_HEADERS(gssapi/gssapi.h gssapi.h, [
+-       AC_CHECK_FUNCS(gss_init_sec_context, [
+-           AC_MSG_NOTICE([GSSAPI authentication support enabled])
+-           AC_DEFINE(HAVE_GSSAPI, 1, [Define if GSSAPI support is enabled])
+-           AC_CHECK_HEADERS(gssapi/gssapi_generic.h)
+-		 have_gssapi=yes
+-	 
+-       # MIT Kerberos lacks GSS_C_NT_HOSTBASED_SERVICE
+-       AC_CHECK_DECL([GSS_C_NT_HOSTBASED_SERVICE],,
+-          [AC_DEFINE([GSS_C_NT_HOSTBASED_SERVICE], gss_nt_service_name, 
+-             [Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise])
+-		], [
+-		    #ifdef HAVE_GSSAPI_GSSAPI_H
+-		    #include <gssapi/gssapi.h>
+-		    #else	   
+-		    #include <gssapi.h>
+-		    #endif
+-		])
+-	  ])
+-     break
+-   ])
+-   LIBS="$saved_LIBS" 
+-   CPPFLAGS="$saved_CPPFLAGS" 
+-fi   
+-AC_SUBST(GSSAPI_LIBS)
+-AC_SUBST(GSSAPI_CFLAGS)
+ 	   
+ dnl ******************************
+ dnl http-method (neon checks)
diff --git a/packages/gnome/gnome-vfs_2.18.1.bb b/packages/gnome/gnome-vfs_2.18.1.bb
new file mode 100644
index 0000000000..4ae7406a46
--- /dev/null
+++ b/packages/gnome/gnome-vfs_2.18.1.bb
@@ -0,0 +1,38 @@
+LICENSE = "GPL"
+DEPENDS = "libxml2 gconf gnutls avahi dbus bzip2 gnome-mime-data zlib"
+RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info"
+
+PR = "r0"
+
+inherit gnome
+
+# This is to provide compatibility with the gnome-vfs DBus fork
+PROVIDES = "gnome-vfs-plugin-dbus"
+RREPLACES = "gnome-vfs-dbus"
+
+SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1 \
+	    file://gnome-vfs-no-kerberos.patch;patch=1;pnum=0"
+
+EXTRA_OECONF = " \
+		 --disable-openssl \
+		 --enable-gnutls \
+		 --enable-avahi \
+                 --with-samba-includes=${STAGING_INCDIR} \
+               "
+
+FILES_${PN} += " ${libdir}/vfs"
+FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include"
+FILES_${PN}-doc += " ${datadir}/gtk-doc"
+
+do_stage () {
+autotools_stage_all
+}
+
+PACKAGES_DYNAMIC = "gnome-vfs-plugin-*"
+
+python populate_packages_prepend () {
+	print bb.data.getVar('FILES_gnome-vfs', d, 1)
+
+	plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d)
+	do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s')
+}
-- 
cgit v1.2.3


From 0c5bd68a0aa61ffd98cae9e47f914e1066cfe44b Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 28 Jul 2007 18:56:26 +0000
Subject: pkgconfig.bbclass: more munging

---
 classes/pkgconfig.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass
index cd6e04731e..3256977517 100644
--- a/classes/pkgconfig.bbclass
+++ b/classes/pkgconfig.bbclass
@@ -24,7 +24,7 @@ def get_pkgconfig_mangle(d):
 
 do_install_append () {
         for pc in `find ${D} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do
-                sed -i ${@get_pkgconfig_mangle(d)} ${pc}
+                sed -i ${@get_pkgconfig_mangle(d)} -e 's:${D}::g' ${pc}
         done
 }
 
@@ -32,6 +32,6 @@ do_stage_append () {
 	for pc in `find ${S} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do
 		pcname=`basename $pc`
 		install -d ${PKG_CONFIG_PATH}
-		cat $pc | sed ${@get_pkgconfig_mangle(d)} > ${PKG_CONFIG_PATH}/$pcname
+		cat $pc | sed ${@get_pkgconfig_mangle(d)} -e 's:${D}${libdir}\S*:${STAGING_LIBDIR}:g' -e 's:${D}${prefix}/include\S*:${STAGING_INCDIR}:g' > ${PKG_CONFIG_PATH}/$pcname
 	done
 }
-- 
cgit v1.2.3


From bd9c9ba97300474375809d784277b7cbfac55c15 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 28 Jul 2007 19:00:56 +0000
Subject: gnuradio.inc: fix quoting

---
 packages/gnuradio/gnuradio.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/gnuradio/gnuradio.inc b/packages/gnuradio/gnuradio.inc
index b5642deb09..4916411f0a 100644
--- a/packages/gnuradio/gnuradio.inc
+++ b/packages/gnuradio/gnuradio.inc
@@ -54,8 +54,8 @@ FILES_${PN}-dbg += "${libdir}/python*/site-packages/gnuradio/.debug \
 		   "
 
 FILES_gnuradio-usrp = "${libdir}/python*/site-packages/usrpm/* \
-                       ${datadir}/usrp""
-FILES_gnuradio-usrp-dbg = ${libdir}/python*/site-packages/usrpm/.debug"
+                       ${datadir}/usrp"
+FILES_gnuradio-usrp-dbg = "${libdir}/python*/site-packages/usrpm/.debug"
 
 
 
-- 
cgit v1.2.3


From 4abc1a029a86b338d712222229a78399d084838e Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 28 Jul 2007 19:06:17 +0000
Subject: gnome-menus 2.16.1: fix packaging

---
 packages/gnome/gnome-menus_2.16.1.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/gnome/gnome-menus_2.16.1.bb b/packages/gnome/gnome-menus_2.16.1.bb
index 30e0abc14f..1307c026f2 100644
--- a/packages/gnome/gnome-menus_2.16.1.bb
+++ b/packages/gnome/gnome-menus_2.16.1.bb
@@ -1,6 +1,7 @@
 DEPENDS = "python gnome-vfs libxml2 gconf popt gtk+"
 LICENSE = "GPL"
 
+PR = "r1"
 
 inherit gnome pkgconfig
 
@@ -11,4 +12,6 @@ autotools_stage_all
 PACKAGES += "${PN}-python"
 FILES_${PN} += "${datadir}/desktop-directories/"
 FILES_${PN}-python = "${libdir}/python*"
+FILES_${PN}-dbg += "${libdir}/python*/site-packages/*/.debug \
+                    ${libdir}/python*/site-packages/.debug"
 
-- 
cgit v1.2.3


From 1f7dfd51aad9beb3ca31f197d57c5bc2048eea8e Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 28 Jul 2007 19:15:50 +0000
Subject: libwnck: update to 2.13.5

---
 packages/gnome/libwnck_2.13.5.bb | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/gnome/libwnck_2.13.5.bb

diff --git a/packages/gnome/libwnck_2.13.5.bb b/packages/gnome/libwnck_2.13.5.bb
new file mode 100644
index 0000000000..1830a7540a
--- /dev/null
+++ b/packages/gnome/libwnck_2.13.5.bb
@@ -0,0 +1,10 @@
+LICENSE =	"LGPL"
+DEPENDS = 	"gtk+"
+DESCRIPTION =	"Window navigation construction toolkit"
+HOMEPAGE =	""
+
+inherit gnome
+
+do_stage() {
+	autotools_stage_all
+}
-- 
cgit v1.2.3


From 496b9ef9ee189d0d4b41fcdb3430481d20567e7b Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 28 Jul 2007 19:39:00 +0000
Subject: gnome-panel: add 2.18.1

---
 packages/gnome/gnome-panel_2.18.1.bb | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 packages/gnome/gnome-panel_2.18.1.bb

diff --git a/packages/gnome/gnome-panel_2.18.1.bb b/packages/gnome/gnome-panel_2.18.1.bb
new file mode 100644
index 0000000000..349951143b
--- /dev/null
+++ b/packages/gnome/gnome-panel_2.18.1.bb
@@ -0,0 +1,17 @@
+LICENSE = "GPL"
+DEPENDS = "libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-menus"
+
+inherit gnome pkgconfig
+
+
+do_configure_prepend() {
+        sed -i -e s:help:: ${S}/Makefile.am
+}
+
+
+PACKAGES =+ "libpanel-applet"
+FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*"
+
+do_stage() {
+        autotools_stage_all
+}
-- 
cgit v1.2.3


From e572d35b09c90c076730108f3bcd8b714d257166 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 28 Jul 2007 19:50:06 +0000
Subject: gnome-power-manager: add 2.18.3

---
 packages/gnome/gnome-power-manager_2.18.3.bb | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 packages/gnome/gnome-power-manager_2.18.3.bb

diff --git a/packages/gnome/gnome-power-manager_2.18.3.bb b/packages/gnome/gnome-power-manager_2.18.3.bb
new file mode 100644
index 0000000000..79a6ae20ec
--- /dev/null
+++ b/packages/gnome/gnome-power-manager_2.18.3.bb
@@ -0,0 +1,17 @@
+LICENSE = "GPLv2"
+DEPENDS = "libnotify libgnomeui gnome-panel gnome-doc-utils libwnck gtk+ gnome-keyring libglade hal dbus-glib " 
+
+inherit gnome
+
+EXTRA_OECONF = " --disable-scrollkeeper \
+                 --disable-keyring \
+		 "
+
+do_configure_append() {
+        rm config.log
+}
+
+FILES_${PN} += "${datadir}/icons \
+                ${datadir}/dbus-1 \
+		${datadir}/gnome"
+
-- 
cgit v1.2.3


From f47bdc74bdbf4451361af5533a53b83b533d52ae Mon Sep 17 00:00:00 2001
From: Sergey Lapin <slapinid@gmail.com>
Date: Sat, 28 Jul 2007 22:45:11 +0000
Subject: conf/machine/palmt650.conf: Adding pxa2xx-ac97 module to autoload

---
 conf/machine/palmt650.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf/machine/palmt650.conf b/conf/machine/palmt650.conf
index 46e5fafdb5..beaf6cdbbb 100644
--- a/conf/machine/palmt650.conf
+++ b/conf/machine/palmt650.conf
@@ -10,7 +10,8 @@ SERIAL_CONSOLE = "115200 ttyS1"
 
 GUI_MACHINE_CLASS = "bigscreen"
 
-MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \
+MACHINE_EXTRA_RRECOMMENDS += "kernel-module-snd-pxa2xx-ac97 \
+                           kernel-module-pxa27x-keyboard \
                            kernel-module-pxapwm-bl \
                            kernel-module-wm97xx-ts"
 
-- 
cgit v1.2.3


From 3ff2de1f481107ffc8f4695a42a91a3613869a58 Mon Sep 17 00:00:00 2001
From: Sergey Lapin <slapinid@gmail.com>
Date: Sun, 29 Jul 2007 02:42:52 +0000
Subject: palms: Removed obsolete pxapwm-bl driver from machine configs

---
 conf/machine/include/palm.conf |  1 -
 conf/machine/palmld.conf       |  1 -
 conf/machine/palmt650.conf     |  1 -
 conf/machine/palmt680.conf     | 14 ++++++++++++++
 conf/machine/palmtc.conf       |  2 --
 conf/machine/palmtt5.conf      |  1 -
 conf/machine/palmtx.conf       |  1 -
 7 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 conf/machine/palmt680.conf

diff --git a/conf/machine/include/palm.conf b/conf/machine/include/palm.conf
index 565f37b43f..821ebc4c03 100644
--- a/conf/machine/include/palm.conf
+++ b/conf/machine/include/palm.conf
@@ -41,7 +41,6 @@ module_autoload_pcmcia = "pcmcia"
 module_autoload_pcmcia_core = "pcmcia-core"
 module_autoload_pda_power = "pda_power"
 module_autoload_pxa2xx_core = "pxa2xx-core"
-module_autoload_pxapwm_bl = "pxapwm_bl"
 module_autoload_snd = "snd"
 module_autoload_snd-ac97-codec = "snd-ac97-codec"
 module_autoload_snd-mixer-oss = "snd-mixer-oss"
diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf
index 7adb352ba4..3d1d90fbd8 100644
--- a/conf/machine/palmld.conf
+++ b/conf/machine/palmld.conf
@@ -24,7 +24,6 @@ MACHINE_EXTRA_RRECOMMENDS += "\
 	kernel-module-pcmcia-core \
 	kernel-module-pda-power \
 	kernel-module-pxa2xx-core \
-	kernel-module-pxapwm-bl \
 	kernel-module-snd-pxa2xx-ac97 \
 	kernel-module-snd-pxa2xx-pcm \
 	"
diff --git a/conf/machine/palmt650.conf b/conf/machine/palmt650.conf
index beaf6cdbbb..4d10