merge of 58569a0e47bb26450c7e67d5aa0b20806e2b2a50

     and 5ae0815fd4186ce653535a78ab0e482e9a7c24f4

31 files changed, 772 insertions, 7 deletions

diff --git a/packages/epdfview/epdfview_0.1.4.bb b/packages/epdfview/epdfview_0.1.4.bb
new file mode 100644
index 0000000000..357129c16b
--- /dev/null
+++ b/packages/epdfview/epdfview_0.1.4.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "A minimal PDF viewer based on gtk and poppler"
+MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
+HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/"
+LICENSE = "GPLv2"
+DEPENDS = "poppler gtk+"
+
+SRC_URI = "http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-${PV}.tar.bz2"
+
+PR="r0"
+
+inherit autotools
+
+do_compile_append () {
+	sed -i 's|\$.*prefix./|/usr/|' data/epdfview.desktop
+}
+
diff --git a/packages/gcc/gcc-3.4.4/zecke-no-host-includes.patch b/packages/gcc/gcc-3.4.4/zecke-no-host-includes.patch
new file mode 100644
index 0000000000..069a965012
--- /dev/null
+++ b/packages/gcc/gcc-3.4.4/zecke-no-host-includes.patch
@@ -0,0 +1,32 @@
+Index: gcc-3.4.4/gcc/c-incpath.c
+===================================================================
+--- gcc-3.4.4.orig/gcc/c-incpath.c	2004-05-31 12:37:47.000000000 +0200
++++ gcc-3.4.4/gcc/c-incpath.c	2006-05-15 20:07:31.000000000 +0200
+@@ -328,6 +328,27 @@
+   else
+     heads[chain] = p;
+   tails[chain] = p;
++
++
++#ifdef CROSS_COMPILE
++    /* A common error when cross compiling is including
++    host headers. This code below will try to fail fast
++    for cross compiling. Currently we consider /usr/include,
++    /opt/include and /sw/include as harmful.  */
++	{
++		/* printf("Adding Path: %s\n", p->name ); */
++		if( strstr(p->name, "/usr/include" ) == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /usr/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		} else if( strstr(p->name, "/sw/include") == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /sw/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		} else if( strstr(p->name, "/opt/include") == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /opt/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		}
++	}
++#endif
+ }
+ 
+ /* Exported function to handle include chain merging, duplicate
diff --git a/packages/gcc/gcc-4.0.0/zecke-no-host-includes.patch b/packages/gcc/gcc-4.0.0/zecke-no-host-includes.patch
new file mode 100644
index 0000000000..6afb10d6ef
--- /dev/null
+++ b/packages/gcc/gcc-4.0.0/zecke-no-host-includes.patch
@@ -0,0 +1,31 @@
+Index: gcc-4.0.2/gcc/c-incpath.c
+===================================================================
+--- gcc-4.0.2.orig/gcc/c-incpath.c	2005-01-23 16:05:27.000000000 +0100
++++ gcc-4.0.2/gcc/c-incpath.c	2006-05-15 21:23:02.000000000 +0200
+@@ -350,6 +350,26 @@
+   p->construct = 0;
+   p->user_supplied_p = user_supplied_p;
+ 
++#ifdef CROSS_COMPILE
++    /* A common error when cross compiling is including
++    host headers. This code below will try to fail fast
++    for cross compiling. Currently we consider /usr/include,
++    /opt/include and /sw/include as harmful.  */
++	{
++		/* printf("Adding Path: %s\n", p->name ); */
++		if( strstr(p->name, "/usr/include" ) == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /usr/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		} else if( strstr(p->name, "/sw/include") == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /sw/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		} else if( strstr(p->name, "/opt/include") == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /opt/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		 }
++	}
++#endif
++
+   add_cpp_dir_path (p, chain);
+ }
+ 
diff --git a/packages/gcc/gcc-4.0.2/zecke-no-host-includes.patch b/packages/gcc/gcc-4.0.2/zecke-no-host-includes.patch
new file mode 100644
index 0000000000..6afb10d6ef
--- /dev/null
+++ b/packages/gcc/gcc-4.0.2/zecke-no-host-includes.patch
@@ -0,0 +1,31 @@
+Index: gcc-4.0.2/gcc/c-incpath.c
+===================================================================
+--- gcc-4.0.2.orig/gcc/c-incpath.c	2005-01-23 16:05:27.000000000 +0100
++++ gcc-4.0.2/gcc/c-incpath.c	2006-05-15 21:23:02.000000000 +0200
+@@ -350,6 +350,26 @@
+   p->construct = 0;
+   p->user_supplied_p = user_supplied_p;
+ 
++#ifdef CROSS_COMPILE
++    /* A common error when cross compiling is including
++    host headers. This code below will try to fail fast
++    for cross compiling. Currently we consider /usr/include,
++    /opt/include and /sw/include as harmful.  */
++	{
++		/* printf("Adding Path: %s\n", p->name ); */
++		if( strstr(p->name, "/usr/include" ) == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /usr/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		} else if( strstr(p->name, "/sw/include") == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /sw/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		} else if( strstr(p->name, "/opt/include") == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /opt/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		 }
++	}
++#endif
++
+   add_cpp_dir_path (p, chain);
+ }
+ 
diff --git a/packages/gcc/gcc-4.1-20060217/zecke-no-host-includes.patch b/packages/gcc/gcc-4.1-20060217/zecke-no-host-includes.patch
new file mode 100644
index 0000000000..6afb10d6ef
--- /dev/null
+++ b/packages/gcc/gcc-4.1-20060217/zecke-no-host-includes.patch
@@ -0,0 +1,31 @@
+Index: gcc-4.0.2/gcc/c-incpath.c
+===================================================================
+--- gcc-4.0.2.orig/gcc/c-incpath.c	2005-01-23 16:05:27.000000000 +0100
++++ gcc-4.0.2/gcc/c-incpath.c	2006-05-15 21:23:02.000000000 +0200
+@@ -350,6 +350,26 @@
+   p->construct = 0;
+   p->user_supplied_p = user_supplied_p;
+ 
++#ifdef CROSS_COMPILE
++    /* A common error when cross compiling is including
++    host headers. This code below will try to fail fast
++    for cross compiling. Currently we consider /usr/include,
++    /opt/include and /sw/include as harmful.  */
++	{
++		/* printf("Adding Path: %s\n", p->name ); */
++		if( strstr(p->name, "/usr/include" ) == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /usr/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		} else if( strstr(p->name, "/sw/include") == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /sw/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		} else if( strstr(p->name, "/opt/include") == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /opt/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		 }
++	}
++#endif
++
+   add_cpp_dir_path (p, chain);
+ }
+ 
diff --git a/packages/gcc/gcc-4.1.0/zecke-no-host-includes.patch b/packages/gcc/gcc-4.1.0/zecke-no-host-includes.patch
new file mode 100644
index 0000000000..6afb10d6ef
--- /dev/null
+++ b/packages/gcc/gcc-4.1.0/zecke-no-host-includes.patch
@@ -0,0 +1,31 @@
+Index: gcc-4.0.2/gcc/c-incpath.c
+===================================================================
+--- gcc-4.0.2.orig/gcc/c-incpath.c	2005-01-23 16:05:27.000000000 +0100
++++ gcc-4.0.2/gcc/c-incpath.c	2006-05-15 21:23:02.000000000 +0200
+@@ -350,6 +350,26 @@
+   p->construct = 0;
+   p->user_supplied_p = user_supplied_p;
+ 
++#ifdef CROSS_COMPILE
++    /* A common error when cross compiling is including
++    host headers. This code below will try to fail fast
++    for cross compiling. Currently we consider /usr/include,
++    /opt/include and /sw/include as harmful.  */
++	{
++		/* printf("Adding Path: %s\n", p->name ); */
++		if( strstr(p->name, "/usr/include" ) == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /usr/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		} else if( strstr(p->name, "/sw/include") == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /sw/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		} else if( strstr(p->name, "/opt/include") == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /opt/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		 }
++	}
++#endif
++
+   add_cpp_dir_path (p, chain);
+ }
+ 
diff --git a/packages/gcc/gcc-4.2-20060513/zecke-no-host-includes.patch b/packages/gcc/gcc-4.2-20060513/zecke-no-host-includes.patch
new file mode 100644
index 0000000000..6afb10d6ef
--- /dev/null
+++ b/packages/gcc/gcc-4.2-20060513/zecke-no-host-includes.patch
@@ -0,0 +1,31 @@
+Index: gcc-4.0.2/gcc/c-incpath.c
+===================================================================
+--- gcc-4.0.2.orig/gcc/c-incpath.c	2005-01-23 16:05:27.000000000 +0100
++++ gcc-4.0.2/gcc/c-incpath.c	2006-05-15 21:23:02.000000000 +0200
+@@ -350,6 +350,26 @@
+   p->construct = 0;
+   p->user_supplied_p = user_supplied_p;
+ 
++#ifdef CROSS_COMPILE
++    /* A common error when cross compiling is including
++    host headers. This code below will try to fail fast
++    for cross compiling. Currently we consider /usr/include,
++    /opt/include and /sw/include as harmful.  */
++	{
++		/* printf("Adding Path: %s\n", p->name ); */
++		if( strstr(p->name, "/usr/include" ) == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /usr/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		} else if( strstr(p->name, "/sw/include") == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /sw/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		} else if( strstr(p->name, "/opt/include") == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /opt/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		 }
++	}
++#endif
++
+   add_cpp_dir_path (p, chain);
+ }
+ 
diff --git a/packages/gcc/gcc_3.4.4.bb b/packages/gcc/gcc_3.4.4.bb
index 5be603f2ca..2d04b0ed08 100644
--- a/packages/gcc/gcc_3.4.4.bb
+++ b/packages/gcc/gcc_3.4.4.bb
@@ -26,5 +26,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 
 SRC_URI += "file://gcc34-configure.in.patch;patch=1"
 SRC_URI += "file://gcc34-thumb-support.patch;patch=1"
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
 include gcc3-build.inc
