From 1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Thu, 8 Oct 2015 22:51:41 +0200 Subject: initial commit for Enea Linux 5.0 arm Signed-off-by: Tudor Florea --- meta-oe/recipes-qt/fingerterm/fingerterm_1.0.2.bb | 43 +++ meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc | 52 +++ .../recipes-qt/libconnman-qt/libconnman-qt_git.bb | 3 + ...n.pro-fix-build-with-custom-target-suffix.patch | 42 +++ .../recipes-qt/libconnman-qt/libconnman-qte_git.bb | 5 + meta-oe/recipes-qt/libqofono/libqofono_0.4.bb | 83 +++++ .../qcanobserver/qcanobserver-socketcan_svn.bb | 30 ++ ...erinterface.cpp-add-sys-socket.h-as-inclu.patch | 41 +++ .../0002-qconsole-writethread-gcc-4.5-fixes.patch | 40 +++ .../qcanobserver/qcanobserver/candemo.xml | 40 +++ .../nonworking/qcanobserver/qcanobserver_svn.bb | 41 +++ meta-oe/recipes-qt/qconnman/qconnman-e_git.bb | 12 + meta-oe/recipes-qt/qconnman/qconnman.inc | 15 + meta-oe/recipes-qt/qconnman/qconnman_git.bb | 10 + .../qextserialport/qextserialport_1.2rc.bb | 54 +++ .../qt-creator/fix.missing.cpuid.h.patch | 384 +++++++++++++++++++++ .../qt-creator/qbs_transformer_product.patch | 93 +++++ meta-oe/recipes-qt/qt-creator/qt-creator_2.8.1.bb | 42 +++ .../qtserialport/qtserialport-e_5.1.0.bb | 5 + meta-oe/recipes-qt/qtserialport/qtserialport.inc | 48 +++ .../qwt/files/qwt6-fix-linking-with-ld-gold.patch | 34 ++ meta-oe/recipes-qt/qwt/files/qwt6.patch | 86 +++++ meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb | 14 + meta-oe/recipes-qt/qwt/qwt.inc | 40 +++ meta-oe/recipes-qt/qwt/qwt_6.0.1.bb | 10 + 25 files changed, 1267 insertions(+) create mode 100644 meta-oe/recipes-qt/fingerterm/fingerterm_1.0.2.bb create mode 100644 meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc create mode 100644 meta-oe/recipes-qt/libconnman-qt/libconnman-qt_git.bb create mode 100644 meta-oe/recipes-qt/libconnman-qt/libconnman-qte/plugin.pro-fix-build-with-custom-target-suffix.patch create mode 100644 meta-oe/recipes-qt/libconnman-qt/libconnman-qte_git.bb create mode 100644 meta-oe/recipes-qt/libqofono/libqofono_0.4.bb create mode 100644 meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver-socketcan_svn.bb create mode 100644 meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch create mode 100644 meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/0002-qconsole-writethread-gcc-4.5-fixes.patch create mode 100755 meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/candemo.xml create mode 100644 meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver_svn.bb create mode 100644 meta-oe/recipes-qt/qconnman/qconnman-e_git.bb create mode 100644 meta-oe/recipes-qt/qconnman/qconnman.inc create mode 100644 meta-oe/recipes-qt/qconnman/qconnman_git.bb create mode 100644 meta-oe/recipes-qt/qextserialport/qextserialport_1.2rc.bb create mode 100644 meta-oe/recipes-qt/qt-creator/qt-creator/fix.missing.cpuid.h.patch create mode 100644 meta-oe/recipes-qt/qt-creator/qt-creator/qbs_transformer_product.patch create mode 100644 meta-oe/recipes-qt/qt-creator/qt-creator_2.8.1.bb create mode 100644 meta-oe/recipes-qt/qtserialport/qtserialport-e_5.1.0.bb create mode 100644 meta-oe/recipes-qt/qtserialport/qtserialport.inc create mode 100644 meta-oe/recipes-qt/qwt/files/qwt6-fix-linking-with-ld-gold.patch create mode 100644 meta-oe/recipes-qt/qwt/files/qwt6.patch create mode 100644 meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb create mode 100644 meta-oe/recipes-qt/qwt/qwt.inc create mode 100644 meta-oe/recipes-qt/qwt/qwt_6.0.1.bb (limited to 'meta-oe/recipes-qt') diff --git a/meta-oe/recipes-qt/fingerterm/fingerterm_1.0.2.bb b/meta-oe/recipes-qt/fingerterm/fingerterm_1.0.2.bb new file mode 100644 index 000000000..155d2829e --- /dev/null +++ b/meta-oe/recipes-qt/fingerterm/fingerterm_1.0.2.bb @@ -0,0 +1,43 @@ +DESCRIPTION = "A terminal emulator for Harmattan (Nokia N9/N950) with a custom \ +virtual keyboard and usability-enhancing features such as URL grabber, pan \ +gestures and customizable shortcut menu. Designed especially to be used with \ +screen and irssi." +HOMEPAGE = "http://hqh.unlink.org/harmattan" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +SECTION = "qt/app" + + +inherit qt4x11 pkgconfig + +SRC_URI = " \ + http://hqh.unlink.org/harmattan/fingerterm-${PV}.tar.gz \ +" + +SRC_URI[md5sum] = "d53b0f463c025583cd52accf95715448" +SRC_URI[sha256sum] = "c21a07cc411d09739bd7fa248eba2bf96427b3f032382a044b6674dd82d95150" + +S = "${WORKDIR}/${PN}" + +FILES_${PN} = " \ + ${bindir}/${PN} \ + ${datadir}/applications/${PN}.desktop \ + ${datadir}/pixmaps/${PN}.png \ +" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${S}/${PN} ${D}${bindir} + + sed -i -e '/Exec.*/d' fingerterm.desktop + sed -i -e '/Icon.*/d' fingerterm.desktop + + echo 'Exec=${bindir}/${PN}' >> fingerterm.desktop + echo 'Icon=${PN}' >> fingerterm.desktop + + install -d ${D}${datadir}/applications + install -m 0644 ${S}/${PN}.desktop ${D}${datadir}/applications + + install -d ${D}${datadir}/pixmaps + install -m 0644 ${S}/${PN}.png ${D}${datadir}/pixmaps +} diff --git a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc new file mode 100644 index 000000000..3f91be2a4 --- /dev/null +++ b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc @@ -0,0 +1,52 @@ +DESCRIPTION = "Qt Library for ConnMan" +HOMEPAGE = "https://github.com/nemomobile/libconnman-qt" +SECTION = "qt/lib" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88" +SRCREV = "80ac184d859ea90c026403f5a520644945a5081a" +PV = "1.0.50+git${SRCPV}" + +SRC_URI = "git://github.com/nemomobile/libconnman-qt.git;branch=master" + +S = "${WORKDIR}/git" + +inherit pkgconfig + +EXTRA_QMAKEVARS_PRE += "CONFIG+=notests TARGET_SUFFIX=${QT_DIR_NAME}" + +do_configure_prepend() { + # Hack *.pro variables + find ${S}/plugin/*.pro -exec sed -i -e 's,$$\[QT_INSTALL_IMPORTS\],${QT_IMPORTS_DIR},g' '{}' ';' +} +do_install() { + oe_runmake install INSTALL_ROOT=${D} +} + +PACKAGES =+ "${PN}-plugin ${PN}-plugin-dbg" + +RDEPENDS_${PN} = "connman" +RDEPENDS_${PN}-plugin = "${PN}" + +RRECOMMENDS_${PN} = "${PN}-plugin" + +FILES_${PN} = " \ + ${libdir}/libconnman-qt*${SOLIBS} \ +" +FILES_${PN}-dev = " \ + ${includedir}/connman-qt*/* \ + ${libdir}/libconnman-qt*${SOLIBSDEV} \ + ${libdir}/libconnman-qt*.prl \ + ${libdir}/pkgconfig/connman-qt*.pc \ +" +FILES_${PN}-plugin = " \ + ${PLUGINS_TARGET}/qmldir \ + ${PLUGINS_TARGET}/lib*.so \ +" +FILES_${PN}-plugin-dbg = " \ + ${PLUGINS_TARGET}/.debug \ + ${PLUGINS_TARGET}/.debug/* \ +" + +QT_IMPORTS_DIR = "${libdir}/${QT_DIR_NAME}/imports" +# the plugin target needs to be the same as 'target.path' and 'qmldir.path' in ${S}/plugin/plugin.pro +PLUGINS_TARGET = "${QT_IMPORTS_DIR}/MeeGo/Connman" diff --git a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_git.bb b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_git.bb new file mode 100644 index 000000000..8d8822c5e --- /dev/null +++ b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_git.bb @@ -0,0 +1,3 @@ +inherit qt4x11 + +require libconnman-qt.inc diff --git a/meta-oe/recipes-qt/libconnman-qt/libconnman-qte/plugin.pro-fix-build-with-custom-target-suffix.patch b/meta-oe/recipes-qt/libconnman-qt/libconnman-qte/plugin.pro-fix-build-with-custom-target-suffix.patch new file mode 100644 index 000000000..3ff68c8dc --- /dev/null +++ b/meta-oe/recipes-qt/libconnman-qt/libconnman-qte/plugin.pro-fix-build-with-custom-target-suffix.patch @@ -0,0 +1,42 @@ +Upstream-Status: Submitted [https://github.com/nemomobile/libconnman-qt/pull/105] + +From 48da520b971af69d22e691a0ef6ff1c3ce901f0d Mon Sep 17 00:00:00 2001 +From: Andreas Oberritter +Date: Tue, 11 Mar 2014 21:55:37 +0100 +Subject: [PATCH] plugin.pro: fix build with custom target suffix + +This went unnoticed because of a previously installed libconnman-qt4. + +Signed-off-by: Andreas Oberritter +--- + plugin/plugin.pro | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/plugin/plugin.pro b/plugin/plugin.pro +index c9534cf..9cdaa63 100644 +--- a/plugin/plugin.pro ++++ b/plugin/plugin.pro +@@ -8,14 +8,18 @@ INCLUDEPATH += ../libconnman-qt + LIBS += -L../libconnman-qt + QT -= gui + ++isEmpty(TARGET_SUFFIX) { ++ TARGET_SUFFIX = qt$$QT_MAJOR_VERSION ++} ++ ++LIBS += -l$$qtLibraryTarget(connman-$$TARGET_SUFFIX) ++ + equals(QT_MAJOR_VERSION, 4): { + QT += declarative +- LIBS += -lconnman-qt4 + } + + equals(QT_MAJOR_VERSION, 5): { + QT += qml +- LIBS += -lconnman-qt5 + OTHER_FILES += plugin.json qmldirs + } + +-- +1.8.3.2 + diff --git a/meta-oe/recipes-qt/libconnman-qt/libconnman-qte_git.bb b/meta-oe/recipes-qt/libconnman-qt/libconnman-qte_git.bb new file mode 100644 index 000000000..9d44957ac --- /dev/null +++ b/meta-oe/recipes-qt/libconnman-qt/libconnman-qte_git.bb @@ -0,0 +1,5 @@ +inherit qt4e + +require libconnman-qt.inc + +SRC_URI += "file://plugin.pro-fix-build-with-custom-target-suffix.patch" diff --git a/meta-oe/recipes-qt/libqofono/libqofono_0.4.bb b/meta-oe/recipes-qt/libqofono/libqofono_0.4.bb new file mode 100644 index 000000000..d52604440 --- /dev/null +++ b/meta-oe/recipes-qt/libqofono/libqofono_0.4.bb @@ -0,0 +1,83 @@ +SUMMARY = "Qt Library for oFono" +HOMEPAGE = "https://github.com/nemomobile/libqofono" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://README;endline=3;md5=8a15bce3921d1238d9a9f23828612947" + +SECTION = "qt/lib" + +BRANCH = "master" +PV = "0.4+gitr${SRCPV}" +SRCREV = "05055a4b4a579facd007a0a128696030228e0b88" + +inherit qt4x11 pkgconfig + +RDEPENDS_${PN} = "ofono" +RDEPENDS_${PN}-plugin = "${PN}" + +PACKAGES =+ "${PN}-plugin ${PN}-plugin-dbg ${PN}-test" +RRECOMMENDS_${PN} = "${PN}-plugin" + +SRC_URI = " \ + git://github.com/nemomobile/${BPN}.git;branch=${BRANCH} \ +" +S = "${WORKDIR}/git" + +QT_IMPORTS_DIR = "${libdir}/qt4/imports" +PLUGINS_TARGET = "${QT_IMPORTS_DIR}/MeeGo/QOfono" + +FILES_${PN} = " \ + ${libdir}/libqofono${SOLIBS} \ +" + +FILES_${PN}-dev = " \ + ${includedir}/qofono/* \ + ${includedir}/qofono/dbus/* \ + ${libdir}/libqofono${SOLIBSDEV} \ + ${libdir}/libqofono.prl \ + ${libdir}/pkgconfig/qofono.pc \ + ${datadir}/qt4/mkspecs/features/qofono.prf \ +" + +FILES_${PN}-plugin = " \ + ${PLUGINS_TARGET}/qmldir \ + ${PLUGINS_TARGET}/lib*.so \ +" + +FILES_${PN}-plugin-dbg = " \ + ${PLUGINS_TARGET}/.debug \ +" + +FILES_${PN}-test = " \ + /opt/ofonotest/bin/ofonotest \ + /opt/ofonotest/qml/ofonotest \ + ${libdir}/libqofono/tests/tst_qofonotest \ +" + +FILES_${PN}-dbg += " \ + /opt/ofonotest/bin/.debug \ + ${libdir}/libqofono/tests/.debug \ +" + +EXTRA_QMAKEVARS_PRE = " \ + PREFIX=${prefix} \ +" + +do_configure_prepend() { + # Hack *.pro variables + find . -iname '*.pro' -exec sed -i -e 's,$$\[QT_INSTALL_IMPORTS\],${QT_IMPORTS_DIR},g' '{}' ';' + find . -iname '*.pro' -exec sed -i -e 's,$$\[QT_INSTALL_PREFIX\],$$INSTALL_ROOT$$PREFIX,g' '{}' ';' +} + +do_install() { + export INSTALL_ROOT=${D} + oe_runmake install + + cd ${D}/${datadir}/qt4/mkspecs/features + + sed -i -e '/DEPENDPATH.*/d; /INCLUDEPATH.*/d; /LIBS.*/d' ${D}/${datadir}/qt4/mkspecs/features/qofono.prf + + # to make it work with the SDK + echo 'DEPENDPATH += $(OE_QMAKE_INCDIR_QT)/../qofono' >> ${D}/${datadir}/qt4/mkspecs/features/qofono.prf + echo 'INCLUDEPATH += $(OE_QMAKE_INCDIR_QT)/../qofono' >> ${D}/${datadir}/qt4/mkspecs/features/qofono.prf + echo 'LIBS += -lqofono' >> ${D}/${datadir}/qt4/mkspecs/features/qofono.prf +} diff --git a/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver-socketcan_svn.bb b/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver-socketcan_svn.bb new file mode 100644 index 000000000..9852b0c08 --- /dev/null +++ b/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver-socketcan_svn.bb @@ -0,0 +1,30 @@ +SUMMARY = "The Linux CAN Sniffer - SocketCAN driver" + +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://../../../modeltest/LICENSE.GPL;md5=34337af480a8c452bfafe22a78fa20cb" + +inherit qt4x11 + +DEPENDS += "qwt libsocketcan" + +PV = "0.5+svnr${SRCPV}" +SRCREV = "48" +SRC_URI = "svn://qcanobserver.svn.sourceforge.net/svnroot;module=qcanobserver;protocol=https" + +S = "${WORKDIR}/qcanobserver/DeviceLib/linux/SocketCAN" + +CXXFLAGS += " -DPF_CAN=29 -DAF_CAN=PF_CAN" + +do_configure_prepend() { + sed -i s:/usr/include/qwt5/:${STAGING_INCDIR}:g *.pro +} + +do_install() { + install -d ${D}${datadir}/qcanobserver/lib + + install -m 0755 ${S}/lib* ${D}${datadir}/qcanobserver/lib/ +} + +FILES_${PN} += "${datadir}/qcanobserver/lib" +FILES_${PN}-dbg += "${datadir}/qcanobserver/lib/.debug" + diff --git a/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch b/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch new file mode 100644 index 000000000..1b3da3bab --- /dev/null +++ b/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch @@ -0,0 +1,41 @@ +From ebb464e3dfa2d59d65c3aa8ee652cb7607481f61 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Thu, 10 Nov 2011 19:38:27 +0100 +Subject: [PATCH] messagebufferinterface.cpp: move sys/socket.h include + +This prevents the following error during cross-compiling: + +| In file included from messagebufferinterface.cpp:30: +| /OE/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/linux/can.h:81: error: 'sa_family_t' does not name a type + +Signed-off-by: Koen Kooi +--- + messagebufferinterface.cpp | 7 ++++--- + 1 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/messagebufferinterface.cpp b/messagebufferinterface.cpp +index 116564c..3e9a535 100644 +--- a/messagebufferinterface.cpp ++++ b/messagebufferinterface.cpp +@@ -25,14 +25,15 @@ + #include + #include + ++#include ++#include ++#include ++ + //#include + //#include + #include + + #include "configdialog.h" +-#include +-#include +-#include + #include + #include + +-- +1.7.2.5 + diff --git a/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/0002-qconsole-writethread-gcc-4.5-fixes.patch b/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/0002-qconsole-writethread-gcc-4.5-fixes.patch new file mode 100644 index 000000000..45619237d --- /dev/null +++ b/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/0002-qconsole-writethread-gcc-4.5-fixes.patch @@ -0,0 +1,40 @@ +From 3b3cb5212b5dbf182beed171045e5d179b2e9000 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Fri, 11 Nov 2011 09:32:14 +0100 +Subject: [PATCH 2/2] qconsole, writethread: gcc 4.5 fixes + +Signed-off-by: Koen Kooi +--- + qconsole.cpp | 2 +- + writethread.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/qconsole.cpp b/qconsole.cpp +index ea86957..b5a4687 100644 +--- a/qconsole.cpp ++++ b/qconsole.cpp +@@ -22,7 +22,7 @@ QConsole::QConsole() + + { + this->setReadOnly(true); +- QTextEdit::QTextEdit(NULL); ++ QTextEdit(NULL); + } + + +diff --git a/writethread.cpp b/writethread.cpp +index ef7bc13..ff19560 100755 +--- a/writethread.cpp ++++ b/writethread.cpp +@@ -69,7 +69,7 @@ void WriteThread::setDev(void *ConfData, QString InterfaceLib, bool shareDevLib) + if(!handle) + { + QString *ErrStr = new QString(" "); +- ErrStr->sprintf("%s %s","Could not load Device Mapper: ", InterfaceLib); ++ ErrStr->sprintf("%s %s","Could not load Device Mapper: ", (char*)InterfaceLib.constData()); + ErrorDialog *ed = new ErrorDialog; + ed->SetErrorMessage(*ErrStr); + delete ErrStr; +-- +1.7.2.5 + diff --git a/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/candemo.xml b/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/candemo.xml new file mode 100755 index 000000000..304713fdd --- /dev/null +++ b/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/candemo.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver_svn.bb b/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver_svn.bb new file mode 100644 index 000000000..4b566f7a3 --- /dev/null +++ b/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver_svn.bb @@ -0,0 +1,41 @@ +SUMMARY = "The Linux CAN Sniffer" + +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://modeltest/LICENSE.GPL;md5=34337af480a8c452bfafe22a78fa20cb" + +inherit qt4x11 + +DEPENDS += "qwt" + +PV = "0.5+svnr${SRCPV}" +SRCREV = "48" +SRC_URI = "svn://qcanobserver.svn.sourceforge.net/svnroot;module=qcanobserver;protocol=https \ + file://0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch \ + file://0002-qconsole-writethread-gcc-4.5-fixes.patch \ + file://candemo.xml" + +S = "${WORKDIR}/qcanobserver/" + +CXXFLAGS += " -DPF_CAN=29 -DAF_CAN=PF_CAN" + +do_configure_prepend() { + sed -i -e s:/usr/include/qwt5/:${STAGING_INCDIR}:g -e 's:-L/usr/lib/:-L${STAGING_DIR_TARGET}/lib -ldl:g' *.pro +} + +do_configure_append() { + sed -i -e s:-L/usr/lib::g Makefile +} + +do_install() { + install -d ${D}${datadir}/qcanobserver + install -d ${D}${datadir}/qcanobserver/cfg + install -d ${D}${datadir}/qcanobserver/lib + install -d ${D}${datadir}/qcanobserver/db + + install -m 0755 ${S}/QCanObserver ${D}${datadir}/qcanobserver + + install -m 0644 ${WORKDIR}/candemo.xml ${D}${datadir}/qcanobserver/db + install -m 0644 ${S}/db/*.xml ${D}${datadir}/qcanobserver/db +} + +FILES_${PN}-dbg += "${datadir}/qcanobserver/.debug" diff --git a/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb b/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb new file mode 100644 index 000000000..e307a72c1 --- /dev/null +++ b/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb @@ -0,0 +1,12 @@ +require qconnman.inc + +RCONFLICTS_${PN} = "qconnman" + +inherit qt4e + +PNBLACKLIST[qconnman-e] ?= "BROKEN: doesn't work with B!=S, ls: cannot access *.pro: No such file or directory" + +EXTRA_QMAKEVARS_PRE += "PREFIX=/usr" +EXTRA_OEMAKE += "INSTALL_ROOT=${D}" + +FILES_${PN} += "${datadir}/qconnman/" diff --git a/meta-oe/recipes-qt/qconnman/qconnman.inc b/meta-oe/recipes-qt/qconnman/qconnman.inc new file mode 100644 index 000000000..664f2a02f --- /dev/null +++ b/meta-oe/recipes-qt/qconnman/qconnman.inc @@ -0,0 +1,15 @@ +DESCRIPTION = "ConnMan management interface done in Qt" +DEPENDS = "connman" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +PR = "r2" + +inherit autotools + +PV = "0.0+gitr${SRCPV}" +SRCREV = "f976b18c7c5584627224784801803e9fd3ebe0ff" +SRC_URI = "git://github.com/OSSystems/qconnman-ui.git;branch=stable" + +S = "${WORKDIR}/git/" diff --git a/meta-oe/recipes-qt/qconnman/qconnman_git.bb b/meta-oe/recipes-qt/qconnman/qconnman_git.bb new file mode 100644 index 000000000..2f8cca25a --- /dev/null +++ b/meta-oe/recipes-qt/qconnman/qconnman_git.bb @@ -0,0 +1,10 @@ +require qconnman.inc + +RCONFLICTS_${PN} = "qconnman-e" + +inherit qt4x11 + +PNBLACKLIST[qconnman] ?= "BROKEN: doesn't work with B!=S, ls: cannot access *.pro: No such file or directory" + +EXTRA_QMAKEVARS_PRE += "PREFIX=/usr" +EXTRA_OEMAKE += "INSTALL_ROOT=${D}" diff --git a/meta-oe/recipes-qt/qextserialport/qextserialport_1.2rc.bb b/meta-oe/recipes-qt/qextserialport/qextserialport_1.2rc.bb new file mode 100644 index 000000000..abf48cfc2 --- /dev/null +++ b/meta-oe/recipes-qt/qextserialport/qextserialport_1.2rc.bb @@ -0,0 +1,54 @@ +SUMMARY = "Qt Ext Serial Port Library" +HOMEPAGE = "http://http://code.google.com/p/qextserialport/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b866a28cda707ec714878bd933f46251" +SECTION = "qt/libs" + + +# 1.2rc as version will sort lower then 1.2 when it's released +REAL_PV = "1.2rc" +PV = "1.1+${REAL_PV}" + +inherit qt4x11 pkgconfig + +DEPENDS = "udev" + +SRC_URI = " \ + http://qextserialport.googlecode.com/files/qextserialport-${REAL_PV}.zip \ +" + +SRC_URI[md5sum] = "ffa061edb9f64666468d18402eee6108" +SRC_URI[sha256sum] = "9cbee267aac9830f9944bb1d13872e51fba400aa9afe158e64f0fe265a0176bc" + +S = "${WORKDIR}/qextserialport-${REAL_PV}" + +FILES_${PN} = "${libdir}/libqextserialport${SOLIBS}" + +FILES_${PN}-dev = " \ + ${libdir}/libqextserialport${SOLIBSDEV} \ + ${libdir}/libqextserialport.prl \ + ${includedir}/QtExtSerialPort/*.h \ + ${datadir}/qt4/mkspecs/features/extserialport.prf \ +" + +FILES_${PN}-dbg += " \ + ${libdir}/.debug/libqextserialport.so* \ +" + +do_configure_prepend() { + # based on the documentation, this line make sure we use udev in linux + cd ${S} && echo "linux*:CONFIG += qesp_linux_udev" > .qmake.cache + + # Hacking hardcoded qmake variables + find *.pro -exec sed -i -e 's,$$\[QT_INSTALL_HEADERS\],${includedir},g' '{}' ';' + find *.pro -exec sed -i -e 's,$$\[QT_INSTALL_LIBS\],${libdir},g' '{}' ';' + find *.pro -exec sed -i -e 's,$$\[QMAKE_MKSPECS\],${datadir}/qt4/mkspecs/,g' '{}' ';' +} + +do_install() { + export INSTALL_ROOT=${D} + oe_runmake install + + # This is necessary to make it work with the qt based SDK + cd ${D}/${datadir}/qt4/mkspecs/features && sed -i -e "s|${STAGING_INCDIR_NATIVE}/qt4|\$(OE_QMAKE_INCDIR_QT)/..|" ./extserialport.prf +} diff --git a/meta-oe/recipes-qt/qt-creator/qt-creator/fix.missing.cpuid.h.patch b/meta-oe/recipes-qt/qt-creator/qt-creator/fix.missing.cpuid.h.patch new file mode 100644 index 000000000..363bee3e7 --- /dev/null +++ b/meta-oe/recipes-qt/qt-creator/qt-creator/fix.missing.cpuid.h.patch @@ -0,0 +1,384 @@ +From 8be071bbca6a9b8e06a7466d848a2b4b6dbcbc1f Mon Sep 17 00:00:00 2001 +From: Christian Kandeler +Date: Fri, 19 Jul 2013 13:40:30 +0200 +Subject: [PATCH] WIP: Remove x86 assembler code from botan sources. + +Taken from +https://bugreports.qt-project.org/browse/QTCREATORBUG-8107 + +Upstream-Status: Submitted + +Change-Id: I3780aa4551f563c5f43833ec822e3c1add7012f2 +--- + src/libs/3rdparty/botan/botan.cpp | 297 +++----------------------------------- + src/libs/3rdparty/botan/botan.h | 4 +- + 2 files changed, 18 insertions(+), 283 deletions(-) + +diff --git a/src/libs/3rdparty/botan/botan.cpp b/src/libs/3rdparty/botan/botan.cpp +index 917c385..c515750 100644 +--- a/src/libs/3rdparty/botan/botan.cpp ++++ b/src/libs/3rdparty/botan/botan.cpp +@@ -1098,35 +1098,31 @@ class Montgomery_Exponentiator : public Modular_Exponentiator + + } + +- +-#if (BOTAN_MP_WORD_BITS != 32) +- #error The mp_x86_32 module requires that BOTAN_MP_WORD_BITS == 32 ++#if (BOTAN_MP_WORD_BITS == 8) ++typedef Botan::u16bit dword; ++#elif (BOTAN_MP_WORD_BITS == 16) ++typedef Botan::u32bit dword; ++#elif (BOTAN_MP_WORD_BITS == 32) ++typedef Botan::u64bit dword; ++#elif (BOTAN_MP_WORD_BITS == 64) ++#error BOTAN_MP_WORD_BITS can be 64 only with assembly support ++#else ++#error BOTAN_MP_WORD_BITS must be 8, 16, 32, or 64 + #endif + +-#ifdef Q_OS_UNIX ++ + namespace Botan { + + extern "C" { + + /* +-* Helper Macros for x86 Assembly +-*/ +-#define ASM(x) x "\n\t" +- +-/* + * Word Multiply + */ + inline word word_madd2(word a, word b, word* c) + { +- asm( +- ASM("mull %[b]") +- ASM("addl %[c],%[a]") +- ASM("adcl $0,%[carry]") +- +- : [a]"=a"(a), [b]"=rm"(b), [carry]"=&d"(*c) +- : "0"(a), "1"(b), [c]"g"(*c) : "cc"); +- +- return a; ++ dword z = (dword)a * b + *c; ++ *c = (word)(z >> BOTAN_MP_WORD_BITS); ++ return (word)z; + } + + /* +@@ -1134,25 +1130,12 @@ inline word word_madd2(word a, word b, word* c) + */ + inline word word_madd3(word a, word b, word c, word* d) + { +- asm( +- ASM("mull %[b]") +- +- ASM("addl %[c],%[a]") +- ASM("adcl $0,%[carry]") +- +- ASM("addl %[d],%[a]") +- ASM("adcl $0,%[carry]") +- +- : [a]"=a"(a), [b]"=rm"(b), [carry]"=&d"(*d) +- : "0"(a), "1"(b), [c]"g"(c), [d]"g"(*d) : "cc"); +- +- return a; ++ dword z = (dword)a * b + c + *d; ++ *d = (word)(z >> BOTAN_MP_WORD_BITS); ++ return (word)z; + } +- + } +- + } +-#endif + + + +@@ -1704,30 +1687,6 @@ void unlock_mem(void* addr, size_t length); + + namespace Botan { + +-extern "C" { +- +-/* +-* Word Multiply/Add +-*/ +-inline word word_madd2(word a, word b, word* c) +- { +- dword z = (dword)a * b + *c; +- *c = (word)(z >> BOTAN_MP_WORD_BITS); +- return (word)z; +- } +- +-/* +-* Word Multiply/Add +-*/ +-inline word word_madd3(word a, word b, word c, word* d) +- { +- dword z = (dword)a * b + c + *d; +- *d = (word)(z >> BOTAN_MP_WORD_BITS); +- return (word)z; +- } +- +-} +- + /** + * Win32 CAPI Entropy Source + */ +@@ -2315,225 +2274,6 @@ namespace Botan { + + extern "C" { + +-#ifdef Q_OS_UNIX +-/* +-* Helper Macros for x86 Assembly +-*/ +-#ifndef ASM +- #define ASM(x) x "\n\t" +-#endif +- +-#define ADDSUB2_OP(OPERATION, INDEX) \ +- ASM("movl 4*" #INDEX "(%[y]), %[carry]") \ +- ASM(OPERATION " %[carry], 4*" #INDEX "(%[x])") \ +- +-#define ADDSUB3_OP(OPERATION, INDEX) \ +- ASM("movl 4*" #INDEX "(%[x]), %[carry]") \ +- ASM(OPERATION " 4*" #INDEX "(%[y]), %[carry]") \ +- ASM("movl %[carry], 4*" #INDEX "(%[z])") \ +- +-#define LINMUL_OP(WRITE_TO, INDEX) \ +- ASM("movl 4*" #INDEX "(%[x]),%%eax") \ +- ASM("mull %[y]") \ +- ASM("addl %[carry],%%eax") \ +- ASM("adcl $0,%%edx") \ +- ASM("movl %%edx,%[carry]") \ +- ASM("movl %%eax, 4*" #INDEX "(%[" WRITE_TO "])") +- +-#define MULADD_OP(IGNORED, INDEX) \ +- ASM("movl 4*" #INDEX "(%[x]),%%eax") \ +- ASM("mull %[y]") \ +- ASM("addl %[carry],%%eax") \ +- ASM("adcl $0,%%edx") \ +- ASM("addl 4*" #INDEX "(%[z]),%%eax") \ +- ASM("adcl $0,%%edx") \ +- ASM("movl %%edx,%[carry]") \ +- ASM("movl %%eax, 4*" #INDEX " (%[z])") +- +-#define DO_8_TIMES(MACRO, ARG) \ +- MACRO(ARG, 0) \ +- MACRO(ARG, 1) \ +- MACRO(ARG, 2) \ +- MACRO(ARG, 3) \ +- MACRO(ARG, 4) \ +- MACRO(ARG, 5) \ +- MACRO(ARG, 6) \ +- MACRO(ARG, 7) +- +-#define ADD_OR_SUBTRACT(CORE_CODE) \ +- ASM("rorl %[carry]") \ +- CORE_CODE \ +- ASM("sbbl %[carry],%[carry]") \ +- ASM("negl %[carry]") +- +-/* +-* Word Addition +-*/ +-inline word word_add(word x, word y, word* carry) +- { +- asm( +- ADD_OR_SUBTRACT(ASM("adcl %[y],%[x]")) +- : [x]"=r"(x), [carry]"=r"(*carry) +- : "0"(x), [y]"rm"(y), "1"(*carry) +- : "cc"); +- return x; +- } +- +-/* +-* Eight Word Block Addition, Two Argument +-*/ +-inline word word8_add2(word x[8], const word y[8], word carry) +- { +- asm( +- ADD_OR_SUBTRACT(DO_8_TIMES(ADDSUB2_OP, "adcl")) +- : [carry]"=r"(carry) +- : [x]"r"(x), [y]"r"(y), "0"(carry) +- : "cc", "memory"); +- return carry; +- } +- +-/* +-* Eight Word Block Addition, Three Argument +-*/ +-inline word word8_add3(word z[8], const word x[8], const word y[8], word carry) +- { +- asm( +- ADD_OR_SUBTRACT(DO_8_TIMES(ADDSUB3_OP, "adcl")) +- : [carry]"=r"(carry) +- : [x]"r"(x), [y]"r"(y), [z]"r"(z), "0"(carry) +- : "cc", "memory"); +- return carry; +- } +- +-/* +-* Word Subtraction +-*/ +-inline word word_sub(word x, word y, word* carry) +- { +- asm( +- ADD_OR_SUBTRACT(ASM("sbbl %[y],%[x]")) +- : [x]"=r"(x), [carry]"=r"(*carry) +- : "0"(x), [y]"rm"(y), "1"(*carry) +- : "cc"); +- return x; +- } +- +-/* +-* Eight Word Block Subtraction, Two Argument +-*/ +-inline word word8_sub2(word x[8], const word y[8], word carry) +- { +- asm( +- ADD_OR_SUBTRACT(DO_8_TIMES(ADDSUB2_OP, "sbbl")) +- : [carry]"=r"(carry) +- : [x]"r"(x), [y]"r"(y), "0"(carry) +- : "cc", "memory"); +- return carry; +- } +- +-/* +-* Eight Word Block Subtraction, Two Argument +-*/ +-inline word word8_sub2_rev(word x[8], const word y[8], word carry) +- { +- asm( +- ADD_OR_SUBTRACT(DO_8_TIMES(ADDSUB3_OP, "sbbl")) +- : [carry]"=r"(carry) +- : [x]"r"(y), [y]"r"(x), [z]"r"(x), "0"(carry) +- : "cc", "memory"); +- return carry; +- } +- +-/* +-* Eight Word Block Subtraction, Three Argument +-*/ +-inline word word8_sub3(word z[8], const word x[8], const word y[8], word carry) +- { +- asm( +- ADD_OR_SUBTRACT(DO_8_TIMES(ADDSUB3_OP, "sbbl")) +- : [carry]"=r"(carry) +- : [x]"r"(x), [y]"r"(y), [z]"r"(z), "0"(carry) +- : "cc", "memory"); +- return carry; +- } +- +-/* +-* Eight Word Block Linear Multiplication +-*/ +-inline word word8_linmul2(word x[8], word y, word carry) +- { +- asm( +- DO_8_TIMES(LINMUL_OP, "x") +- : [carry]"=r"(carry) +- : [x]"r"(x), [y]"rm"(y), "0"(carry) +- : "cc", "%eax", "%edx"); +- return carry; +- } +- +-/* +-* Eight Word Block Linear Multiplication +-*/ +-inline word word8_linmul3(word z[8], const word x[8], word y, word carry) +- { +- asm( +- DO_8_TIMES(LINMUL_OP, "z") +- : [carry]"=r"(carry) +- : [z]"r"(z), [x]"r"(x), [y]"rm"(y), "0"(carry) +- : "cc", "%eax", "%edx"); +- return carry; +- } +- +-/* +-* Eight Word Block Multiply/Add +-*/ +-inline word word8_madd3(word z[8], const word x[8], word y, word carry) +- { +- asm( +- DO_8_TIMES(MULADD_OP, "") +- : [carry]"=r"(carry) +- : [z]"r"(z), [x]"r"(x), [y]"rm"(y), "0"(carry) +- : "cc", "%eax", "%edx"); +- return carry; +- } +- +-/* +-* Multiply-Add Accumulator +-*/ +-inline void word3_muladd(word* w2, word* w1, word* w0, word x, word y) +- { +- asm( +- ASM("mull %[y]") +- +- ASM("addl %[x],%[w0]") +- ASM("adcl %[y],%[w1]") +- ASM("adcl $0,%[w2]") +- +- : [w0]"=r"(*w0), [w1]"=r"(*w1), [w2]"=r"(*w2) +- : [x]"a"(x), [y]"d"(y), "0"(*w0), "1"(*w1), "2"(*w2) +- : "cc"); +- } +- +-/* +-* Multiply-Add Accumulator +-*/ +-inline void word3_muladd_2(word* w2, word* w1, word* w0, word x, word y) +- { +- asm( +- ASM("mull %[y]") +- +- ASM("addl %[x],%[w0]") +- ASM("adcl %[y],%[w1]") +- ASM("adcl $0,%[w2]") +- +- ASM("addl %[x],%[w0]") +- ASM("adcl %[y],%[w1]") +- ASM("adcl $0,%[w2]") +- +- : [w0]"=r"(*w0), [w1]"=r"(*w1), [w2]"=r"(*w2) +- : [x]"a"(x), [y]"d"(y), "0"(*w0), "1"(*w1), "2"(*w2) +- : "cc"); +- } +-#else + /* + * Word Addition + */ +@@ -2718,9 +2458,6 @@ inline void word3_muladd_2(word* w2, word* w1, word* w0, word a, word b) + *w1 = word_add(*w1, b, &carry); + *w2 = word_add(*w2, top, &carry); + } +- +-#endif +- + } + + } +diff --git a/src/libs/3rdparty/botan/botan.h b/src/libs/3rdparty/botan/botan.h +index 6a9cbe0..3a66a14 100644 +--- a/src/libs/3rdparty/botan/botan.h ++++ b/src/libs/3rdparty/botan/botan.h +@@ -80,9 +80,7 @@ + #define BOTAN_GCC_VERSION 0 + #endif + +-#define BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN +-#define BOTAN_TARGET_CPU_IS_X86_FAMILY +-#define BOTAN_TARGET_UNALIGNED_MEMORY_ACCESS_OK 1 ++#define BOTAN_TARGET_UNALIGNED_MEMORY_ACCESS_OK 0 + + #if defined(BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN) || \ + defined(BOTAN_TARGET_CPU_IS_BIG_ENDIAN) +-- +1.8.3.2 + diff --git a/meta-oe/recipes-qt/qt-creator/qt-creator/qbs_transformer_product.patch b/meta-oe/recipes-qt/qt-creator/qt-creator/qbs_transformer_product.patch new file mode 100644 index 000000000..dea09aef4 --- /dev/null +++ b/meta-oe/recipes-qt/qt-creator/qt-creator/qbs_transformer_product.patch @@ -0,0 +1,93 @@ +From c1c7cb2a5e6220a74f374a301e648479029f8a0e Mon Sep 17 00:00:00 2001 +From: Joerg Bornemann +Date: Mon, 12 Aug 2013 09:27:47 +0200 +Subject: [PATCH] introduce Transformer::product() + +Simplifies the calling code. +Remove pointless nullpointer check from jscommandexecutor. + +Upstream-Status: Backport +Signed-off-by: Jonathan Liu + +Change-Id: I867181d2b750f32f04376ce860f5dee6555d3e33 +Reviewed-by: Christian Kandeler +--- + src/lib/buildgraph/jscommandexecutor.cpp | 5 +---- + src/lib/buildgraph/processcommandexecutor.cpp | 6 ++---- + src/lib/buildgraph/transformer.cpp | 7 +++++++ + src/lib/buildgraph/transformer.h | 1 + + 4 files changed, 11 insertions(+), 8 deletions(-) + +diff --git a/src/shared/qbs/src/lib/buildgraph/jscommandexecutor.cpp b/src/shared/qbs/src/lib/buildgraph/jscommandexecutor.cpp +index b7f5b1d..24ffb7e 100644 +--- a/src/shared/qbs/src/lib/buildgraph/jscommandexecutor.cpp ++++ b/src/shared/qbs/src/lib/buildgraph/jscommandexecutor.cpp +@@ -79,10 +79,7 @@ public slots: + m_result.errorMessage.clear(); + ScriptEngine * const scriptEngine = provideScriptEngine(); + QScriptValue scope = scriptEngine->newObject(); +- Artifact *someOutputArtifact = *transformer->outputs.begin(); +- if (!someOutputArtifact->product.isNull()) +- setupScriptEngineForProduct(scriptEngine, someOutputArtifact->product, +- transformer->rule, scope); ++ setupScriptEngineForProduct(scriptEngine, transformer->product(), transformer->rule, scope); + transformer->setupInputs(scriptEngine, scope); + transformer->setupOutputs(scriptEngine, scope); + +diff --git a/src/shared/qbs/src/lib/buildgraph/processcommandexecutor.cpp b/src/shared/qbs/src/lib/buildgraph/processcommandexecutor.cpp +index 78f77c3..d123fe8 100644 +--- a/src/shared/qbs/src/lib/buildgraph/processcommandexecutor.cpp ++++ b/src/shared/qbs/src/lib/buildgraph/processcommandexecutor.cpp +@@ -276,8 +276,7 @@ void ProcessCommandExecutor::removeResponseFile() + + QString ProcessCommandExecutor::findProcessCommandInPath() + { +- Artifact * const outputNode = *transformer()->outputs.begin(); +- const ResolvedProductPtr product = outputNode->product; ++ const ResolvedProductPtr product = transformer()->product(); + const ProcessCommand * const cmd = processCommand(); + QString fullProgramPath = product->executablePathCache.value(cmd->program()); + if (!fullProgramPath.isEmpty()) +@@ -309,8 +308,7 @@ QString ProcessCommandExecutor::findProcessCommandInPath() + + QString ProcessCommandExecutor::findProcessCommandBySuffix() + { +- Artifact * const outputNode = *transformer()->outputs.begin(); +- const ResolvedProductPtr product = outputNode->product; ++ const ResolvedProductPtr product = transformer()->product(); + const ProcessCommand * const cmd = processCommand(); + QString fullProgramPath = product->executablePathCache.value(cmd->program()); + if (!fullProgramPath.isEmpty()) +diff --git a/src/shared/qbs/src/lib/buildgraph/transformer.cpp b/src/shared/qbs/src/lib/buildgraph/transformer.cpp +index ce6baa7..363e08d 100644 +--- a/src/shared/qbs/src/lib/buildgraph/transformer.cpp ++++ b/src/shared/qbs/src/lib/buildgraph/transformer.cpp +@@ -85,6 +85,13 @@ QScriptValue Transformer::translateInOutputs(QScriptEngine *scriptEngine, const + return jsTagFiles; + } + ++ResolvedProductPtr Transformer::product() const ++{ ++ if (outputs.isEmpty()) ++ return ResolvedProductPtr(); ++ return (*outputs.begin())->product; ++} ++ + void Transformer::setupInputs(QScriptEngine *scriptEngine, QScriptValue targetScriptValue) + { + const QString &defaultModuleName = rule->module->name; +diff --git a/src/shared/qbs/src/lib/buildgraph/transformer.h b/src/shared/qbs/src/lib/buildgraph/transformer.h +index c9c88b6..d26c391 100644 +--- a/src/shared/qbs/src/lib/buildgraph/transformer.h ++++ b/src/shared/qbs/src/lib/buildgraph/transformer.h +@@ -65,6 +65,7 @@ public: + const ArtifactList &artifacts, + const QString &defaultModuleName); + ++ ResolvedProductPtr product() const; + void setupInputs(QScriptEngine *scriptEngine, QScriptValue targetScriptValue); + void setupOutputs(QScriptEngine *scriptEngine, QScriptValue targetScriptValue); + void createCommands(const PrepareScriptConstPtr &script, +-- +1.8.4 + diff --git a/meta-oe/recipes-qt/qt-creator/qt-creator_2.8.1.bb b/meta-oe/recipes-qt/qt-creator/qt-creator_2.8.1.bb new file mode 100644 index 000000000..11d7be7d6 --- /dev/null +++ b/meta-oe/recipes-qt/qt-creator/qt-creator_2.8.1.bb @@ -0,0 +1,42 @@ +SUMMARY = "Lightweight, cross-platform integrated development environment" + +HOMEPAGE = "http://qt-project.org/" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://LGPL_EXCEPTION.TXT;md5=eb6c371255e1262c55ae9b652a90b528 \ + file://LICENSE.LGPL;md5=243b725d71bb5df4a1e5920b344b86ad" +SECTION = "qt/app" + +SRC_URI = "http://download.qt-project.org/official_releases/qtcreator/2.8/${PV}/${BP}-src.tar.gz \ + file://fix.missing.cpuid.h.patch \ + file://qbs_transformer_product.patch" +SRC_URI[md5sum] = "79ef6c6ece0c00035ef744c9d6e3bd3b" +SRC_URI[sha256sum] = "d5ae007a297a4288d0e95fd605edbfb8aee80f6788c7a6cfb9cb297f50c364b9" + +S = "${WORKDIR}/${BP}-src" + +inherit qt4x11 + +do_install() { + oe_runmake INSTALL_ROOT=${D}${prefix} install + oe_runmake INSTALL_ROOT=${D}${prefix} install_docs + rm -f ${D}${libdir}/qtcreator/lib*.so +} + +FILES_${PN} += "${datadir}/icons \ + ${datadir}/qtcreator \ + ${libdir}/qtcreator/*" +FILES_${PN}-dbg += "${datadir}/qtcreator/*/*/*/*/.debug \ + ${libdir}/qtcreator/.debug \ + ${libdir}/qtcreator/*/*/.debug" +RRECOMMENDS_${PN} += "packagegroup-core-buildessential \ + packagegroup-qt-toolchain-target \ + qt4-plugin-sqldriver-sqlite \ +" + +# the regexp in insane.bbclass doesn't allow this valid path: +# qt-creator-2.8.1: qt-creator: found library in wrong location: /usr/share/qtcreator/qbs/lib/qbs/plugins/libqbs_cpp_scanner.so +# qt-creator: found library in wrong location: /usr/share/qtcreator/qbs/lib/qbs/plugins/libqbs_qt_scanner.so +# qt-creator-dbg: found library in wrong location: /usr/share/qtcreator/qbs/lib/qbs/plugins/.debug/libqbs_cpp_scanner.so +# qt-creator-dbg: found library in wrong location: /usr/share/qtcreator/qbs/lib/qbs/plugins/.debug/libqbs_qt_scanner.so +INSANE_SKIP_${PN} += "libdir" +INSANE_SKIP_${PN}-dbg += "libdir" diff --git a/meta-oe/recipes-qt/qtserialport/qtserialport-e_5.1.0.bb b/meta-oe/recipes-qt/qtserialport/qtserialport-e_5.1.0.bb new file mode 100644 index 000000000..c466562bb --- /dev/null +++ b/meta-oe/recipes-qt/qtserialport/qtserialport-e_5.1.0.bb @@ -0,0 +1,5 @@ +inherit qt4e + +require qtserialport.inc + +SRCREV = "22e45f0b0f956c025339d72ad53dca57ef684858" diff --git a/meta-oe/recipes-qt/qtserialport/qtserialport.inc b/meta-oe/recipes-qt/qtserialport/qtserialport.inc new file mode 100644 index 000000000..dde49a5ce --- /dev/null +++ b/meta-oe/recipes-qt/qtserialport/qtserialport.inc @@ -0,0 +1,48 @@ +SUMMARY = "Qt Serial Port Library" +SECTION = "qt/libs" +HOMEPAGE = "http://qt-project.org/wiki/QtSerialPort" + +LICENSE = "(LGPL-2.1 | GPL-3.0) & GFDL-1.3" +LIC_FILES_CHKSUM = " \ + file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \ + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \ + " + +inherit pkgconfig + +SRC_URI = " \ + git://gitorious.org/qt/qtserialport.git;branch=stable \ +" + +S = "${WORKDIR}/git" +B = "${WORKDIR}/${BPN}-${PV}" + +QMAKE_PROFILES = "${S}/qtserialport.pro" +EXTRA_OEMAKE += "INSTALL_ROOT=${D}" +OE_QMAKE_QMAKE = "${WORKDIR}/qmake2" + +do_prepare_qmake_symlink() { + ln -sf "${STAGING_BINDIR_NATIVE}/qmake2" ${WORKDIR} +} + +addtask prepare_qmake_symlink after do_generate_qt_config_file before do_configure + +do_configure_prepend() { + sed -i -e "s|\(Prefix\ =\).*|\1${prefix}|" ${WORKDIR}/qt.conf + sed -i -r -e "/^(Binaries|Headers|Plugins|Mkspecs)/ d" ${WORKDIR}/qt.conf +} + +do_install() { + oe_runmake install DESTDIR=${D} INCLUDEDIR=${includedir} +} + +FILES_${PN}-dev += " \ + ${includedir}/QtSerialPort/* \ + ${prefix}/mkspecs/* \ + ${libdir}/*.prl \ +" + +FILES_${PN}-dbg += " \ + ${libdir}/.debug/* \ +" 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 new file mode 100644 index 000000000..1fdd9cf4b --- /dev/null +++ b/meta-oe/recipes-qt/qwt/files/qwt6-fix-linking-with-ld-gold.patch @@ -0,0 +1,34 @@ +Upstream-Status: Pending + +diff -urpN qwt-6.0.1_orig/qwtbuild.pri qwt-6.0.1/qwtbuild.pri +--- qwt-6.0.1_orig/qwtbuild.pri 2011-08-02 00:33:53.000000000 +1000 ++++ qwt-6.0.1/qwtbuild.pri 2012-08-21 10:27:30.721990849 +1000 +@@ -67,3 +67,13 @@ unix { + error( "local build will conflict with $${QMAKE_LIBDIR_QT}/libqwt.*" ) + } + } ++ ++###################################################################### ++# libs for building qwt ++###################################################################### ++ ++unix { ++ # Some linkers require explicit linking with librt (eg ld.gold) ++ LIBS += -lrt ++} ++ +diff -urpN qwt-6.0.1_orig/qwt.prf qwt-6.0.1/qwt.prf +--- qwt-6.0.1_orig/qwt.prf 2011-08-02 00:33:51.000000000 +1000 ++++ qwt-6.0.1/qwt.prf 2012-08-21 11:19:49.435240439 +1000 +@@ -9,6 +9,11 @@ + + include ( ./qwtconfig.pri ) + ++unix { ++ ++ LIBS += -lrt ++} ++ + contains(QWT_CONFIG, QwtDll) { + + DEFINES *= QWT_DLL 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_6.0.1.bb b/meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb new file mode 100644 index 000000000..c80130913 --- /dev/null +++ b/meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb @@ -0,0 +1,14 @@ +inherit qt4e + +require qwt.inc + +PR = "r1" + +SRC_URI[qwt.md5sum] = "ace68558eab873e2da7e641179c4ef0c" +SRC_URI[qwt.sha256sum] = "3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924dbfdc8003cb2" + +RPROVIDES_${PN}-dev = "libqwt-dev" + +# Conflicts with qwt, only one qwt* can be built in world +# | Project ERROR: local build will conflict with sysroots/qemuarm/usr/lib/libqwt.* +EXCLUDE_FROM_WORLD = "1" diff --git a/meta-oe/recipes-qt/qwt/qwt.inc b/meta-oe/recipes-qt/qwt/qwt.inc new file mode 100644 index 000000000..60f73a657 --- /dev/null +++ b/meta-oe/recipes-qt/qwt/qwt.inc @@ -0,0 +1,40 @@ +DESCRIPTION = "Qt Widget Extension for Technical Applications" +SECTION = "libs" + +# LGPLv2.1 + some exceptions +LICENSE = "QWTv1.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=dac2743472b0462ff3cfb4af42051c88" + +SRC_URI = "${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tar.bz2;name=qwt \ + file://qwt6.patch \ + file://qwt6-fix-linking-with-ld-gold.patch" + +S = "${WORKDIR}/qwt-${PV}" + +do_configure_prepend() { + sed -i -e 's:RELEASE_SUFFIX = :RELEASE_SUFFIX = ${QT_LIBINFIX}:' *.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() { + oe_runmake -e install + install -d ${D}${datadir}/doc/${PN} + mv ${D}${prefix}/doc/* ${D}${datadir}/doc/${PN}/ + rmdir ${D}${prefix}/doc + cd ${S}/examples + install -d ${D}/${bindir} + cd bin${QT_LIBINFIX}/ + for i in * ; do + cp -pPR ${i} ${D}/${bindir}/${i}${QT_LIBINFIX} + done + install -d ${D}${libdir}/${QT_DIR_NAME} + mv ${D}${prefix}/plugins ${D}${libdir}/${QT_DIR_NAME} +} + +PACKAGES_prepend = "${PN}-examples ${PN}-features ${PN}-plugins " +FILES_${PN}-examples = "${bindir}/*" +FILES_${PN}-features = "${prefix}/features" +FILES_${PN}-plugins = "${libdir}/${QT_DIR_NAME}/plugins/designer/*.so" +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 new file mode 100644 index 000000000..f38816a90 --- /dev/null +++ b/meta-oe/recipes-qt/qwt/qwt_6.0.1.bb @@ -0,0 +1,10 @@ +inherit qt4x11 + +require qwt.inc + +PR = "r1" + +SRC_URI[qwt.md5sum] = "ace68558eab873e2da7e641179c4ef0c" +SRC_URI[qwt.sha256sum] = "3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924dbfdc8003cb2" + +RPROVIDES_${PN}-dev = "libqwt-dev" -- cgit v1.2.3-54-g00ecf