qwt: add 6.0.1 version

- only the qwt-e version is compile and run tested ATM

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

6 files changed, 108 insertions, 20 deletions

diff --git a/meta-oe/recipes-qt/qwt/files/qwt6.patch b/meta-oe/recipes-qt/qwt/files/qwt6.patch
new file mode 100644
index 000000000..4fb1a9bdf
--- /dev/null
+++ b/meta-oe/recipes-qt/qwt/files/qwt6.patch
@@ -0,0 +1,86 @@
+- add support for SUFFIX_STR
+---
+diff --git a/examples/examples.pri b/examples/examples.pri
+index a6911c8..854ce89 100644
+--- a/examples/examples.pri
++++ b/examples/examples.pri
+@@ -13,9 +13,17 @@ include( $${QWT_ROOT}/qwtbuild.pri )
+ 
+ TEMPLATE     = app
+ 
++SUFFIX_STR =
++CONFIG(debug, debug|release) {
++    SUFFIX_STR = $${DEBUG_SUFFIX}
++}
++else {
++    SUFFIX_STR = $${RELEASE_SUFFIX}
++}
++
+ INCLUDEPATH += $${QWT_ROOT}/src
+ DEPENDPATH  += $${QWT_ROOT}/src
+-DESTDIR      = $${QWT_ROOT}/examples/bin
++DESTDIR      = $${QWT_ROOT}/examples/bin$${SUFFIX_STR}
+ 
+ QMAKE_RPATHDIR *= $${QWT_ROOT}/lib
+ 
+diff --git a/qwtconfig.pri b/qwtconfig.pri
+index b0d2110..be119b7 100644
+--- a/qwtconfig.pri
++++ b/qwtconfig.pri
+@@ -30,6 +30,13 @@ QWT_INSTALL_DOCS      = $${QWT_INSTALL_PREFIX}/doc
+ QWT_INSTALL_HEADERS   = $${QWT_INSTALL_PREFIX}/include
+ QWT_INSTALL_LIBS      = $${QWT_INSTALL_PREFIX}/lib
+ 
++DEBUG_SUFFIX        = 
++RELEASE_SUFFIX      = 
++
++win32 {
++    DEBUG_SUFFIX      = d
++}
++
+ ######################################################################
+ # Designer plugin
+ ######################################################################
+diff --git a/src/src.pro b/src/src.pro
+index beb7125..ebf8ea6 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -13,8 +13,16 @@ QWT_ROOT = $${PWD}/..
+ include( $${QWT_ROOT}/qwtconfig.pri )
+ include( $${QWT_ROOT}/qwtbuild.pri )
+ 
++SUFFIX_STR =
++CONFIG(debug, debug|release) {
++    SUFFIX_STR = $${DEBUG_SUFFIX}
++}
++else {
++    SUFFIX_STR = $${RELEASE_SUFFIX}
++}
++
+ TEMPLATE          = lib
+-TARGET            = $$qtLibraryTarget(qwt)
++TARGET            = $$qtLibraryTarget(qwt)$${SUFFIX_STR}
+ 
+ DESTDIR           = $${QWT_ROOT}/lib
+ 
+diff --git a/textengines/mathml/mathml.pro b/textengines/mathml/mathml.pro
+index b0ed9f9..403828b 100644
+--- a/textengines/mathml/mathml.pro
++++ b/textengines/mathml/mathml.pro
+@@ -12,7 +12,15 @@ message(Beside the Qwt license you also have to take care of its license. )
+ 
+ include( $${PWD}/../textengines.pri )
+ 
+-TARGET    = $$qtLibraryTarget(qwtmathml)
++SUFFIX_STR =
++CONFIG(debug, debug|release) {
++    SUFFIX_STR = $${DEBUG_SUFFIX}
++}
++else {
++    SUFFIX_STR = $${RELEASE_SUFFIX}
++}
++
++TARGET    = $$qtLibraryTarget(qwtmathml$${SUFFIX_STR})
+ QT       += xml
+ 
+ HEADERS = \
diff --git a/meta-oe/recipes-qt/qwt/qwt-e_5.2.1.bb b/meta-oe/recipes-qt/qwt/qwt-e_5.2.1.bb
deleted file mode 100644
index 2f5506106..000000000
--- a/meta-oe/recipes-qt/qwt/qwt-e_5.2.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-inherit qt4e
-
-require qwt.inc
-
-SRC_URI[qwt.md5sum] = "4a595b8db0ec3856b117836c1d60cb27"
-SRC_URI[qwt.sha256sum] = "e2b8bb755404cb3dc99e61f3e2d7262152193488f5fbe88524eb698e11ac569f"
-
-RPROVIDES_${PN}-dev = "libqwt-dev"
\ No newline at end of file
diff --git a/meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb b/meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb
new file mode 100644
index 000000000..7f0e43b5b
--- /dev/null
+++ b/meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb
@@ -0,0 +1,8 @@
+inherit qt4e
+
+require qwt.inc
+
+SRC_URI[qwt.md5sum] = "ace68558eab873e2da7e641179c4ef0c"
+SRC_URI[qwt.sha256sum] = "3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924dbfdc8003cb2"
+
+RPROVIDES_${PN}-dev = "libqwt-dev"
diff --git a/meta-oe/recipes-qt/qwt/qwt.inc b/meta-oe/recipes-qt/qwt/qwt.inc
index 7112336bd..a299ac838 100644
--- a/meta-oe/recipes-qt/qwt/qwt.inc
+++ b/meta-oe/recipes-qt/qwt/qwt.inc
@@ -5,15 +5,17 @@ SECTION = "libs"
 LICENSE = "QWTv1.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=dac2743472b0462ff3cfb4af42051c88"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tar.bz2;name=qwt"