diff --git a/packages/gcc/gcc_4.0.0.bb b/packages/gcc/gcc_4.0.0.bb
index cb7bfeae1c..af54c17fb8 100644
--- a/packages/gcc/gcc_4.0.0.bb
+++ b/packages/gcc/gcc_4.0.0.bb
@@ -11,5 +11,6 @@ include gcc-package.inc
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://ldflags.patch;patch=1"
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
 include gcc4-build.inc
diff --git a/packages/gcc/gcc_4.0.2.bb b/packages/gcc/gcc_4.0.2.bb
index 540af1cb39..7a8eba47ee 100644
--- a/packages/gcc/gcc_4.0.2.bb
+++ b/packages/gcc/gcc_4.0.2.bb
@@ -23,5 +23,7 @@ SRC_URI_append = " file://100-uclibc-conf.patch;patch=1   \
                    file://800-arm-bigendian.patch;patch=1 \
                    file://zecke-host-cpp-ac-hack.patch;patch=1 "
 
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+
 
 include gcc4-build.inc
diff --git a/packages/gcc/gcc_4.1-20060217.bb b/packages/gcc/gcc_4.1-20060217.bb
index da2c80782d..66880d752b 100644
--- a/packages/gcc/gcc_4.1-20060217.bb
+++ b/packages/gcc/gcc_4.1-20060217.bb
@@ -14,4 +14,6 @@ SRC_URI = "http://ftp.nluug.nl/languages/gcc/snapshots/4.1-20060217/gcc-4.1-2006
 	file://arm-softfloat.patch;patch=1 \
 	file://ldflags.patch;patch=1"
 
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+
 include gcc4-build.inc
