[oe-commits] Henning Heinold : wt3: update to version 3.0.0
git version control
git at git.openembedded.org
Fri Nov 13 06:54:16 UTC 2009
Module: openembedded.git
Branch: shr/merge
Commit: c29c0219c02010493d241113f8c9718eee6fc269
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=c29c0219c02010493d241113f8c9718eee6fc269
Author: Henning Heinold <heinold at inf.fu-berlin.de>
Date: Thu Nov 12 19:09:03 2009 +0100
wt3: update to version 3.0.0
* spilt up with .inc-file and switch to INC_PR
* disable qt explicit in CMakeLists.txt
---
conf/checksums.ini | 4 +++
recipes/wt/wt3-3.0.0/noqt.patch | 19 ++++++++++++++
recipes/wt/wt3-3.0.0/wgooglemap.patch | 17 ++++++++++++
recipes/wt/wt3.inc | 29 +++++++++++++++++++++
recipes/wt/wt3/cheader.patch | 24 +++++++++++++++++
recipes/wt/{wt3-2.99.0 => wt3}/ext.patch | 0
recipes/wt/wt3_2.99.0.bb | 41 +++--------------------------
recipes/wt/wt3_3.0.0.bb | 6 ++++
8 files changed, 104 insertions(+), 36 deletions(-)
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 3886f92..be49bf9 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -26998,6 +26998,10 @@ sha256=c6f692956d93765f12402a0b22617566decc52a9bb1a707b4e8d12affd1528d3
md5=3d35c181dfab7dfd3fe898738dffb421
sha256=64e6bd25d18e838e1c60693eccbd11926c65b228d6ac69c4dafc7ebe7341dbbf
+[http://downloads.sourceforge.net/witty/wt-3.0.0.tar.gz]
+md5=ba03acf8089dff38e106661aa1ecdcb9
+sha256=d439e96d2de8c22f682b5d3d5894974d50b3a36057a002bda1ad1cb858cd3b28
+
[http://downloads.sourceforge.net/wvware/wv-1.2.0.tar.gz]
md5=b6319d5e75611fe2210453b5feb82c0c
sha256=a76f44468e78591e6d510d326702e7c3999d2b9dd3ab8ab8c1c9811fd5b111e4
diff --git a/recipes/wt/wt3-3.0.0/noqt.patch b/recipes/wt/wt3-3.0.0/noqt.patch
new file mode 100644
index 0000000..4823124
--- /dev/null
+++ b/recipes/wt/wt3-3.0.0/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.0.0/wgooglemap.patch b/recipes/wt/wt3-3.0.0/wgooglemap.patch
new file mode 100644
index 0000000..6827afb
--- /dev/null
+++ b/recipes/wt/wt3-3.0.0/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
new file mode 100644
index 0000000..1734212
--- /dev/null
+++ b/recipes/wt/wt3.inc
@@ -0,0 +1,29 @@
+DESCRIPTION = "A C++ Web Toolkit"
+PRIORITY = "optional"
+SECTION = "devel"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.webtoolkit.eu/wt"
+DEPENDS = "boost zlib openssl"
+
+INC_PR = "r0"
+
+# 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 \
+ file://ext.patch;patch=1 \
+ file://wgooglemap.patch;patch=1"
+
+CXXFLAGS += "-Dsinl=sin -Dcosl=cos -Dasinl=asin"
+
+FILES_${PN} += "${datadir}/Wt"
+FILES_${PN}-dev += "${datadir}/cmake-2.*"
+
+S = "${WORKDIR}/wt-${PV}"
+
+inherit cmake
+
+EXTRA_OECMAKE = "-DBOOST_DIR=${STAGING_DIR_HOST}${prefix} \
+ -DUseQt4=0 \
+ "
+
diff --git a/recipes/wt/wt3/cheader.patch b/recipes/wt/wt3/cheader.patch
new file mode 100644
index 0000000..6f45b1a
--- /dev/null
+++ b/recipes/wt/wt3/cheader.patch
@@ -0,0 +1,24 @@
+Index: wt-2.99.0/src/Wt/Ext/Widget.C
+===================================================================
+--- wt-2.99.0.orig/src/Wt/Ext/Widget.C 2009-11-12 16:13:54.337530490 +0100
++++ wt-2.99.0/src/Wt/Ext/Widget.C 2009-11-12 16:14:35.268780586 +0100
+@@ -16,6 +16,7 @@
+ #include <iostream>
+ #include <sstream>
+ #include <cstring>
++#include <cstdio>
+
+ namespace Wt {
+
+Index: wt-2.99.0/src/Wt/WAbstractItemModel.C
+===================================================================
+--- wt-2.99.0.orig/src/Wt/WAbstractItemModel.C 2009-11-12 16:01:30.927610427 +0100
++++ wt-2.99.0/src/Wt/WAbstractItemModel.C 2009-11-12 16:03:33.458430052 +0100
+@@ -6,6 +6,7 @@
+
+ #include <boost/lexical_cast.hpp>
+ #include <boost/algorithm/string/predicate.hpp>
++#include <cstdio>
+
+ #include "Wt/WModelIndex"
+ #include "Wt/WAbstractItemModel"
diff --git a/recipes/wt/wt3-2.99.0/ext.patch b/recipes/wt/wt3/ext.patch
similarity index 100%
rename from recipes/wt/wt3-2.99.0/ext.patch
rename to recipes/wt/wt3/ext.patch
diff --git a/recipes/wt/wt3_2.99.0.bb b/recipes/wt/wt3_2.99.0.bb
index fea2849..ccfbc31 100644
--- a/recipes/wt/wt3_2.99.0.bb
+++ b/recipes/wt/wt3_2.99.0.bb
@@ -1,41 +1,10 @@
-DESCRIPTION = "A C++ Web Toolkit"
-PRIORITY = "optional"
-SECTION = "devel"
-LICENSE = "GPL"
-HOMEPAGE = "http://www.webtoolkit.eu/wt"
-DEPENDS = "boost zlib openssl"
-PR = "r0"
+require wt3.inc
-# package wt3 is for wt 2.99 and wt 3.*
-# the api of these versions is incompatible with 2.*
+PR = "${INC_PR}.1"
-SRC_URI = "${SOURCEFORGE_MIRROR}/witty/wt-${PV}.tar.gz \
- file://src.patch;patch=1 \
- file://ext.patch;patch=1 \
- file://wgooglemap.patch;patch=1"
-
-CXXFLAGS += "-Dsinl=sin -Dcosl=cos -Dasinl=asin"
-
-FILES_${PN} += "${datadir}/Wt"
-FILES_${PN}-dev += "${datadir}/cmake-2.*"
-
-S = "${WORKDIR}/wt-${PV}"
-
-inherit cmake
-
-STAGE_TEMP = "${WORKDIR}/temp-staging"
+SRC_URI += "file://src.patch;patch=1 \
+ "
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}
+ ${BUILD_CXX} ${BUILD_CXXFLAGS} -o src/filetostring src/web/skeleton/FileToString.C
}
-
diff --git a/recipes/wt/wt3_3.0.0.bb b/recipes/wt/wt3_3.0.0.bb
new file mode 100644
index 0000000..665590a
--- /dev/null
+++ b/recipes/wt/wt3_3.0.0.bb
@@ -0,0 +1,6 @@
+require wt3.inc
+
+PR = "${INC_PR}.1"
+
+SRC_URI += "file://noqt.patch;patch=1"
+
More information about the Openembedded-commits
mailing list