4 files changed, 73 insertions, 2 deletions
diff --git a/recipes/wvstreams/files/dont-forget-header.patch b/recipes/wvstreams/files/dont-forget-header.patch
new file mode 100644
index 0000000000..9befe49963
--- /dev/null
+++ b/recipes/wvstreams/files/dont-forget-header.patch
@@ -0,0 +1,13 @@
+Index: wvstreams-4.4.1/include/uniconfkey.h
+===================================================================
+--- wvstreams-4.4.1.orig/include/uniconfkey.h	2009-07-28 17:42:39.000000000 +0530
++++ wvstreams-4.4.1/include/uniconfkey.h	2009-07-28 17:42:55.000000000 +0530
+@@ -9,7 +9,7 @@
+ 
+ #include "wvstring.h"
+ #include "wvlinklist.h"
+-
++#include <limits.h>
+ 
+ // The Python headers try to #define ANY as void.  If we're building Python
+ // wrappers, get rid of that.
diff --git a/recipes/wvstreams/files/gcc4.3.patch b/recipes/wvstreams/files/gcc4.3.patch
new file mode 100644
index 0000000000..f7315eeefb
--- /dev/null
+++ b/recipes/wvstreams/files/gcc4.3.patch
@@ -0,0 +1,15 @@
+Index: wvstreams-4.4.1/include/wvserialize.h
+===================================================================
+--- wvstreams-4.4.1.orig/include/wvserialize.h	2009-07-28 17:46:50.000000000 +0530
++++ wvstreams-4.4.1/include/wvserialize.h	2009-07-28 17:48:30.000000000 +0530
+@@ -348,8 +348,9 @@
+  * (zero) character.  Serialized WvStrings are guaranteed not to contain nul
+  * except as the last character.
+  */
++/*No storage class allowed here as per gcc 4.3 specs*/
+ template <>
+-extern WvString _wv_deserialize<WvString>(WvBuf &buf);
++WvString _wv_deserialize<WvString>(WvBuf &buf);
+ 
+ 
+ /** Deserialize a WvBuf. */
diff --git a/recipes/wvstreams/wvstreams_4.4.1.bb b/recipes/wvstreams/wvstreams_4.4.1.bb
index 8cf1d1b5eb..c7a0d41a18 100644
--- a/recipes/wvstreams/wvstreams_4.4.1.bb
+++ b/recipes/wvstreams/wvstreams_4.4.1.bb
@@ -3,10 +3,14 @@ LICENSE = "LGPL"
 DESCRIPTION = "WvStreams is a network programming library in C++"
 DEPENDS = "zlib openssl (>= 0.9.8)"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://wvstreams.googlecode.com/files/${PN}-${PV}.tar.gz \
-           file://build-fixes-and-sanity.patch;patch=1 "
+	file://build-fixes-and-sanity.patch;patch=1 \
+	file://dont-forget-header.patch;patch=1 \
+	file://gcc4.3.patch;patch=1 \
+	"
+
 
 inherit autotools pkgconfig
 
diff --git a/recipes/wvstreams/wvstreams_4.6.bb b/recipes/wvstreams/wvstreams_4.6.bb
new file mode 100644
index 0000000000..32c70a3575
--- /dev/null
+++ b/recipes/wvstreams/wvstreams_4.6.bb
@@ -0,0 +1,39 @@
+HOMEPAGE = "http://alumnit.ca/wiki/index.php?page=WvStreams"
+LICENSE = "LGPL"
+DESCRIPTION = "WvStreams is a network programming library in C++"
+DEPENDS = "zlib openssl (>= 0.9.8)"
+
+SRC_URI = "http://wvstreams.googlecode.com/files/${PN}-${PV}.tar.gz \
+	"
+
+inherit autotools pkgconfig
+
+LDFLAGS_append = " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib"
+
+EXTRA_OECONF = " --without-tcl --without-qt --without-pam"
+
+PACKAGES_prepend = "libuniconf libuniconf-dbg "
+PACKAGES_prepend = "uniconfd uniconfd-dbg "
+PACKAGES_prepend = "libwvstreams-base libwvstreams-base-dbg "
+PACKAGES_prepend = "libwvstreams-extras libwvstreams-extras-dbg "
+
+FILES_libuniconf     = "${libdir}/libuniconf.so.*"
+FILES_libuniconf-dbg = "${libdir}/.debug/libuniconf.so.*"
+
+FILES_uniconfd     = "${sbindir}/uniconfd ${sysconfdir}/uniconf.conf ${localstatedir}/uniconf"
+FILES_uniconfd-dbg = "${sbindir}/.debug/uniconfd"
+
+FILES_libwvstreams-base     = "${libdir}/libwvutils.so.*"
+FILES_libwvstreams-base-dbg = "${libdir}/.debug/libwvutils.so.*"
+
+FILES_libwvstreams-extras     = "${libdir}/libwvbase.so.* ${libdir}/libwvstreams.so.*"
+FILES_libwvstreams-extras-dbg = "${libdir}/.debug/libwvbase.so.* ${libdir}/.debug/libwvstreams.so.*"
+
+
+do_stage() {
+    autotools_stage_all
+}
+do_configure() {
+        autoreconf
+        oe_runconf
+}