merge of 1d8a85d29d23285494e2dc937981b14cd0907e19

     and e8e7132af4a76b95599213aafdc96c7e0f61582a

7 files changed, 89 insertions, 9 deletions

diff --git a/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/fix-kernel-version-test-for-hh.patch b/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/fix-kernel-version-test-for-hh.patch
index 7059504799..96e2cd947f 100644
--- a/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/fix-kernel-version-test-for-hh.patch
+++ b/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/fix-kernel-version-test-for-hh.patch
@@ -1,12 +1,21 @@
 diff -Nurd atmelwlandriver-3.4.1.0/src/usb/vnetusba.c atmelwlandriver-3.4.1.0-hh/src/usb/vnetusba.c
---- atmelwlandriver-3.4.1.0/src/usb/vnetusba.c	2004-11-10 01:40:50.000000000 -0800
-+++ atmelwlandriver-3.4.1.0-hh/src/usb/vnetusba.c	2005-11-29 14:48:49.632112829 -0800
+--- atmelwlandriver-3.4.1.0/src/usb/vnetusba.c	2005-12-02 10:25:21.946561154 -0800
++++ atmelwlandriver-3.4.1.0-hh/src/usb/vnetusba.c	2005-12-19 11:34:38.070346125 -0800
 @@ -72,7 +72,7 @@
  #endif
  
  struct usb_driver vnet_driver = {
 -#if LINUX_VERSION_CODE < 0x020415
-+#if (LINUX_VERSION_CODE < 0x020415) && !defined(CONFIG_ARCH_H5400)
++#if (LINUX_VERSION_CODE < 0x020415) && !defined(CONFIG_IPAQ_HANDHELD)
  owner : THIS_MODULE,
  #endif
  #if defined(RFMD)
+@@ -2174,7 +2174,7 @@
+ 		return NULL;
+ 	}
+   */
+-#if (LINUX_VERSION_CODE < 0x020413)
++#if (LINUX_VERSION_CODE < 0x020413) && !defined(CONFIG_IPAQ_HANDHELD)
+ 	if (!register_netdev(Adapter->net)) {
+ 		err("register_netdev failed");
+ #else
diff --git a/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/power-on-and-leds.patch b/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/power-on-and-leds.patch
index b2a515eec1..0ac06f1482 100644
--- a/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/power-on-and-leds.patch
+++ b/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/power-on-and-leds.patch
@@ -5,7 +5,7 @@ diff -Nurd atmelwlandriver-3.4.1.0/src/usb/vnetusba.c atmelwlandriver-3.4.1.0-hh
  #include "vnetioctl.h"
  #include "config.h"
  
-+#ifdef CONFIG_IPAQ_HANDHELD
++#ifdef CONFIG_ARCH_H5400
 +#include <asm/mach-types.h>
 +#include <asm/arch/ipaq.h>
 +#include <asm/arch-pxa/h5400-asic.h>
@@ -49,7 +49,7 @@ diff -Nurd atmelwlandriver-3.4.1.0/src/usb/vnetusba.c atmelwlandriver-3.4.1.0-hh
  	return 0;
  }
  
-+#ifdef CONFIG_IPAQ_HANDHELD
++#ifdef CONFIG_ARCH_H5400
 +static struct timer_list led_timer;
 +
 +static void
@@ -73,7 +73,7 @@ diff -Nurd atmelwlandriver-3.4.1.0/src/usb/vnetusba.c atmelwlandriver-3.4.1.0-hh
 +
 +	init_timer (&led_timer);
 +}
-+#endif /* CONFIG_IPAQ_HANDHELD */
++#endif /* CONFIG_ARCH_H5400*/
 +
  static int usb_vnet_tx(struct sk_buff *skb, struct net_device *dev)
  {
diff --git a/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb b/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb
index 7da172aafd..333d8f12ec 100644
--- a/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb
+++ b/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb
@@ -7,7 +7,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/atmelwlandriver/atmelwlandriver-${PV}.tar.bz2 \
 	file://fix-kernel-version-test-for-hh.patch;patch=1"
 S = "${WORKDIR}/atmelwlandriver"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 inherit module
 SECTION = "base"
diff --git a/packages/rdesktop/rdesktop_1.4.1.bb b/packages/rdesktop/rdesktop_1.4.1.bb
new file mode 100644
index 0000000000..9d37c71100
--- /dev/null
+++ b/packages/rdesktop/rdesktop_1.4.1.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Rdesktop rdp client for X"
+DEPENDS = "x11 openssl"
+HOMEPAGE = "http://www.rdesktop.org"
+SECTION = "x11/network"
+MAINTAINER = "Adrian Davey <ade@beth2.org>"
+LICENSE = "GPL"
+PV = "1.4.1"
+PR = "r1"
+
+SRC_URI = "{SOURCEFORDGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz \
+	file://strip.patch;patch=1"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. "
diff --git a/packages/x11/diet-x11_6.2.1.bb b/packages/x11/diet-x11_6.2.1.bb
index 1313bd08d0..b63bfa041a 100644
--- a/packages/x11/diet-x11_6.2.1.bb
+++ b/packages/x11/diet-x11_6.2.1.bb
@@ -4,5 +4,6 @@ include x11_${PV}.bb
 EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
 CFLAGS += "-D_GNU_SOURCE"
 
-SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1"
+SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1 \
+	file://xim.patch;patch=1"
 
diff --git a/packages/x11/files/xim.patch b/packages/x11/files/xim.patch
new file mode 100644
index 0000000000..0eab197a80
--- /dev/null
+++ b/packages/x11/files/xim.patch
@@ -0,0 +1,55 @@
+--- libX11-6.2.1/src/X18NCMSstubs.c	2003-12-04 22:47:47.000000000 +0000
++++ libX11-6.2.1/src/X18NCMSstubs.c-new	2005-12-09 12:09:03.000000000 +0000
+@@ -90,6 +90,52 @@
+   return;
+ }
+ 
++XIM
++XOpenIM (
++    Display* display,
++    struct _XrmHashBucketRec* rdb,
++    char* res_name,
++    char* res_class)
++{
++  return (XIM) NULL;
++}
++
++Status
++XCloseIM ( XIM im )
++{
++  return NULL;
++}
++
++XIC
++XCreateIC ( XIM im, ...)
++{
++  return NULL;
++}
++
++void
++XDestroyIC ( XIC ic )
++{
++  return;
++}
++
++int
++XmbLookupString (
++    XIC ic,
++    XKeyPressedEvent* ev,
++    char* buffer,
++    int nbytes,
++    KeySym* keysym,
++    Status* status)
++{
++  return XLookupNone;
++}
++
++char *
++XGetICValues( XIC ic, ...)
++{
++  return (char *) NULL;
++}
++
+ XPointer
+ _XimGetLocaleCode ( _Xconst char* encoding_name )
+ {
diff --git a/packages/x11/x11_6.2.1.bb b/packages/x11/x11_6.2.1.bb
index 121c1ddd9e..b1de21c383 100644
--- a/packages/x11/x11_6.2.1.bb
+++ b/packages/x11/x11_6.2.1.bb
@@ -7,7 +7,7 @@ DESCRIPTION = "Base X libs."
 FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
 FILES_${PN}-locale += "${datadir}/X11/locale"
 PROVIDES = "x11"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \
            file://errordb-keysymdb-path-fix.patch;patch=1 \