diff options
author | Eric BENARD <eric@eukrea.com> | 2012-04-12 15:09:48 +0000 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-04-13 10:50:39 +0200 |
commit | 5ad3d0d042dcd3f3bf54d44144b731cd0607b2e3 (patch) | |
tree | 4a7c44804405d980aa1b3cad761be58b120d3701 | |
parent | bc0243c2a27fed94d32b407ee476c73271d05afe (diff) | |
download | meta-openembedded-5ad3d0d042dcd3f3bf54d44144b731cd0607b2e3.tar.gz |
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>
-rw-r--r-- | meta-oe/recipes-qt/qwt/files/qwt6.patch | 86 | ||||
-rw-r--r-- | meta-oe/recipes-qt/qwt/qwt-e_5.2.1.bb | 8 | ||||
-rw-r--r-- | meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb | 8 | ||||
-rw-r--r-- | meta-oe/recipes-qt/qwt/qwt.inc | 10 | ||||
-rw-r--r-- | meta-oe/recipes-qt/qwt/qwt_5.2.1.bb | 8 | ||||
-rw-r--r-- | meta-oe/recipes-qt/qwt/qwt_6.0.1.bb | 8 |
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 @@ | |||
1 | - add support for SUFFIX_STR | ||
2 | --- | ||
3 | diff --git a/examples/examples.pri b/examples/examples.pri | ||
4 | index a6911c8..854ce89 100644 | ||
5 | --- a/examples/examples.pri | ||
6 | +++ b/examples/examples.pri | ||
7 | @@ -13,9 +13,17 @@ include( $${QWT_ROOT}/qwtbuild.pri ) | ||
8 | |||
9 | TEMPLATE = app | ||
10 | |||
11 | +SUFFIX_STR = | ||
12 | +CONFIG(debug, debug|release) { | ||
13 | + SUFFIX_STR = $${DEBUG_SUFFIX} | ||
14 | +} | ||
15 | +else { | ||
16 | + SUFFIX_STR = $${RELEASE_SUFFIX} | ||
17 | +} | ||
18 | + | ||
19 | INCLUDEPATH += $${QWT_ROOT}/src | ||
20 | DEPENDPATH += $${QWT_ROOT}/src | ||
21 | -DESTDIR = $${QWT_ROOT}/examples/bin | ||
22 | +DESTDIR = $${QWT_ROOT}/examples/bin$${SUFFIX_STR} | ||
23 | |||
24 | QMAKE_RPATHDIR *= $${QWT_ROOT}/lib | ||
25 | |||
26 | diff --git a/qwtconfig.pri b/qwtconfig.pri | ||
27 | index b0d2110..be119b7 100644 | ||
28 | --- a/qwtconfig.pri | ||
29 | +++ b/qwtconfig.pri | ||
30 | @@ -30,6 +30,13 @@ QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc | ||
31 | QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include | ||
32 | QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib | ||
33 | |||
34 | +DEBUG_SUFFIX = | ||
35 | +RELEASE_SUFFIX = | ||
36 | + | ||
37 | +win32 { | ||
38 | + DEBUG_SUFFIX = d | ||
39 | +} | ||
40 | + | ||
41 | ###################################################################### | ||
42 | # Designer plugin | ||
43 | ###################################################################### | ||
44 | diff --git a/src/src.pro b/src/src.pro | ||
45 | index beb7125..ebf8ea6 100644 | ||
46 | --- a/src/src.pro | ||
47 | +++ b/src/src.pro | ||
48 | @@ -13,8 +13,16 @@ QWT_ROOT = $${PWD}/.. | ||
49 | include( $${QWT_ROOT}/qwtconfig.pri ) | ||
50 | include( $${QWT_ROOT}/qwtbuild.pri ) | ||
51 | |||
52 | +SUFFIX_STR = | ||
53 | +CONFIG(debug, debug|release) { | ||
54 | + SUFFIX_STR = $${DEBUG_SUFFIX} | ||
55 | +} | ||
56 | +else { | ||
57 | + SUFFIX_STR = $${RELEASE_SUFFIX} | ||
58 | +} | ||
59 | + | ||
60 | TEMPLATE = lib | ||
61 | -TARGET = $$qtLibraryTarget(qwt) | ||
62 | +TARGET = $$qtLibraryTarget(qwt)$${SUFFIX_STR} | ||
63 | |||
64 | DESTDIR = $${QWT_ROOT}/lib | ||
65 | |||
66 | diff --git a/textengines/mathml/mathml.pro b/textengines/mathml/mathml.pro | ||
67 | index b0ed9f9..403828b 100644 | ||
68 | --- a/textengines/mathml/mathml.pro | ||
69 | +++ b/textengines/mathml/mathml.pro | ||
70 | @@ -12,7 +12,15 @@ message(Beside the Qwt license you also have to take care of its license. ) | ||
71 | |||
72 | include( $${PWD}/../textengines.pri ) | ||
73 | |||
74 | -TARGET = $$qtLibraryTarget(qwtmathml) | ||
75 | +SUFFIX_STR = | ||
76 | +CONFIG(debug, debug|release) { | ||
77 | + SUFFIX_STR = $${DEBUG_SUFFIX} | ||
78 | +} | ||
79 | +else { | ||
80 | + SUFFIX_STR = $${RELEASE_SUFFIX} | ||
81 | +} | ||
82 | + | ||
83 | +TARGET = $$qtLibraryTarget(qwtmathml$${SUFFIX_STR}) | ||
84 | QT += xml | ||
85 | |||
86 | 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 @@ | |||
1 | inherit qt4e | ||
2 | |||
3 | require qwt.inc | ||
4 | |||
5 | SRC_URI[qwt.md5sum] = "4a595b8db0ec3856b117836c1d60cb27" | ||
6 | SRC_URI[qwt.sha256sum] = "e2b8bb755404cb3dc99e61f3e2d7262152193488f5fbe88524eb698e11ac569f" | ||
7 | |||
8 | 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 @@ | |||
1 | inherit qt4e | ||
2 | |||
3 | require qwt.inc | ||
4 | |||
5 | SRC_URI[qwt.md5sum] = "ace68558eab873e2da7e641179c4ef0c" | ||
6 | SRC_URI[qwt.sha256sum] = "3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924dbfdc8003cb2" | ||
7 | |||
8 | 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" | |||
5 | LICENSE = "QWTv1.0" | 5 | LICENSE = "QWTv1.0" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=dac2743472b0462ff3cfb4af42051c88" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=dac2743472b0462ff3cfb4af42051c88" |
7 | 7 | ||
8 | SRC_URI = "${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tar.bz2;name=qwt" | 8 | SRC_URI = "${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tar.bz2;name=qwt \ |
9 | file://qwt6.patch \ | ||
10 | " | ||
9 | 11 | ||
10 | S = "${WORKDIR}/qwt-${PV}" | 12 | S = "${WORKDIR}/qwt-${PV}" |
11 | 13 | ||
12 | do_configure_prepend() { | 14 | do_configure_prepend() { |
13 | sed -i -e 's:RELEASE_SUFFIX = :RELEASE_SUFFIX = ${QT_LIBINFIX}:' *.pri | 15 | sed -i -e 's:RELEASE_SUFFIX = :RELEASE_SUFFIX = ${QT_LIBINFIX}:' *.pri |
14 | sed -i -e s:lqwt:lqwt${QT_LIBINFIX}:g -e s:/usr/local/qwt-$\${QwtVersion}:${prefix}:g *.prf | 16 | sed -i -e 's:qtAddLibrary(qwt:qtAddLibrary(qwt)${QT_LIBINFIX}:g' *.prf |
15 | sed -e 's/#CONFIG += QwtExamples/CONFIG += QwtExamples/g' -i qwtconfig.pri | 17 | sed -e 's/# QWT_CONFIG += QwtExamples/QWT_CONFIG += QwtExamples/g' -i qwtconfig.pri |
16 | sed -i -e s:/usr/local/qwt-${PV}:${D}${prefix}:g ${S}/*.pri | 18 | sed -i -e 's:/usr/local/qwt-$$QWT_VERSION:${D}${prefix}:g' ${S}/*.pri |
17 | } | 19 | } |
18 | 20 | ||
19 | do_install() { | 21 | 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 @@ | |||
1 | inherit qt4x11 | ||
2 | |||
3 | require qwt.inc | ||
4 | |||
5 | SRC_URI[qwt.md5sum] = "4a595b8db0ec3856b117836c1d60cb27" | ||
6 | SRC_URI[qwt.sha256sum] = "e2b8bb755404cb3dc99e61f3e2d7262152193488f5fbe88524eb698e11ac569f" | ||
7 | |||
8 | 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 @@ | |||
1 | inherit qt4x11 | ||
2 | |||
3 | require qwt.inc | ||
4 | |||
5 | SRC_URI[qwt.md5sum] = "ace68558eab873e2da7e641179c4ef0c" | ||
6 | SRC_URI[qwt.sha256sum] = "3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924dbfdc8003cb2" | ||
7 | |||
8 | RPROVIDES_${PN}-dev = "libqwt-dev" | ||