diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-01-07 15:57:45 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-01-14 11:30:15 +0100 |
| commit | 2bd11da4b50f401c9c49975aeedaaafa6a59d08b (patch) | |
| tree | db1b531c534d13cd51d0b9fa4c418b89e899879e /meta-oe/recipes-qt/qwt | |
| parent | 8700ba38804af3c27f3662737f679afa1bdc86da (diff) | |
| download | meta-openembedded-2bd11da4b50f401c9c49975aeedaaafa6a59d08b.tar.gz | |
recipes: remove recipes using or depending on qt4 bbclasses or recipes
* anki is removed because it runtime depends on python-pyqt, other
recipes are inheriting one of bbclasses removed from oe-core in:
commit cb89d2b25b4edb1241bc5426a69a6bc44df9be2c
Author: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Date: Fri Nov 27 15:48:20 2015 +0200
qt4: remove recipes and classes
* if you're still using one of these recipes add it to meta-qt4 layer
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-qt/qwt')
| -rw-r--r-- | meta-oe/recipes-qt/qwt/files/qwt6-fix-linking-with-ld-gold.patch | 34 | ||||
| -rw-r--r-- | meta-oe/recipes-qt/qwt/files/qwt6.patch | 86 | ||||
| -rw-r--r-- | meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb | 14 | ||||
| -rw-r--r-- | meta-oe/recipes-qt/qwt/qwt.inc | 40 | ||||
| -rw-r--r-- | meta-oe/recipes-qt/qwt/qwt_6.0.1.bb | 10 |
5 files changed, 0 insertions, 184 deletions
diff --git a/meta-oe/recipes-qt/qwt/files/qwt6-fix-linking-with-ld-gold.patch b/meta-oe/recipes-qt/qwt/files/qwt6-fix-linking-with-ld-gold.patch deleted file mode 100644 index 1fdd9cf4b3..0000000000 --- a/meta-oe/recipes-qt/qwt/files/qwt6-fix-linking-with-ld-gold.patch +++ /dev/null | |||
| @@ -1,34 +0,0 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | diff -urpN qwt-6.0.1_orig/qwtbuild.pri qwt-6.0.1/qwtbuild.pri | ||
| 4 | --- qwt-6.0.1_orig/qwtbuild.pri 2011-08-02 00:33:53.000000000 +1000 | ||
| 5 | +++ qwt-6.0.1/qwtbuild.pri 2012-08-21 10:27:30.721990849 +1000 | ||
| 6 | @@ -67,3 +67,13 @@ unix { | ||
| 7 | error( "local build will conflict with $${QMAKE_LIBDIR_QT}/libqwt.*" ) | ||
| 8 | } | ||
| 9 | } | ||
| 10 | + | ||
| 11 | +###################################################################### | ||
| 12 | +# libs for building qwt | ||
| 13 | +###################################################################### | ||
| 14 | + | ||
| 15 | +unix { | ||
| 16 | + # Some linkers require explicit linking with librt (eg ld.gold) | ||
| 17 | + LIBS += -lrt | ||
| 18 | +} | ||
| 19 | + | ||
| 20 | diff -urpN qwt-6.0.1_orig/qwt.prf qwt-6.0.1/qwt.prf | ||
| 21 | --- qwt-6.0.1_orig/qwt.prf 2011-08-02 00:33:51.000000000 +1000 | ||
| 22 | +++ qwt-6.0.1/qwt.prf 2012-08-21 11:19:49.435240439 +1000 | ||
| 23 | @@ -9,6 +9,11 @@ | ||
| 24 | |||
| 25 | include ( ./qwtconfig.pri ) | ||
| 26 | |||
| 27 | +unix { | ||
| 28 | + | ||
| 29 | + LIBS += -lrt | ||
| 30 | +} | ||
| 31 | + | ||
| 32 | contains(QWT_CONFIG, QwtDll) { | ||
| 33 | |||
| 34 | DEFINES *= QWT_DLL | ||
diff --git a/meta-oe/recipes-qt/qwt/files/qwt6.patch b/meta-oe/recipes-qt/qwt/files/qwt6.patch deleted file mode 100644 index 4fb1a9bdf8..0000000000 --- a/meta-oe/recipes-qt/qwt/files/qwt6.patch +++ /dev/null | |||
| @@ -1,86 +0,0 @@ | |||
| 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_6.0.1.bb b/meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb deleted file mode 100644 index c801309132..0000000000 --- a/meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | inherit qt4e | ||
| 2 | |||
| 3 | require qwt.inc | ||
| 4 | |||
| 5 | PR = "r1" | ||
| 6 | |||
| 7 | SRC_URI[qwt.md5sum] = "ace68558eab873e2da7e641179c4ef0c" | ||
| 8 | SRC_URI[qwt.sha256sum] = "3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924dbfdc8003cb2" | ||
| 9 | |||
| 10 | RPROVIDES_${PN}-dev = "libqwt-dev" | ||
| 11 | |||
| 12 | # Conflicts with qwt, only one qwt* can be built in world | ||
| 13 | # | Project ERROR: local build will conflict with sysroots/qemuarm/usr/lib/libqwt.* | ||
| 14 | EXCLUDE_FROM_WORLD = "1" | ||
diff --git a/meta-oe/recipes-qt/qwt/qwt.inc b/meta-oe/recipes-qt/qwt/qwt.inc deleted file mode 100644 index 60f73a6576..0000000000 --- a/meta-oe/recipes-qt/qwt/qwt.inc +++ /dev/null | |||
| @@ -1,40 +0,0 @@ | |||
| 1 | DESCRIPTION = "Qt Widget Extension for Technical Applications" | ||
| 2 | SECTION = "libs" | ||
| 3 | |||
| 4 | # LGPLv2.1 + some exceptions | ||
| 5 | LICENSE = "QWTv1.0" | ||
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=dac2743472b0462ff3cfb4af42051c88" | ||
| 7 | |||
| 8 | SRC_URI = "${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tar.bz2;name=qwt \ | ||
| 9 | file://qwt6.patch \ | ||
| 10 | file://qwt6-fix-linking-with-ld-gold.patch" | ||
| 11 | |||
| 12 | S = "${WORKDIR}/qwt-${PV}" | ||
| 13 | |||
| 14 | do_configure_prepend() { | ||
| 15 | sed -i -e 's:RELEASE_SUFFIX = :RELEASE_SUFFIX = ${QT_LIBINFIX}:' *.pri | ||
| 16 | sed -i -e 's:qtAddLibrary(qwt:qtAddLibrary(qwt)${QT_LIBINFIX}:g' *.prf | ||
| 17 | sed -e 's/# QWT_CONFIG += QwtExamples/QWT_CONFIG += QwtExamples/g' -i qwtconfig.pri | ||
| 18 | sed -i -e 's:/usr/local/qwt-$$QWT_VERSION:${D}${prefix}:g' ${S}/*.pri | ||
| 19 | } | ||
| 20 | |||
| 21 | do_install() { | ||
| 22 | oe_runmake -e install | ||
| 23 | install -d ${D}${datadir}/doc/${PN} | ||
| 24 | mv ${D}${prefix}/doc/* ${D}${datadir}/doc/${PN}/ | ||
| 25 | rmdir ${D}${prefix}/doc | ||
| 26 | cd ${S}/examples | ||
| 27 | install -d ${D}/${bindir} | ||
| 28 | cd bin${QT_LIBINFIX}/ | ||
| 29 | for i in * ; do | ||
| 30 | cp -pPR ${i} ${D}/${bindir}/${i}${QT_LIBINFIX} | ||
| 31 | done | ||
| 32 | install -d ${D}${libdir}/${QT_DIR_NAME} | ||
| 33 | mv ${D}${prefix}/plugins ${D}${libdir}/${QT_DIR_NAME} | ||
| 34 | } | ||
| 35 | |||
| 36 | PACKAGES_prepend = "${PN}-examples ${PN}-features ${PN}-plugins " | ||
| 37 | FILES_${PN}-examples = "${bindir}/*" | ||
| 38 | FILES_${PN}-features = "${prefix}/features" | ||
| 39 | FILES_${PN}-plugins = "${libdir}/${QT_DIR_NAME}/plugins/designer/*.so" | ||
| 40 | FILES_${PN}-dbg += "${libdir}/${QT_DIR_NAME}/plugins/designer/.debug" | ||
diff --git a/meta-oe/recipes-qt/qwt/qwt_6.0.1.bb b/meta-oe/recipes-qt/qwt/qwt_6.0.1.bb deleted file mode 100644 index f38816a901..0000000000 --- a/meta-oe/recipes-qt/qwt/qwt_6.0.1.bb +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | inherit qt4x11 | ||
| 2 | |||
| 3 | require qwt.inc | ||
| 4 | |||
| 5 | PR = "r1" | ||
| 6 | |||
| 7 | SRC_URI[qwt.md5sum] = "ace68558eab873e2da7e641179c4ef0c" | ||
| 8 | SRC_URI[qwt.sha256sum] = "3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924dbfdc8003cb2" | ||
| 9 | |||
| 10 | RPROVIDES_${PN}-dev = "libqwt-dev" | ||