+SRC_URI = "${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tar.bz2;name=qwt \
+        file://qwt6.patch \
+        "
 
 S = "${WORKDIR}/qwt-${PV}"
 
 do_configure_prepend() {
         sed -i -e 's:RELEASE_SUFFIX      = :RELEASE_SUFFIX      = ${QT_LIBINFIX}:' *.pri
-        sed -i -e s:lqwt:lqwt${QT_LIBINFIX}:g -e s:/usr/local/qwt-$\${QwtVersion}:${prefix}:g *.prf
-        sed -e 's/#CONFIG     += QwtExamples/CONFIG     += QwtExamples/g' -i qwtconfig.pri
-        sed -i -e s:/usr/local/qwt-${PV}:${D}${prefix}:g ${S}/*.pri
+        sed -i -e 's:qtAddLibrary(qwt:qtAddLibrary(qwt)${QT_LIBINFIX}:g' *.prf
+        sed -e 's/# QWT_CONFIG     += QwtExamples/QWT_CONFIG     += QwtExamples/g' -i qwtconfig.pri
+        sed -i -e 's:/usr/local/qwt-$$QWT_VERSION:${D}${prefix}:g' ${S}/*.pri
 }
 
 do_install() {
diff --git a/meta-oe/recipes-qt/qwt/qwt_5.2.1.bb b/meta-oe/recipes-qt/qwt/qwt_5.2.1.bb
deleted file mode 100644
index ea7b3d7d1..000000000
--- a/meta-oe/recipes-qt/qwt/qwt_5.2.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-inherit qt4x11
-
-require qwt.inc
-
-SRC_URI[qwt.md5sum] = "4a595b8db0ec3856b117836c1d60cb27"
-SRC_URI[qwt.sha256sum] = "e2b8bb755404cb3dc99e61f3e2d7262152193488f5fbe88524eb698e11ac569f"
-
-RPROVIDES_${PN}-dev = "libqwt-dev"
diff --git a/meta-oe/recipes-qt/qwt/qwt_6.0.1.bb b/meta-oe/recipes-qt/qwt/qwt_6.0.1.bb
new file mode 100644
index 000000000..e7eb7b748
--- /dev/null
+++ b/meta-oe/recipes-qt/qwt/qwt_6.0.1.bb
@@ -0,0 +1,8 @@
+inherit qt4x11
+
+require qwt.inc
+
+SRC_URI[qwt.md5sum] = "ace68558eab873e2da7e641179c4ef0c"
+SRC_URI[qwt.sha256sum] = "3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924dbfdc8003cb2"
+
+RPROVIDES_${PN}-dev = "libqwt-dev"