diff --git a/packages/gcc/gcc_4.1.0.bb b/packages/gcc/gcc_4.1.0.bb
index 27f6870d23..4d44978dab 100644
--- a/packages/gcc/gcc_4.1.0.bb
+++ b/packages/gcc/gcc_4.1.0.bb
@@ -14,6 +14,8 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2 \
 	file://arm-softfloat.patch;patch=1 \
 	file://ldflags.patch;patch=1"
 
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+
 include gcc4-build.inc
 EXTRA_OECONF += "--disable-libssp"
 
diff --git a/packages/gcc/gcc_4.2-20060513.bb b/packages/gcc/gcc_4.2-20060513.bb
index 9eb54654da..68fa6d8d06 100644
--- a/packages/gcc/gcc_4.2-20060513.bb
+++ b/packages/gcc/gcc_4.2-20060513.bb
@@ -14,6 +14,8 @@ SRC_URI = "http://ftp.nluug.nl/languages/gcc/snapshots/${PV}/gcc-${PV}.tar.bz2 \
 	file://arm-softfloat.patch;patch=1 \
 	file://ldflags.patch;patch=1"
 
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+
 include gcc4-build.inc
 EXTRA_OECONF += "--disable-libssp"
 
diff --git a/packages/glibc/glibc-cvs-2.3.5/superh-fcntl.patch b/packages/glibc/glibc-cvs-2.3.5/superh-fcntl.patch
new file mode 100644
index 0000000000..364b9e1b32
--- /dev/null
+++ b/packages/glibc/glibc-cvs-2.3.5/superh-fcntl.patch
@@ -0,0 +1,40 @@
+--- sysdeps/unix/sysv/linux/sh/bits/fcntl.h_orig	2006-05-16 16:58:30.000000000 +0000
++++ sysdeps/unix/sysv/linux/sh/bits/fcntl.h	2006-05-16 16:58:49.000000000 +0000
+@@ -90,6 +90,12 @@
+ # define F_GETSIG	11	/* Get number of signal to be sent.  */
+ #endif
+ 
++#ifdef __USE_GNU
++# define F_SETLEASE   1024      /* Set a lease. */
++# define F_GETLEASE   1025      /* Enquire what lease is active. */
++# define F_NOTIFY     1026      /* Request notifications on a directory */
++#endif
++
+ /* For F_[GET|SET]FL.  */
+ #define FD_CLOEXEC	1	/* actually anything with low bit set goes */
+ 
+@@ -111,6 +117,24 @@
+ # define LOCK_UN	8	/* remove lock */
+ #endif
+ 
++#ifdef __USE_GNU
++# define LOCK_MAND      32      /* this is a mandatory flock:  */
++# define LOCK_READ      64      /* ...which allows concurrent read operations. */
++# define LOCK_WRITE    128      /* ...which allows concurrent write operations. */
++# define LOCK_RW       192      /* ...which allows concurrent read & write operations. */
++#endif
++
++#ifdef __USE_GNU
++/* Types of directory notifications that may be requested with F_NOTIFY. */
++# define DN_ACCESS 0x00000001     /* File Acessed. */
++# define DN_MODIFY 0x00000002     /* File Modified. */
++# define DN_CREATE 0x00000004     /* File created. */
++# define DN_DELETE 0x00000008     /* File removed. */
++# define DN_RENAME 0x00000010     /* File renamed. */
++# define DN_ATTRIB 0x00000020     /* File changed attributes. */
++# define DN_MULTISHOT 0x80000000  /* Don't remove notifier. */
++#endif
++
+ struct flock
+   {
+     short int l_type;	/* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb
index 61e3e84d6d..86ddc91fd0 100644
--- a/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
 SRCDATE = "20050627"
-PR = "r4"
+PR = "r6"
 
 GLIBC_ADDONS ?= "ports,linuxthreads"
 GLIBC_EXTRA_OECONF ?= ""
@@ -60,8 +60,11 @@ SRC_URI = "http://familiar.handhelds.org/source/v0.8.3/stash_libc_sources.redhat
 # seems to fail on tls platforms
 SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1"
 
-# Build fails on sh4 unless no-z-defs is defined
-SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1"
+# Build fails on sh3 and sh4 without additional patches
+SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1 \
+                       file://superh-fcntl.patch;patch=1;pnum=0"
+SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1 \ 
+                       file://superh-fcntl.patch;patch=1;pnum=0"
 
 S = "${WORKDIR}/libc"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/packages/jamvm/jamvm/sh3sh4-support.patch b/packages/jamvm/jamvm/sh3sh4-support.patch
new file mode 100644
index 0000000000..8fa0d8c161
--- /dev/null
+++ b/packages/jamvm/jamvm/sh3sh4-support.patch
@@ -0,0 +1,11 @@
+--- configure.ac_orig	2006-05-10 21:48:31.000000000 +0000
++++ configure.ac	2006-05-10 21:49:56.000000000 +0000
+@@ -66,6 +66,8 @@
+ arm*-*-linux*) host_cpu=arm host_os=linux ;;
+ arm*-*-openbsd*) host_cpu=arm host_os=linux libdl_needed=no ;;
+ arm*-*-freebsd*) host_cpu=arm host_os=linux libdl_needed=no ;;
++sh3-*-linux*) host_cpu=sh3 host_os=linux libdl_needed=no ;;
++sh4-*-linux*) host_cpu=sh4 host_os=linux libdl_needed=no ;;
+ powerpc*-*-linux*) host_cpu=powerpc host_os=linux ;;
+ powerpc*-*-openbsd*) host_cpu=powerpc host_os=linux libdl_needed=no ;;
+ powerpc*-*-freebsd*) host_cpu=powerpc host_os=linux libdl_needed=no ;;
diff --git a/packages/lua/lua-gtk2/.mtn2git_empty b/packages/lua/lua-gtk2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/lua/lua-gtk2/.mtn2git_empty
diff --git a/packages/lua/lua-gtk2/lua-gtk2-0.3_fixbuild.patch b/packages/lua/lua-gtk2/lua-gtk2-0.3_fixbuild.patch
new file mode 100644
index 0000000000..1115b6ffb6
--- /dev/null
+++ b/packages/lua/lua-gtk2/lua-gtk2-0.3_fixbuild.patch
@@ -0,0 +1,352 @@
+diff -NbBur lua-gtk2-0.3_orig/configure lua-gtk2-0.3/configure
+--- lua-gtk2-0.3_orig/configure	2005-08-16 19:32:07.000000000 +0200
++++ lua-gtk2-0.3/configure	2006-05-14 02:52:39.000000000 +0200
+@@ -2,25 +2,19 @@
+ 
+ # examine system
+ 
+-CFLAGS="$(pkg-config gtk+-2.0 --cflags) $(pkg-config lua50 --cflags) -I build-linux -I src"
++CFLAGS="-g -Wall -DLINUX -Os -fomit-frame-pointer -Wall $(pkg-config gtk+-2.0 --cflags) $(pkg-config lua50 --cflags) -I build-linux -I src"
+ VERSION="0.3"
+-
+-if which gcc-4.0 > /dev/null; then
+-	GCC=gcc-4.0
+-elif which gcc > /dev/null; then
+-	GCC=gcc
+-else
+-	@echo "No GCC found."
+-	exit 1
+-fi
+-
+-if true; then
+-	CFLAGS2="-DLINUX"
+-	LIBS="" # -lgtk-x11-2.0"
+-else
+-	CFLAGS2="-DWIN32"
+-	LIBS=""
+-fi
++PREFIX="/usr/local"
++GCC=arm-linux-gcc
++HGCC=gcc
++
++#if true; then
++#	CFLAGS2="-DLINUX"
++#	LIBS="" # -lgtk-x11-2.0"
++#else
++#	CFLAGS2="-DWIN32"
++#	LIBS=""
++#fi
+ 
+ 
+ # build makefile
+@@ -28,13 +22,14 @@
+ cat > Makefile <<EOF
+ # automatically generated makefile
+ 
+-# CFLAGS	:=-DLINUX -Os -fomit-frame-pointer -Wall $CFLAGS
++#CFLAGS	:= \-DLINUX -Os -fomit-frame-pointer -Wall $CFLAGS
+ # CFLAGS	:=-DLINUX -O2 -fomit-frame-pointer -Wall $CFLAGS
+-CFLAGS	:=$CFLAGS2 -g -Wall $CFLAGS
++CFLAGS	=$CFLAGS 
+ HASH	:=hash2
+ ODIR	:=build-linux/
+ VERSION	:=$VERSION
+ CC	:=$GCC
++HGCC	:=$HGCC
+ 
+ all: \${ODIR}libluagtk2.so \${ODIR}main
+ 
+@@ -46,6 +41,8 @@
+ 	@\${CC} -shared -o \$@ $^ /usr/lib/libffi.a $LIBS
+ 
+ \${ODIR}generate: \${ODIR}generate.o \${ODIR}\${HASH}.o
++	@echo \$@
++	@\${HGCC} -Wall -c -g -o \$@ $^
+ 
+ \${ODIR}main.o: src/main.c
+ 	@echo \$@
+@@ -99,9 +96,9 @@
+ 	rm -f \${ODIR}file2c \${ODIR}override.luac \${ODIR}main
+ 
+ install: all
+-	mkdir -p ~/.lua50
+-	cp gtk2.lua ~/.lua50
+-	ln -sf \$(PWD)/build-linux/libluagtk2.so ~/.lua50
++	install -d \$(DESTDIR)/\$(PREFIX)/lib/lua50
++	install gtk2.lua \$(DESTDIR)/\$(PREFIX)/lib/lua50
++	install \$(PWD)/build-linux/libluagtk2.so \$(DESTDIR)/\$(PREFIX)/lib/lua50
+ 
+ tar:
+ 	(cd ..; ln -s lua-gtk2 lua-gtk2-\${VERSION}; tar czvhf lua-gtk2-\${VERSION}.tar.gz \\
+diff -NbBur lua-gtk2-0.3_orig/configure_orig lua-gtk2-0.3/configure_orig
+--- lua-gtk2-0.3_orig/configure_orig	1970-01-01 01:00:00.000000000 +0100
++++ lua-gtk2-0.3/configure_orig	2006-05-13 18:22:03.000000000 +0200
+@@ -0,0 +1,114 @@
++#! /bin/sh
++
++# examine system
++
++CFLAGS="$(pkg-config gtk+-2.0 --cflags) $(pkg-config lua50 --cflags) -I build-linux -I src"
++VERSION="0.3"
++
++if which gcc-4.0 > /dev/null; then
++	GCC=gcc-4.0
++elif which gcc > /dev/null; then
++	GCC=gcc
++else
++	@echo "No GCC found."
++	exit 1
++fi
++
++if true; then
++	CFLAGS2="-DLINUX"
++	LIBS="" # -lgtk-x11-2.0"
++else
++	CFLAGS2="-DWIN32"
++	LIBS=""
++fi
++
++
++# build makefile
++
++cat > Makefile <<EOF
++# automatically generated makefile
++
++# CFLAGS	:=-DLINUX -Os -fomit-frame-pointer -Wall $CFLAGS
++# CFLAGS	:=-DLINUX -O2 -fomit-frame-pointer -Wall $CFLAGS
++CFLAGS	:=$CFLAGS2 -g -Wall $CFLAGS
++HASH	:=hash2
++ODIR	:=build-linux/
++VERSION	:=$VERSION
++CC	:=$GCC
++
++all: \${ODIR}libluagtk2.so \${ODIR}main
++
++Makefile: configure
++	./configure
++
++\${ODIR}libluagtk2.so: \${ODIR}libluagtk2.o \${ODIR}\${HASH}.o \${ODIR}hash.o \${ODIR}_funclist.o \${ODIR}_structlist.o \${ODIR}_enumlist.o \${ODIR}_override.o
++	@echo \$@
++	@\${CC} -shared -o \$@ $^ /usr/lib/libffi.a $LIBS
++
++\${ODIR}generate: \${ODIR}generate.o \${ODIR}\${HASH}.o
++
++\${ODIR}main.o: src/main.c
++	@echo \$@
++	@\${CC} -Wall -c -g -o \$@ $^ -I /usr/include/lua50
++
++\${ODIR}main: \${ODIR}main.o
++	@echo \$@
++	@\${CC} -o \$@ $^ -llua50 -llualib50
++
++\${ODIR}libluagtk2.o: src/libluagtk2.c \${ODIR}_typelist.c src/structinfo.h src/hash.h
++
++\${ODIR}_funclist.c: data/gtkdata.funcs \${ODIR}generate
++	@echo \$@
++	@\${ODIR}generate -s 4096 -o \$@ -p funclist_ -d $<
++
++\${ODIR}_structlist.c: data/gtkdata.structs.c
++	cp -f \$< \$@
++
++\${ODIR}_typelist.c: data/gtkdata.types.c
++	cp -f \$< \$@
++
++\${ODIR}_enumlist.c: data/gtkdata.enums src/extra_enum
++	@echo \$@
++	@cat $^ | \${ODIR}generate -s 1201 -o \$@ -p enumlist_ -d -f -
++
++\${ODIR}_override.c: \${ODIR}override.luac \${ODIR}file2c
++	@echo \$@
++	@\${ODIR}file2c < \$^ > \$@
++	
++data/gtkdata.structs.c:
++	(cd data; ../script/gen-list.pl)
++
++build-linux/%.o: build-linux/%.c
++	@echo \$@
++	@\${CC} \${CFLAGS} -c -o \$@ \$<
++
++build-linux/%.o: src/%.c
++	@echo \$@
++	@\${CC} \${CFLAGS} -c -o \$@ \$<
++
++build-linux/%.s: src/%.c
++	@echo \$@
++	@\${CC} \${CFLAGS} -S -o \$@ \$<
++
++build-linux/%.luac: src/%.lua
++	@echo \$@
++	@luac -s -o \$@ \$<
++
++clean:
++	rm -f \${ODIR}libluagtk2.so \${ODIR}generate \${ODIR}_*.c \${ODIR}*.o
++	rm -f \${ODIR}file2c \${ODIR}override.luac \${ODIR}main
++
++install: all
++	mkdir -p ~/.lua50
++	cp gtk2.lua ~/.lua50
++	ln -sf \$(PWD)/build-linux/libluagtk2.so ~/.lua50
++
++tar:
++	(cd ..; ln -s lua-gtk2 lua-gtk2-\${VERSION}; tar czvhf lua-gtk2-\${VERSION}.tar.gz \\
++	lua-gtk2-\${VERSION} --exclude old --exclude "build-*" --exclude foreign --exclude lua50 \\
++	--exclude test-dll; rm lua-gtk2-\${VERSION})
++
++EOF
++
++mkdir -p build-linux build-win32
++
+diff -NbBur lua-gtk2-0.3_orig/gtk2.lua lua-gtk2-0.3/gtk2.lua
+--- lua-gtk2-0.3_orig/gtk2.lua	2005-08-16 19:26:14.000000000 +0200
++++ lua-gtk2-0.3/gtk2.lua	1970-01-01 01:00:00.000000000 +0100
+@@ -1,16 +0,0 @@
+-
+--- if compiled in, _gtk is set.
+-if _gtk == nil then
+-
+-	local init, err = loadlib(os.getenv("HOME") .. "/.lua50/libluagtk2.so",
+-		"luaopen_gtk2")
+-	if err then
+-	    print(err)
+-	    return
+-	end
+-	gtk = init()
+-
+-else
+-	gtk = _gtk
+-end
+-
+diff -NbBur lua-gtk2-0.3_orig/gtk2.lua.in lua-gtk2-0.3/gtk2.lua.in
+--- lua-gtk2-0.3_orig/gtk2.lua.in	1970-01-01 01:00:00.000000000 +0100
++++ lua-gtk2-0.3/gtk2.lua.in	2006-05-15 01:20:24.000000000 +0200
+@@ -0,0 +1,16 @@
++
++-- if compiled in, _gtk is set.
++if _gtk == nil then
++
++	local init, err = loadlib("PREFIX/lib/lua50/libluagtk2.so",
++		"luaopen_gtk2")
++	if err then
++	    print(err)
++	    return
++	end
++	gtk = init()
++
++else
++	gtk = _gtk
++end
++
+diff -NbBur lua-gtk2-0.3_orig/Makefile lua-gtk2-0.3/Makefile
+--- lua-gtk2-0.3_orig/Makefile	2005-08-16 19:32:08.000000000 +0200
++++ lua-gtk2-0.3/Makefile	2006-05-16 03:09:41.000000000 +0200
+@@ -1,31 +1,46 @@
+ # automatically generated makefile
+ 
+-# CFLAGS	:=-DLINUX -Os -fomit-frame-pointer -Wall -DXTHREADS -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include//lua50   -I build-linux -I src
+-# CFLAGS	:=-DLINUX -O2 -fomit-frame-pointer -Wall -DXTHREADS -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include//lua50   -I build-linux -I src
+-CFLAGS	:=-DLINUX -g -Wall -DXTHREADS -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include//lua50   -I build-linux -I src
++PACKAGE_CFLAGS	=-g -Wall -DLINUX -Os -fomit-frame-pointer -Wall -DXTHREADS -DXUSE_MTSAFE_API `pkg-config --cflags gtk+-2.0`
+ HASH	:=hash2
+ ODIR	:=build-linux/
+ VERSION	:=0.3
+-CC	:=gcc-4.0
++CC	:=arm-linux-gcc
++HGCC	:=gcc
++PREFIX  := /usr/local
++LIBDIR  := $(PREFIX)/lib/
+ 
+-all: ${ODIR}libluagtk2.so ${ODIR}main
++all: ${ODIR}libluagtk2.so ${ODIR}main gtk2.lua
+ 
+-Makefile: configure
+-	./configure
++%.lua %.lua.in:
++	sed 's:PREFIX:$(PREFIX):' < '$@.in' > $@
+ 
+ ${ODIR}libluagtk2.so: ${ODIR}libluagtk2.o ${ODIR}${HASH}.o ${ODIR}hash.o ${ODIR}_funclist.o ${ODIR}_structlist.o ${ODIR}_enumlist.o ${ODIR}_override.o
+ 	@echo $@
+-	@${CC} -shared -o $@ $^ /usr/lib/libffi.a 
++	@${CC} -shared -o $@ $^ ${LIBDIR}/libffi.a 
+ 
+-${ODIR}generate: ${ODIR}generate.o ${ODIR}${HASH}.o
++${ODIR}file2c:
++	@echo $@
++	@${HGCC} -o $@ src/file2c.c
++	
++${ODIR}generate.o:
++	@echo $@
++	@${HGCC} -c -o $@ src/generate.c
++
++${ODIR}${HASH}_host.o:
++	@echo $@
++	@${HGCC} -c -o $@ src/${HASH}.c
++
++${ODIR}generate: ${ODIR}generate.o ${ODIR}${HASH}_host.o
++	@echo $@
++	@${HGCC} -Wall -g -o $@ $^
+ 
+ ${ODIR}main.o: src/main.c
+ 	@echo $@
+-	@${CC} -Wall -c -g -o $@ $^ -I /usr/include/lua50
++	@${HGCC} $(CFLAGS) -Wall -c -g -o $@ $^ -I /usr/include/lua50
+ 
+ ${ODIR}main: ${ODIR}main.o
+ 	@echo $@
+-	@${CC} -o $@ $^ -llua50 -llualib50
++	@${HGCC} $(CFLAGS) $(PACKAGE_CFLAGS) -o $@ $^ -llua -llualib
+ 
+ ${ODIR}libluagtk2.o: src/libluagtk2.c ${ODIR}_typelist.c src/structinfo.h src/hash.h
+ 
+@@ -52,15 +67,15 @@
+ 
+ build-linux/%.o: build-linux/%.c
+ 	@echo $@
+-	@${CC} ${CFLAGS} -c -o $@ $<
++	@${CC} $(PACKAGE_CFLAGS) $(CFLAGS) -c -o $@ $<
+ 
+ build-linux/%.o: src/%.c
+ 	@echo $@
+-	@${CC} ${CFLAGS} -c -o $@ $<
++	@${CC} $(PACKAGE_CFLAGS) $(CFLAGS) -c -o $@ $<
+ 
+ build-linux/%.s: src/%.c
+ 	@echo $@
+-	@${CC} ${CFLAGS} -S -o $@ $<
++	@${CC} $(PACKAGE_CFLAGS) $(CFLAGS) -S -o $@ $<
+ 
+ build-linux/%.luac: src/%.lua
+ 	@echo $@
+@@ -68,12 +83,13 @@
+ 
+ clean:
+ 	rm -f ${ODIR}libluagtk2.so ${ODIR}generate ${ODIR}_*.c ${ODIR}*.o
+-	rm -f ${ODIR}file2c ${ODIR}override.luac ${ODIR}main
++	rm -f ${ODIR}file2c ${ODIR}override.luac ${ODIR}main gtk2.lua
+ 
+ install: all
+-	mkdir -p ~/.lua50
+-	cp gtk2.lua ~/.lua50
+-	ln -sf $(PWD)/build-linux/libluagtk2.so ~/.lua50
++	install -d $(DESTDIR)/$(PREFIX)/share/lua
++	install gtk2.lua $(DESTDIR)/$(PREFIX)/share/lua
++	install -d $(DESTDIR)/$(PREFIX)/lib/lua50
++	install $(PWD)/build-linux/libluagtk2.so $(DESTDIR)/$(PREFIX)/lib/lua50
+ 
+ tar:
+ 	(cd ..; ln -s lua-gtk2 lua-gtk2-${VERSION}; tar czvhf lua-gtk2-${VERSION}.tar.gz \
+diff -NbBur lua-gtk2-0.3_orig/src/libluagtk2.c lua-gtk2-0.3/src/libluagtk2.c
+--- lua-gtk2-0.3_orig/src/libluagtk2.c	2005-08-16 18:22:00.000000000 +0200
++++ lua-gtk2-0.3/src/libluagtk2.c	2006-05-15 01:31:09.000000000 +0200
+@@ -27,9 +27,9 @@
+ 
+ static const char *dll_list[] = {
+ #ifdef LINUX
+-    "/usr/lib/libgtk-x11-2.0.so",
+-    "/usr/lib/libgdk-x11-2.0.so",
+-    "/usr/lib/libpango-1.0.so",
++    "/usr/lib/libgtk-x11-2.0.so.0",
++    "/usr/lib/libgdk-x11-2.0.so.0",
++    "/usr/lib/libpango-1.0.so.0",
+ #endif
+ #ifdef WIN32
+     "C:/GTK/bin/libgtk-win32-2.0-0.dll",
diff --git a/packages/lua/lua-gtk2_0.3.bb b/packages/lua/lua-gtk2_0.3.bb
new file mode 100644
index 0000000000..4071bb1f04
--- /dev/null
+++ b/packages/lua/lua-gtk2_0.3.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "GTK bindings for LUA"
+LICENSE = "GPL2"
+PRIORITY = "optional"
+DEPENDS = "gtk+ lua-native perl-native readline libffi"
+RDEPENDS = "lua"
+MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
+SECTION = "libs"
+
+inherit gpe
+
+SRC_URI = "http://luaforge.net/frs/download.php/989/${P}.tar.gz \
+	file://lua-gtk2-0.3_fixbuild.patch;patch=1"
+
+FILES_${PN} =  "${datadir}/lua   ${libdir}/lua50"
+
+CFLAGS_append = " -I '${S}/build-linux' -I src -DLINUX -I${STAGING_INCDIR} -L${STAGING_LIBDIR} -L${STAGING_LIBDIR}/../../${BUILD_SYS}/lib"
+
+do_compile () {
+	oe_runmake PREFIX='${prefix}' HGCC='${BUILD_CC}' LIBDIR='${STAGING_LIBDIR}' ODIR='build-linux/' CFLAGS='${CFLAGS}'
+}
+
+do_configure_append () {
+	cd ${S} && mkdir build-linux
+}
diff --git a/packages/lua/lua-native_5.0.2.bb b/packages/lua/lua-native_5.0.2.bb
index 6a742e4a13..16ae4290c8 100644
--- a/packages/lua/lua-native_5.0.2.bb
+++ b/packages/lua/lua-native_5.0.2.bb
@@ -1,6 +1,6 @@
 include lua.inc
 
-PR = "r1"
+PR = "r2"
 DEPENDS += "readline-native"
 SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz \
 	   file://debian.patch;patch=1 \
@@ -10,5 +10,6 @@ SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz \
 S = "${WORKDIR}/lua-${PV}"
 FILESPATH = "${FILE_DIRNAME}/lua-${PV}:${FILE_DIRNAME}/lua:${FILE_DIRNAME}/files"
 
-include lua-build.inc
 inherit native
+include lua-build.inc
+
diff --git a/packages/pipepanic/files/.mtn2git_empty b/packages/pipepanic/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pipepanic/files/.mtn2git_empty
diff --git a/packages/pipepanic/files/fix-datadir.patch b/packages/pipepanic/files/fix-datadir.patch
new file mode 100644
index 0000000000..b7df38a3fb
--- /dev/null
+++ b/packages/pipepanic/files/fix-datadir.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- pipepanic-0.1.1-source/main.h~fix-datadir
++++ pipepanic-0.1.1-source/main.h
+@@ -20,7 +20,7 @@
+ #define FALSE 0
+ #define TRUE 1
+ #define VERSION "0.1.1"
+-#define DATADIR "/opt/QtPalmtop/share/pipepanic/"
++#define DATADIR "/usr/share"
+ #define DIGITS24BMP "digits24.bmp"
+ #define DIGITS48BMP "digits48.bmp"
+ #define TILES24BMP "tiles24.bmp"
diff --git a/packages/pipepanic/pipepanic_0.1.1.bb b/packages/pipepanic/pipepanic_0.1.1.bb
index ac54f119a4..9538f8b547 100644
--- a/packages/pipepanic/pipepanic_0.1.1.bb
+++ b/packages/pipepanic/pipepanic_0.1.1.bb
@@ -3,8 +3,10 @@ Connect as many different shaped pipes together as possible within the time give
 HOMEPAGE = "http://www.users.waitrose.com/~thunor/pipepanic/"
 LICENSE = "GPL"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+PR = "r1"
 
-SRC_URI = "http://www.users.waitrose.com/~thunor/pipepanic/dload/pipepanic-${PV}-source.tar.gz"
+SRC_URI = "http://www.users.waitrose.com/~thunor/pipepanic/dload/pipepanic-${PV}-source.tar.gz \
+           file://fix-datadir.patch;patch=1"
 S = "${WORKDIR}/pipepanic-0.1.1-source"
 
 APPIMAGE = "zaurus/pipepanic.png"
@@ -19,5 +21,8 @@ do_compile() {
 do_install() {
 	install -d ${D}${bindir}
 	install -m 0755 pipepanic ${D}${bindir}
+
+	install -d ${D}${datadir}/pipepanic
+	install -m 0644 *.bmp ${D}${datadir}/pipepanic/
 }
 
diff --git a/packages/vmedit/.mtn2git_empty b/packages/vmedit/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/vmedit/.mtn2git_empty
diff --git a/packages/vmedit/vmedit_0.01.bb b/packages/vmedit/vmedit_0.01.bb
new file mode 100644
index 0000000000..86cc3f85ec
--- /dev/null
+++ b/packages/vmedit/vmedit_0.01.bb
@@ -0,0 +1,15 @@
+LICENSE = "GPL"
+inherit gpe
+
+DEPENDS = "gtk+ libgpewidget gpe-icons"
+RDEPENDS = "gpe-icons"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+SECTION = "gpe"
+DESCRIPTION = "This is a small GTK based multi-tab text editor."
+AUTHOR = "Vladimir Martinek <vm@sykora.cz>"
+
+SRC_URI="http://194.213.43.198/${PN}/${P}.tar.gz"
+
+do_install () {
+	oe_runmake install-program DESTDIR=${D} PREFIX=${prefix}
+}
diff --git a/packages/wifi-radar/.mtn2git_empty b/packages/wifi-radar/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/wifi-radar/.mtn2git_empty
diff --git a/packages/wifi-radar/files/.mtn2git_empty b/packages/wifi-radar/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/wifi-radar/files/.mtn2git_empty
diff --git a/packages/wifi-radar/files/wifi-radar.patch b/packages/wifi-radar/files/wifi-radar.patch
new file mode 100644
index 0000000000..da34dfb50c
--- /dev/null
+++ b/packages/wifi-radar/files/wifi-radar.patch
@@ -0,0 +1,37 @@
+--- wifi-radar-1.9.6/wifi-radar	2006-03-28 00:41:40.000000000 +0200
++++ wifi-radar-1.9.6/wifi-radar.new	2006-05-14 22:50:25.000000000 +0200
+@@ -73,7 +73,7 @@
+ #
+ # List of supported DHCP clients in order of preference
+ #
+-POSSIBLE_DHCP_CLIENTS = "dhcpcd dhclient pump"
++POSSIBLE_DHCP_CLIENTS = "udhcpc dhcpcd dhclient pump"
+ DHCP_TIMEOUT	= 30
+ HOSTNAME = socket.gethostname()
+ 
+@@ -81,7 +81,13 @@
+ 	DHCP_COMMAND = which( i )
+ 	if DHCP_COMMAND:
+ 	
+-		if i == "dhcpcd":
++		if i == "udhcpc":
++		    DHCP_PIDFILE        = "/var/run/udhcpc.%s.pid" % INTERFACE
++		    DHCP_ARGS = "-p " + DHCP_PIDFILE + " -i"
++		    DHCP_KILL_COMMAND = "" # no kill command available
++		    break
++
++		elif i == "dhcpcd":
+ 		    DHCP_PIDFILE        = "/var/run/dhcpcd-%s.pid" % INTERFACE
+ 			#
+ 		    # See "man dhcpcd-bin" or "man dhcpcd" for additional options.
+@@ -138,8 +144,8 @@
+ # WPA_SUPPLICANT
+ WPA_SUPPLICANT_COMMAND	= "/usr/sbin/wpa_supplicant"
+ WPA_SUPPLICANT_KILL_COMMAND=""
+-WPA_SUPPLICANT_CONF="/etc/wpa_supplicant/wpa_supplicant.conf"
+-WPA_DRIVER="ipw"
++WPA_SUPPLICANT_CONF="/etc/wpa_supplicant.conf"
++WPA_DRIVER="hostap"
+ WPA_SUPPLICANT_PIDFILE	= "/var/run/wpa_supplicant.pid" 
+ WPA_SUPPLICANT_ARGS	= "-B -i " + INTERFACE + " -c " + WPA_SUPPLICANT_CONF + " -D " + WPA_DRIVER + " -p " + WPA_SUPPLICANT_PIDFILE
+ 
diff --git a/packages/wifi-radar/files/wifi-radar_destktop.patch b/packages/wifi-radar/files/wifi-radar_destktop.patch
new file mode 100644
index 0000000000..ce0dd91464
--- /dev/null
+++ b/packages/wifi-radar/files/wifi-radar_destktop.patch
@@ -0,0 +1,13 @@
+--- wifi-radar-1.9.6/wifi-radar.desktop	2006-02-08 23:27:46.000000000 +0100
++++ wifi-radar-1.9.6/wifi-radar.desktop.new	2006-05-14 22:06:29.000000000 +0200
+@@ -5,8 +5,8 @@
+ Name=Wifi-radar
+ GenericName=Wireless tool
+ Comment=Tool for connecting to wireless networks
+-Icon=wifi-radar.svg
++Icon=wifi-radar.png
+ FilePattern=wifi-radar
+ TryExec=wifi-radar
+-Exec=gksudo -S wifi-radar
++Exec=wifi-radar
+ Categories=Application;Network;
diff --git a/packages/wifi-radar/wifi-radar_1.9.6.bb b/packages/wifi-radar/wifi-radar_1.9.6.bb
new file mode 100644
index 0000000000..70e913e086
--- /dev/null
+++ b/packages/wifi-radar/wifi-radar_1.9.6.bb
@@ -0,0 +1,35 @@
+SECTION = "x11/network"
+DESCRIPTION="WiFi Radar is a Python/PyGTK2  utility for managing WiFi profiles."
+HOMEPAGE="http://www.bitbuilder.com/wifi_radar/"
+LICENSE = "GPL"
+
+PACKAGE_ARCH = "all"
+
+RDEPENDS = "python-core python-pygtk2 python-re python-io"
+
+SRC_URI="http://wifi-radar.systemimager.org/pub/${PN}-${PV}.tar.bz2 \
+        file://wifi-radar.patch;patch=1 \
+        file://wifi-radar_destktop.patch;patch=1 "
+
+
+S = "${WORKDIR}/${PN}-${PV}"
+
+do_install() {
+    oe_runmake sbindir=${D}${sbindir} initdir=${D}${sysconfdir}/init.d sysconfdir=${D}${sysconfdir} mandir=${D}${mandir} pixmapsdir=${D}${datadir}/pixmaps appsdir=${D}${datadir}/applications install
+
+    #sbindir 	= /usr/sbin
+    #initdir 	= /etc/init.d
+    #sysconfdir 	= /etc/wifi-radar
+    #mandir 		= /usr/share/man
+    #pixmapsdir 	= /usr/share/pixmaps
+    #appsdir 	= /usr/share/applications
+}
+
+pkg_postinst() {
+#!/bin/sh
+# post installation script
+echo "*******************************************"
+echo "Please edit /etc/wifi-radar.conf"
+echo "to match your wifi card name (wlan0, eth0, ...)"
+echo "*******************************************"
+}
diff --git a/packages/xlibs/libxss_1.0.1.bb b/packages/xlibs/libxss_1.0.1.bb
index fa6cb61ec7..92dd4c82c4 100644
--- a/packages/xlibs/libxss_1.0.1.bb
+++ b/packages/xlibs/libxss_1.0.1.bb
@@ -7,7 +7,7 @@ DEPENDS = "libx11 libxext xextproto scrnsaverproto"
 PROVIDES = "libxss"
 RREPLACES = "libxss"
 
-XORG_PN = "libXscrnSaver"
+XORG_PN = "libXScrnSaver"
 
 include xorg-xlibs.inc