6 files changed, 57 insertions, 17 deletions
diff --git a/recipes/wt/wt3-3.1.0a/noqt.patch b/recipes/wt/wt3-3.1.0a/noqt.patch
new file mode 100644
index 0000000000..48231246d3
--- /dev/null
+++ b/recipes/wt/wt3-3.1.0a/noqt.patch
@@ -0,0 +1,19 @@
+Index: wt-3.0.0/CMakeLists.txt
+===================================================================
+--- wt-3.0.0.orig/CMakeLists.txt	2009-11-12 18:50:12.087842114 +0100
++++ wt-3.0.0/CMakeLists.txt	2009-11-12 18:50:42.023261611 +0100
+@@ -111,10 +111,10 @@
+ INCLUDE(cmake/WtFindSsl.txt)
+ INCLUDE(cmake/WtFindMysqlpp.txt)
+ 
+-FIND_PACKAGE(Qt4)
+-IF(QT_FOUND)
+-  INCLUDE(${QT_USE_FILE})
+-ENDIF(QT_FOUND)
++#FIND_PACKAGE(Qt4)
++#IF(QT_FOUND)
++#  INCLUDE(${QT_USE_FILE})
++#ENDIF(QT_FOUND)
+ 
+ # Boost is used nearly everywhere, so we can put these here
+ INCLUDE_DIRECTORIES(${BOOST_INCLUDE_DIRS})
diff --git a/recipes/wt/wt3-3.1.0a/wgooglemap.patch b/recipes/wt/wt3-3.1.0a/wgooglemap.patch
new file mode 100644
index 0000000000..6827afbbe7
--- /dev/null
+++ b/recipes/wt/wt3-3.1.0a/wgooglemap.patch
@@ -0,0 +1,17 @@
+Index: wt-3.0.0/src/Wt/WGoogleMap.C
+===================================================================
+--- wt-3.0.0.orig/src/Wt/WGoogleMap.C	2009-09-01 17:46:54.000000000 +0200
++++ wt-3.0.0/src/Wt/WGoogleMap.C	2009-11-12 16:23:39.614976154 +0100
+@@ -26,6 +26,12 @@
+ using std::min;
+ using std::max;
+ 
++#if not defined(_GLIBCXX_HAVE__SINL) && not defined(acosl)
++#define cosl cos
++#define acosl acos
++#define sinl sin
++#endif
++
+ #ifndef M_PI
+ #define M_PI 3.14159265358979323846
+ #endif
diff --git a/recipes/wt/wt3.inc b/recipes/wt/wt3.inc
index 1734212f63..db4e95dcbb 100644
--- a/recipes/wt/wt3.inc
+++ b/recipes/wt/wt3.inc
@@ -5,12 +5,12 @@ LICENSE = "GPL"
 HOMEPAGE = "http://www.webtoolkit.eu/wt"
 DEPENDS = "boost zlib openssl"
 
-INC_PR = "r0"
+INC_PR = "r1"
 
 # package wt3 is for wt 2.99 and wt 3.*
 # the api of these versions is incompatible with 2.*
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/witty/wt-${PV}.tar.gz \
+SRC_URI = "${SOURCEFORGE_MIRROR}/witty/wt-${PV}.tar.gz;name=tarball \
 	file://ext.patch;patch=1 \
 	file://wgooglemap.patch;patch=1"
 
@@ -21,9 +21,11 @@ FILES_${PN}-dev += "${datadir}/cmake-2.*"
 
 S = "${WORKDIR}/wt-${PV}"
 
+OECMAKE_BUILDPATH = "build"
+
 inherit cmake
 
+
 EXTRA_OECMAKE = "-DBOOST_DIR=${STAGING_DIR_HOST}${prefix} \
-		 -DUseQt4=0 \
+		 -DUseQt4=0 ../ \
                 "
-
diff --git a/recipes/wt/wt3_3.0.0.bb b/recipes/wt/wt3_3.0.0.bb
index 665590a7d4..69c9abd62e 100644
--- a/recipes/wt/wt3_3.0.0.bb
+++ b/recipes/wt/wt3_3.0.0.bb
@@ -1,6 +1,8 @@
 require wt3.inc
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 SRC_URI += "file://noqt.patch;patch=1"
 
+SRC_URI[tarball.md5sum] = "ba03acf8089dff38e106661aa1ecdcb9"
+SRC_URI[tarball.sha256sum] = "d439e96d2de8c22f682b5d3d5894974d50b3a36057a002bda1ad1cb858cd3b28"
diff --git a/recipes/wt/wt3_3.1.0a.bb b/recipes/wt/wt3_3.1.0a.bb
new file mode 100644
index 0000000000..8072ba98b7
--- /dev/null
+++ b/recipes/wt/wt3_3.1.0a.bb
@@ -0,0 +1,11 @@
+require wt3.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://noqt.patch;patch=1"
+
+SRC_URI[tarball.md5sum] = "9b2f4abc2e50d1fa15648834f5830d87"
+SRC_URI[tarball.sha256sum] = "97c8ddcd690381c4cd787b0099e753954c11016321fa991268c92276351fbc4c"
+
+S = "${WORKDIR}/wt-3.1.0"
+
diff --git a/recipes/wt/wt_2.2.3.bb b/recipes/wt/wt_2.2.3.bb
index 49fad6de91..573cce5f6a 100644
--- a/recipes/wt/wt_2.2.3.bb
+++ b/recipes/wt/wt_2.2.3.bb
@@ -4,7 +4,7 @@ SECTION = "devel"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.webtoolkit.eu/wt"
 DEPENDS = "boost zlib openssl"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/witty/wt-${PV}.tar.gz \
 	file://cmakelist.patch;patch=1"
@@ -21,14 +21,3 @@ STAGE_TEMP = "${WORKDIR}/temp-staging"
 do_configure_append() {
 	${BUILD_CXX} ${BUILD_CXXFLAGS} -o src/filetostring src/web/skeleton/FileToString.C
 }
-
-do_stage() {
-	rm -rf ${STAGE_TEMP}
-	mkdir -p ${STAGE_TEMP}
-	oe_runmake DESTDIR="${STAGE_TEMP}" install
-	cp -pPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
-	cp -pPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
-	cp -pPR ${STAGE_TEMP}/${datadir}/cmake-2.* ${STAGING_DATADIR}
-	rm -rf ${STAGE_TEMP}
-}
-