summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-qt
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2015-10-08 22:51:41 +0200
committerTudor Florea <tudor.florea@enea.com>2015-10-08 22:51:41 +0200
commit1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e (patch)
treea21a5fc103bb3bd65ecd85ed22be5228fc54e447 /meta-oe/recipes-qt
downloadmeta-openembedded-1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e.tar.gz
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta-oe/recipes-qt')
-rw-r--r--meta-oe/recipes-qt/fingerterm/fingerterm_1.0.2.bb43
-rw-r--r--meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc52
-rw-r--r--meta-oe/recipes-qt/libconnman-qt/libconnman-qt_git.bb3
-rw-r--r--meta-oe/recipes-qt/libconnman-qt/libconnman-qte/plugin.pro-fix-build-with-custom-target-suffix.patch42
-rw-r--r--meta-oe/recipes-qt/libconnman-qt/libconnman-qte_git.bb5
-rw-r--r--meta-oe/recipes-qt/libqofono/libqofono_0.4.bb83
-rw-r--r--meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver-socketcan_svn.bb30
-rw-r--r--meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch41
-rw-r--r--meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/0002-qconsole-writethread-gcc-4.5-fixes.patch40
-rwxr-xr-xmeta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/candemo.xml40
-rw-r--r--meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver_svn.bb41
-rw-r--r--meta-oe/recipes-qt/qconnman/qconnman-e_git.bb12
-rw-r--r--meta-oe/recipes-qt/qconnman/qconnman.inc15
-rw-r--r--meta-oe/recipes-qt/qconnman/qconnman_git.bb10
-rw-r--r--meta-oe/recipes-qt/qextserialport/qextserialport_1.2rc.bb54
-rw-r--r--meta-oe/recipes-qt/qt-creator/qt-creator/fix.missing.cpuid.h.patch384
-rw-r--r--meta-oe/recipes-qt/qt-creator/qt-creator/qbs_transformer_product.patch93
-rw-r--r--meta-oe/recipes-qt/qt-creator/qt-creator_2.8.1.bb42
-rw-r--r--meta-oe/recipes-qt/qtserialport/qtserialport-e_5.1.0.bb5
-rw-r--r--meta-oe/recipes-qt/qtserialport/qtserialport.inc48
-rw-r--r--meta-oe/recipes-qt/qwt/files/qwt6-fix-linking-with-ld-gold.patch34
-rw-r--r--meta-oe/recipes-qt/qwt/files/qwt6.patch86
-rw-r--r--meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb14
-rw-r--r--meta-oe/recipes-qt/qwt/qwt.inc40
-rw-r--r--meta-oe/recipes-qt/qwt/qwt_6.0.1.bb10
25 files changed, 1267 insertions, 0 deletions
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 @@
1DESCRIPTION = "A terminal emulator for Harmattan (Nokia N9/N950) with a custom \
2virtual keyboard and usability-enhancing features such as URL grabber, pan \
3gestures and customizable shortcut menu. Designed especially to be used with \
4screen and irssi."
5HOMEPAGE = "http://hqh.unlink.org/harmattan"
6LICENSE = "GPLv3"
7LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
8SECTION = "qt/app"
9
10
11inherit qt4x11 pkgconfig
12
13SRC_URI = " \
14 http://hqh.unlink.org/harmattan/fingerterm-${PV}.tar.gz \
15"
16
17SRC_URI[md5sum] = "d53b0f463c025583cd52accf95715448"
18SRC_URI[sha256sum] = "c21a07cc411d09739bd7fa248eba2bf96427b3f032382a044b6674dd82d95150"
19
20S = "${WORKDIR}/${PN}"
21
22FILES_${PN} = " \
23 ${bindir}/${PN} \
24 ${datadir}/applications/${PN}.desktop \
25 ${datadir}/pixmaps/${PN}.png \
26"
27
28do_install() {
29 install -d ${D}${bindir}
30 install -m 0755 ${S}/${PN} ${D}${bindir}
31
32 sed -i -e '/Exec.*/d' fingerterm.desktop
33 sed -i -e '/Icon.*/d' fingerterm.desktop
34
35 echo 'Exec=${bindir}/${PN}' >> fingerterm.desktop
36 echo 'Icon=${PN}' >> fingerterm.desktop
37
38 install -d ${D}${datadir}/applications
39 install -m 0644 ${S}/${PN}.desktop ${D}${datadir}/applications
40
41 install -d ${D}${datadir}/pixmaps
42 install -m 0644 ${S}/${PN}.png ${D}${datadir}/pixmaps
43}
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 @@
1DESCRIPTION = "Qt Library for ConnMan"
2HOMEPAGE = "https://github.com/nemomobile/libconnman-qt"
3SECTION = "qt/lib"
4LICENSE = "Apache-2.0"
5LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88"
6SRCREV = "80ac184d859ea90c026403f5a520644945a5081a"
7PV = "1.0.50+git${SRCPV}"
8
9SRC_URI = "git://github.com/nemomobile/libconnman-qt.git;branch=master"
10
11S = "${WORKDIR}/git"
12
13inherit pkgconfig
14
15EXTRA_QMAKEVARS_PRE += "CONFIG+=notests TARGET_SUFFIX=${QT_DIR_NAME}"
16
17do_configure_prepend() {
18 # Hack *.pro variables
19 find ${S}/plugin/*.pro -exec sed -i -e 's,$$\[QT_INSTALL_IMPORTS\],${QT_IMPORTS_DIR},g' '{}' ';'
20}
21do_install() {
22 oe_runmake install INSTALL_ROOT=${D}
23}
24
25PACKAGES =+ "${PN}-plugin ${PN}-plugin-dbg"
26
27RDEPENDS_${PN} = "connman"
28RDEPENDS_${PN}-plugin = "${PN}"
29
30RRECOMMENDS_${PN} = "${PN}-plugin"
31
32FILES_${PN} = " \
33 ${libdir}/libconnman-qt*${SOLIBS} \
34"
35FILES_${PN}-dev = " \
36 ${includedir}/connman-qt*/* \
37 ${libdir}/libconnman-qt*${SOLIBSDEV} \
38 ${libdir}/libconnman-qt*.prl \
39 ${libdir}/pkgconfig/connman-qt*.pc \
40"
41FILES_${PN}-plugin = " \
42 ${PLUGINS_TARGET}/qmldir \
43 ${PLUGINS_TARGET}/lib*.so \
44"
45FILES_${PN}-plugin-dbg = " \
46 ${PLUGINS_TARGET}/.debug \
47 ${PLUGINS_TARGET}/.debug/* \
48"
49
50QT_IMPORTS_DIR = "${libdir}/${QT_DIR_NAME}/imports"
51# the plugin target needs to be the same as 'target.path' and 'qmldir.path' in ${S}/plugin/plugin.pro
52PLUGINS_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 @@
1inherit qt4x11
2
3require 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 @@
1Upstream-Status: Submitted [https://github.com/nemomobile/libconnman-qt/pull/105]
2
3From 48da520b971af69d22e691a0ef6ff1c3ce901f0d Mon Sep 17 00:00:00 2001
4From: Andreas Oberritter <obi@opendreambox.org>
5Date: Tue, 11 Mar 2014 21:55:37 +0100
6Subject: [PATCH] plugin.pro: fix build with custom target suffix
7
8This went unnoticed because of a previously installed libconnman-qt4.
9
10Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
11---
12 plugin/plugin.pro | 8 ++++++--
13 1 file changed, 6 insertions(+), 2 deletions(-)
14
15diff --git a/plugin/plugin.pro b/plugin/plugin.pro
16index c9534cf..9cdaa63 100644
17--- a/plugin/plugin.pro
18+++ b/plugin/plugin.pro
19@@ -8,14 +8,18 @@ INCLUDEPATH += ../libconnman-qt
20 LIBS += -L../libconnman-qt
21 QT -= gui
22
23+isEmpty(TARGET_SUFFIX) {
24+ TARGET_SUFFIX = qt$$QT_MAJOR_VERSION
25+}
26+
27+LIBS += -l$$qtLibraryTarget(connman-$$TARGET_SUFFIX)
28+
29 equals(QT_MAJOR_VERSION, 4): {
30 QT += declarative
31- LIBS += -lconnman-qt4
32 }
33
34 equals(QT_MAJOR_VERSION, 5): {
35 QT += qml
36- LIBS += -lconnman-qt5
37 OTHER_FILES += plugin.json qmldirs
38 }
39
40--
411.8.3.2
42
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 @@
1inherit qt4e
2
3require libconnman-qt.inc
4
5SRC_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 @@
1SUMMARY = "Qt Library for oFono"
2HOMEPAGE = "https://github.com/nemomobile/libqofono"
3LICENSE = "Apache-2.0"
4LIC_FILES_CHKSUM = "file://README;endline=3;md5=8a15bce3921d1238d9a9f23828612947"
5
6SECTION = "qt/lib"
7
8BRANCH = "master"
9PV = "0.4+gitr${SRCPV}"
10SRCREV = "05055a4b4a579facd007a0a128696030228e0b88"
11
12inherit qt4x11 pkgconfig
13
14RDEPENDS_${PN} = "ofono"
15RDEPENDS_${PN}-plugin = "${PN}"
16
17PACKAGES =+ "${PN}-plugin ${PN}-plugin-dbg ${PN}-test"
18RRECOMMENDS_${PN} = "${PN}-plugin"
19
20SRC_URI = " \
21 git://github.com/nemomobile/${BPN}.git;branch=${BRANCH} \
22"
23S = "${WORKDIR}/git"
24
25QT_IMPORTS_DIR = "${libdir}/qt4/imports"
26PLUGINS_TARGET = "${QT_IMPORTS_DIR}/MeeGo/QOfono"
27
28FILES_${PN} = " \
29 ${libdir}/libqofono${SOLIBS} \
30"
31
32FILES_${PN}-dev = " \
33 ${includedir}/qofono/* \
34 ${includedir}/qofono/dbus/* \
35 ${libdir}/libqofono${SOLIBSDEV} \
36 ${libdir}/libqofono.prl \
37 ${libdir}/pkgconfig/qofono.pc \
38 ${datadir}/qt4/mkspecs/features/qofono.prf \
39"
40
41FILES_${PN}-plugin = " \
42 ${PLUGINS_TARGET}/qmldir \
43 ${PLUGINS_TARGET}/lib*.so \
44"
45
46FILES_${PN}-plugin-dbg = " \
47 ${PLUGINS_TARGET}/.debug \
48"
49
50FILES_${PN}-test = " \
51 /opt/ofonotest/bin/ofonotest \
52 /opt/ofonotest/qml/ofonotest \
53 ${libdir}/libqofono/tests/tst_qofonotest \
54"
55
56FILES_${PN}-dbg += " \
57 /opt/ofonotest/bin/.debug \
58 ${libdir}/libqofono/tests/.debug \
59"
60
61EXTRA_QMAKEVARS_PRE = " \
62 PREFIX=${prefix} \
63"
64
65do_configure_prepend() {
66 # Hack *.pro variables
67 find . -iname '*.pro' -exec sed -i -e 's,$$\[QT_INSTALL_IMPORTS\],${QT_IMPORTS_DIR},g' '{}' ';'
68 find . -iname '*.pro' -exec sed -i -e 's,$$\[QT_INSTALL_PREFIX\],$$INSTALL_ROOT$$PREFIX,g' '{}' ';'
69}
70
71do_install() {
72 export INSTALL_ROOT=${D}
73 oe_runmake install
74
75 cd ${D}/${datadir}/qt4/mkspecs/features
76
77 sed -i -e '/DEPENDPATH.*/d; /INCLUDEPATH.*/d; /LIBS.*/d' ${D}/${datadir}/qt4/mkspecs/features/qofono.prf
78
79 # to make it work with the SDK
80 echo 'DEPENDPATH += $(OE_QMAKE_INCDIR_QT)/../qofono' >> ${D}/${datadir}/qt4/mkspecs/features/qofono.prf
81 echo 'INCLUDEPATH += $(OE_QMAKE_INCDIR_QT)/../qofono' >> ${D}/${datadir}/qt4/mkspecs/features/qofono.prf
82 echo 'LIBS += -lqofono' >> ${D}/${datadir}/qt4/mkspecs/features/qofono.prf
83}
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 @@
1SUMMARY = "The Linux CAN Sniffer - SocketCAN driver"
2
3LICENSE = "GPLv3+"
4LIC_FILES_CHKSUM = "file://../../../modeltest/LICENSE.GPL;md5=34337af480a8c452bfafe22a78fa20cb"
5
6inherit qt4x11
7
8DEPENDS += "qwt libsocketcan"
9
10PV = "0.5+svnr${SRCPV}"
11SRCREV = "48"
12SRC_URI = "svn://qcanobserver.svn.sourceforge.net/svnroot;module=qcanobserver;protocol=https"
13
14S = "${WORKDIR}/qcanobserver/DeviceLib/linux/SocketCAN"
15
16CXXFLAGS += " -DPF_CAN=29 -DAF_CAN=PF_CAN"
17
18do_configure_prepend() {
19 sed -i s:/usr/include/qwt5/:${STAGING_INCDIR}:g *.pro
20}
21
22do_install() {
23 install -d ${D}${datadir}/qcanobserver/lib
24
25 install -m 0755 ${S}/lib* ${D}${datadir}/qcanobserver/lib/
26}
27
28FILES_${PN} += "${datadir}/qcanobserver/lib"
29FILES_${PN}-dbg += "${datadir}/qcanobserver/lib/.debug"
30
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 @@
1From ebb464e3dfa2d59d65c3aa8ee652cb7607481f61 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Thu, 10 Nov 2011 19:38:27 +0100
4Subject: [PATCH] messagebufferinterface.cpp: move sys/socket.h include
5
6This prevents the following error during cross-compiling:
7
8| In file included from messagebufferinterface.cpp:30:
9| /OE/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/linux/can.h:81: error: 'sa_family_t' does not name a type
10
11Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
12---
13 messagebufferinterface.cpp | 7 ++++---
14 1 files changed, 4 insertions(+), 3 deletions(-)
15
16diff --git a/messagebufferinterface.cpp b/messagebufferinterface.cpp
17index 116564c..3e9a535 100644
18--- a/messagebufferinterface.cpp
19+++ b/messagebufferinterface.cpp
20@@ -25,14 +25,15 @@
21 #include <sys/time.h>
22 #include <QFile>
23
24+#include <sys/types.h>
25+#include <sys/socket.h>
26+#include <sys/stat.h>
27+
28 //#include <linux/can.h>
29 //#include <linux/can/raw.h>
30 #include <syscall.h>
31
32 #include "configdialog.h"
33-#include <sys/types.h>
34-#include <sys/socket.h>
35-#include <sys/stat.h>
36 #include <linux/can.h>
37 #include <linux/can/raw.h>
38
39--
401.7.2.5
41
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 @@
1From 3b3cb5212b5dbf182beed171045e5d179b2e9000 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Fri, 11 Nov 2011 09:32:14 +0100
4Subject: [PATCH 2/2] qconsole, writethread: gcc 4.5 fixes
5
6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7---
8 qconsole.cpp | 2 +-
9 writethread.cpp | 2 +-
10 2 files changed, 2 insertions(+), 2 deletions(-)
11
12diff --git a/qconsole.cpp b/qconsole.cpp
13index ea86957..b5a4687 100644
14--- a/qconsole.cpp
15+++ b/qconsole.cpp
16@@ -22,7 +22,7 @@ QConsole::QConsole()
17
18 {
19 this->setReadOnly(true);
20- QTextEdit::QTextEdit(NULL);
21+ QTextEdit(NULL);
22 }
23
24
25diff --git a/writethread.cpp b/writethread.cpp
26index ef7bc13..ff19560 100755
27--- a/writethread.cpp
28+++ b/writethread.cpp
29@@ -69,7 +69,7 @@ void WriteThread::setDev(void *ConfData, QString InterfaceLib, bool shareDevLib)
30 if(!handle)
31 {
32 QString *ErrStr = new QString(" ");
33- ErrStr->sprintf("%s %s","Could not load Device Mapper: ", InterfaceLib);
34+ ErrStr->sprintf("%s %s","Could not load Device Mapper: ", (char*)InterfaceLib.constData());
35 ErrorDialog *ed = new ErrorDialog;
36 ed->SetErrorMessage(*ErrStr);
37 delete ErrStr;
38--
391.7.2.5
40
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 @@
1<?xml version="1.0" encoding="ISO-8859-1"?>
2
3<Database Name="EW-demo">
4 <ID Id="180">
5 <Item0>
6 <interpret Multiplier="0.010986328125" Name="MotorPos" Offset="-180" Datamask="00120000">
7 </interpret>
8 </Item0>
9 </ID>
10 <ID Id="280">
11 <Item0>
12 <interpret Multiplier="1.0" Name="Fanstatus" Offset="0" Datamask="10000000">
13 </interpret>
14 </Item0>
15 </ID>
16 <ID Id="380">
17 <Item0>
18 <interpret Multiplier="0.00390625" Name="temp1" Offset="0" Datamask="00120000">
19 </interpret>
20 </Item0>
21 </ID>
22 <ID Id="480">
23 <Item0>
24 <interpret Multiplier="1.0" Name="fanstatus" Offset="0" Datamask="10000000">
25 </interpret>
26 </Item0>
27 </ID>
28 <ID Id="580">
29 <Item0>
30 <interpret Multiplier="1.0" Name="lampstatus" Offset="0" Datamask="10000000">
31 </interpret>
32 </Item0>
33 </ID>
34 <ID Id="680">
35 <Item0>
36 <interpret Multiplier="0.00390625" Name="Lightsensor" Offset="0" Datamask="00120000">
37 </interpret>
38 </Item0>
39 </ID>
40</Database>
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 @@
1SUMMARY = "The Linux CAN Sniffer"
2
3LICENSE = "GPLv3+"
4LIC_FILES_CHKSUM = "file://modeltest/LICENSE.GPL;md5=34337af480a8c452bfafe22a78fa20cb"
5
6inherit qt4x11
7
8DEPENDS += "qwt"
9
10PV = "0.5+svnr${SRCPV}"
11SRCREV = "48"
12SRC_URI = "svn://qcanobserver.svn.sourceforge.net/svnroot;module=qcanobserver;protocol=https \
13 file://0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch \
14 file://0002-qconsole-writethread-gcc-4.5-fixes.patch \
15 file://candemo.xml"
16
17S = "${WORKDIR}/qcanobserver/"
18
19CXXFLAGS += " -DPF_CAN=29 -DAF_CAN=PF_CAN"
20
21do_configure_prepend() {
22 sed -i -e s:/usr/include/qwt5/:${STAGING_INCDIR}:g -e 's:-L/usr/lib/:-L${STAGING_DIR_TARGET}/lib -ldl:g' *.pro
23}
24
25do_configure_append() {
26 sed -i -e s:-L/usr/lib::g Makefile
27}
28
29do_install() {
30 install -d ${D}${datadir}/qcanobserver
31 install -d ${D}${datadir}/qcanobserver/cfg
32 install -d ${D}${datadir}/qcanobserver/lib
33 install -d ${D}${datadir}/qcanobserver/db
34
35 install -m 0755 ${S}/QCanObserver ${D}${datadir}/qcanobserver
36
37 install -m 0644 ${WORKDIR}/candemo.xml ${D}${datadir}/qcanobserver/db
38 install -m 0644 ${S}/db/*.xml ${D}${datadir}/qcanobserver/db
39}
40
41FILES_${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 @@
1require qconnman.inc
2
3RCONFLICTS_${PN} = "qconnman"
4
5inherit qt4e
6
7PNBLACKLIST[qconnman-e] ?= "BROKEN: doesn't work with B!=S, ls: cannot access *.pro: No such file or directory"
8
9EXTRA_QMAKEVARS_PRE += "PREFIX=/usr"
10EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
11
12FILES_${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 @@
1DESCRIPTION = "ConnMan management interface done in Qt"
2DEPENDS = "connman"
3
4LICENSE = "LGPLv2.1"
5LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
6
7PR = "r2"
8
9inherit autotools
10
11PV = "0.0+gitr${SRCPV}"
12SRCREV = "f976b18c7c5584627224784801803e9fd3ebe0ff"
13SRC_URI = "git://github.com/OSSystems/qconnman-ui.git;branch=stable"
14
15S = "${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 @@
1require qconnman.inc
2
3RCONFLICTS_${PN} = "qconnman-e"
4
5inherit qt4x11
6
7PNBLACKLIST[qconnman] ?= "BROKEN: doesn't work with B!=S, ls: cannot access *.pro: No such file or directory"
8
9EXTRA_QMAKEVARS_PRE += "PREFIX=/usr"
10EXTRA_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 @@
1SUMMARY = "Qt Ext Serial Port Library"
2HOMEPAGE = "http://http://code.google.com/p/qextserialport/"
3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=b866a28cda707ec714878bd933f46251"
5SECTION = "qt/libs"
6
7
8# 1.2rc as version will sort lower then 1.2 when it's released
9REAL_PV = "1.2rc"
10PV = "1.1+${REAL_PV}"
11
12inherit qt4x11 pkgconfig
13
14DEPENDS = "udev"
15
16SRC_URI = " \
17 http://qextserialport.googlecode.com/files/qextserialport-${REAL_PV}.zip \
18"
19
20SRC_URI[md5sum] = "ffa061edb9f64666468d18402eee6108"
21SRC_URI[sha256sum] = "9cbee267aac9830f9944bb1d13872e51fba400aa9afe158e64f0fe265a0176bc"
22
23S = "${WORKDIR}/qextserialport-${REAL_PV}"
24
25FILES_${PN} = "${libdir}/libqextserialport${SOLIBS}"
26
27FILES_${PN}-dev = " \
28 ${libdir}/libqextserialport${SOLIBSDEV} \
29 ${libdir}/libqextserialport.prl \
30 ${includedir}/QtExtSerialPort/*.h \
31 ${datadir}/qt4/mkspecs/features/extserialport.prf \
32"
33
34FILES_${PN}-dbg += " \
35 ${libdir}/.debug/libqextserialport.so* \
36"
37
38do_configure_prepend() {
39 # based on the documentation, this line make sure we use udev in linux
40 cd ${S} && echo "linux*:CONFIG += qesp_linux_udev" > .qmake.cache
41
42 # Hacking hardcoded qmake variables
43 find *.pro -exec sed -i -e 's,$$\[QT_INSTALL_HEADERS\],${includedir},g' '{}' ';'
44 find *.pro -exec sed -i -e 's,$$\[QT_INSTALL_LIBS\],${libdir},g' '{}' ';'
45 find *.pro -exec sed -i -e 's,$$\[QMAKE_MKSPECS\],${datadir}/qt4/mkspecs/,g' '{}' ';'
46}
47
48do_install() {
49 export INSTALL_ROOT=${D}
50 oe_runmake install
51
52 # This is necessary to make it work with the qt based SDK
53 cd ${D}/${datadir}/qt4/mkspecs/features && sed -i -e "s|${STAGING_INCDIR_NATIVE}/qt4|\$(OE_QMAKE_INCDIR_QT)/..|" ./extserialport.prf
54}
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 @@
1From 8be071bbca6a9b8e06a7466d848a2b4b6dbcbc1f Mon Sep 17 00:00:00 2001
2From: Christian Kandeler <christian.kandeler@digia.com>
3Date: Fri, 19 Jul 2013 13:40:30 +0200
4Subject: [PATCH] WIP: Remove x86 assembler code from botan sources.
5
6Taken from
7https://bugreports.qt-project.org/browse/QTCREATORBUG-8107
8
9Upstream-Status: Submitted
10
11Change-Id: I3780aa4551f563c5f43833ec822e3c1add7012f2
12---
13 src/libs/3rdparty/botan/botan.cpp | 297 +++-----------------------------------
14 src/libs/3rdparty/botan/botan.h | 4 +-
15 2 files changed, 18 insertions(+), 283 deletions(-)
16
17diff --git a/src/libs/3rdparty/botan/botan.cpp b/src/libs/3rdparty/botan/botan.cpp
18index 917c385..c515750 100644
19--- a/src/libs/3rdparty/botan/botan.cpp
20+++ b/src/libs/3rdparty/botan/botan.cpp
21@@ -1098,35 +1098,31 @@ class Montgomery_Exponentiator : public Modular_Exponentiator
22
23 }
24
25-
26-#if (BOTAN_MP_WORD_BITS != 32)
27- #error The mp_x86_32 module requires that BOTAN_MP_WORD_BITS == 32
28+#if (BOTAN_MP_WORD_BITS == 8)
29+typedef Botan::u16bit dword;
30+#elif (BOTAN_MP_WORD_BITS == 16)
31+typedef Botan::u32bit dword;
32+#elif (BOTAN_MP_WORD_BITS == 32)
33+typedef Botan::u64bit dword;
34+#elif (BOTAN_MP_WORD_BITS == 64)
35+#error BOTAN_MP_WORD_BITS can be 64 only with assembly support
36+#else
37+#error BOTAN_MP_WORD_BITS must be 8, 16, 32, or 64
38 #endif
39
40-#ifdef Q_OS_UNIX
41+
42 namespace Botan {
43
44 extern "C" {
45
46 /*
47-* Helper Macros for x86 Assembly
48-*/
49-#define ASM(x) x "\n\t"
50-
51-/*
52 * Word Multiply
53 */
54 inline word word_madd2(word a, word b, word* c)
55 {
56- asm(
57- ASM("mull %[b]")
58- ASM("addl %[c],%[a]")
59- ASM("adcl $0,%[carry]")
60-
61- : [a]"=a"(a), [b]"=rm"(b), [carry]"=&d"(*c)
62- : "0"(a), "1"(b), [c]"g"(*c) : "cc");
63-
64- return a;
65+ dword z = (dword)a * b + *c;
66+ *c = (word)(z >> BOTAN_MP_WORD_BITS);
67+ return (word)z;
68 }
69
70 /*
71@@ -1134,25 +1130,12 @@ inline word word_madd2(word a, word b, word* c)
72 */
73 inline word word_madd3(word a, word b, word c, word* d)
74 {
75- asm(
76- ASM("mull %[b]")
77-
78- ASM("addl %[c],%[a]")
79- ASM("adcl $0,%[carry]")
80-
81- ASM("addl %[d],%[a]")
82- ASM("adcl $0,%[carry]")
83-
84- : [a]"=a"(a), [b]"=rm"(b), [carry]"=&d"(*d)
85- : "0"(a), "1"(b), [c]"g"(c), [d]"g"(*d) : "cc");
86-
87- return a;
88+ dword z = (dword)a * b + c + *d;
89+ *d = (word)(z >> BOTAN_MP_WORD_BITS);
90+ return (word)z;
91 }
92-
93 }
94-
95 }
96-#endif
97
98
99
100@@ -1704,30 +1687,6 @@ void unlock_mem(void* addr, size_t length);
101
102 namespace Botan {
103
104-extern "C" {
105-
106-/*
107-* Word Multiply/Add
108-*/
109-inline word word_madd2(word a, word b, word* c)
110- {
111- dword z = (dword)a * b + *c;
112- *c = (word)(z >> BOTAN_MP_WORD_BITS);
113- return (word)z;
114- }
115-
116-/*
117-* Word Multiply/Add
118-*/
119-inline word word_madd3(word a, word b, word c, word* d)
120- {
121- dword z = (dword)a * b + c + *d;
122- *d = (word)(z >> BOTAN_MP_WORD_BITS);
123- return (word)z;
124- }
125-
126-}
127-
128 /**
129 * Win32 CAPI Entropy Source
130 */
131@@ -2315,225 +2274,6 @@ namespace Botan {
132
133 extern "C" {
134
135-#ifdef Q_OS_UNIX
136-/*
137-* Helper Macros for x86 Assembly
138-*/
139-#ifndef ASM
140- #define ASM(x) x "\n\t"
141-#endif
142-
143-#define ADDSUB2_OP(OPERATION, INDEX) \
144- ASM("movl 4*" #INDEX "(%[y]), %[carry]") \
145- ASM(OPERATION " %[carry], 4*" #INDEX "(%[x])") \
146-
147-#define ADDSUB3_OP(OPERATION, INDEX) \
148- ASM("movl 4*" #INDEX "(%[x]), %[carry]") \
149- ASM(OPERATION " 4*" #INDEX "(%[y]), %[carry]") \
150- ASM("movl %[carry], 4*" #INDEX "(%[z])") \
151-
152-#define LINMUL_OP(WRITE_TO, INDEX) \
153- ASM("movl 4*" #INDEX "(%[x]),%%eax") \
154- ASM("mull %[y]") \
155- ASM("addl %[carry],%%eax") \
156- ASM("adcl $0,%%edx") \
157- ASM("movl %%edx,%[carry]") \
158- ASM("movl %%eax, 4*" #INDEX "(%[" WRITE_TO "])")
159-
160-#define MULADD_OP(IGNORED, INDEX) \
161- ASM("movl 4*" #INDEX "(%[x]),%%eax") \
162- ASM("mull %[y]") \
163- ASM("addl %[carry],%%eax") \
164- ASM("adcl $0,%%edx") \
165- ASM("addl 4*" #INDEX "(%[z]),%%eax") \
166- ASM("adcl $0,%%edx") \
167- ASM("movl %%edx,%[carry]") \
168- ASM("movl %%eax, 4*" #INDEX " (%[z])")
169-
170-#define DO_8_TIMES(MACRO, ARG) \
171- MACRO(ARG, 0) \
172- MACRO(ARG, 1) \
173- MACRO(ARG, 2) \
174- MACRO(ARG, 3) \
175- MACRO(ARG, 4) \
176- MACRO(ARG, 5) \
177- MACRO(ARG, 6) \
178- MACRO(ARG, 7)
179-
180-#define ADD_OR_SUBTRACT(CORE_CODE) \
181- ASM("rorl %[carry]") \
182- CORE_CODE \
183- ASM("sbbl %[carry],%[carry]") \
184- ASM("negl %[carry]")
185-
186-/*
187-* Word Addition
188-*/
189-inline word word_add(word x, word y, word* carry)
190- {
191- asm(
192- ADD_OR_SUBTRACT(ASM("adcl %[y],%[x]"))
193- : [x]"=r"(x), [carry]"=r"(*carry)
194- : "0"(x), [y]"rm"(y), "1"(*carry)
195- : "cc");
196- return x;
197- }
198-
199-/*
200-* Eight Word Block Addition, Two Argument
201-*/
202-inline word word8_add2(word x[8], const word y[8], word carry)
203- {
204- asm(
205- ADD_OR_SUBTRACT(DO_8_TIMES(ADDSUB2_OP, "adcl"))
206- : [carry]"=r"(carry)
207- : [x]"r"(x), [y]"r"(y), "0"(carry)
208- : "cc", "memory");
209- return carry;
210- }
211-
212-/*
213-* Eight Word Block Addition, Three Argument
214-*/
215-inline word word8_add3(word z[8], const word x[8], const word y[8], word carry)
216- {
217- asm(
218- ADD_OR_SUBTRACT(DO_8_TIMES(ADDSUB3_OP, "adcl"))
219- : [carry]"=r"(carry)
220- : [x]"r"(x), [y]"r"(y), [z]"r"(z), "0"(carry)
221- : "cc", "memory");
222- return carry;
223- }
224-
225-/*
226-* Word Subtraction
227-*/
228-inline word word_sub(word x, word y, word* carry)
229- {
230- asm(
231- ADD_OR_SUBTRACT(ASM("sbbl %[y],%[x]"))
232- : [x]"=r"(x), [carry]"=r"(*carry)
233- : "0"(x), [y]"rm"(y), "1"(*carry)
234- : "cc");
235- return x;
236- }
237-
238-/*
239-* Eight Word Block Subtraction, Two Argument
240-*/
241-inline word word8_sub2(word x[8], const word y[8], word carry)
242- {
243- asm(
244- ADD_OR_SUBTRACT(DO_8_TIMES(ADDSUB2_OP, "sbbl"))
245- : [carry]"=r"(carry)
246- : [x]"r"(x), [y]"r"(y), "0"(carry)
247- : "cc", "memory");
248- return carry;
249- }
250-
251-/*
252-* Eight Word Block Subtraction, Two Argument
253-*/
254-inline word word8_sub2_rev(word x[8], const word y[8], word carry)
255- {
256- asm(
257- ADD_OR_SUBTRACT(DO_8_TIMES(ADDSUB3_OP, "sbbl"))
258- : [carry]"=r"(carry)
259- : [x]"r"(y), [y]"r"(x), [z]"r"(x), "0"(carry)
260- : "cc", "memory");
261- return carry;
262- }
263-
264-/*
265-* Eight Word Block Subtraction, Three Argument
266-*/
267-inline word word8_sub3(word z[8], const word x[8], const word y[8], word carry)
268- {
269- asm(
270- ADD_OR_SUBTRACT(DO_8_TIMES(ADDSUB3_OP, "sbbl"))
271- : [carry]"=r"(carry)
272- : [x]"r"(x), [y]"r"(y), [z]"r"(z), "0"(carry)
273- : "cc", "memory");
274- return carry;
275- }
276-
277-/*
278-* Eight Word Block Linear Multiplication
279-*/
280-inline word word8_linmul2(word x[8], word y, word carry)
281- {
282- asm(
283- DO_8_TIMES(LINMUL_OP, "x")
284- : [carry]"=r"(carry)
285- : [x]"r"(x), [y]"rm"(y), "0"(carry)
286- : "cc", "%eax", "%edx");
287- return carry;
288- }
289-
290-/*
291-* Eight Word Block Linear Multiplication
292-*/
293-inline word word8_linmul3(word z[8], const word x[8], word y, word carry)
294- {
295- asm(
296- DO_8_TIMES(LINMUL_OP, "z")
297- : [carry]"=r"(carry)
298- : [z]"r"(z), [x]"r"(x), [y]"rm"(y), "0"(carry)
299- : "cc", "%eax", "%edx");
300- return carry;
301- }
302-
303-/*
304-* Eight Word Block Multiply/Add
305-*/
306-inline word word8_madd3(word z[8], const word x[8], word y, word carry)
307- {
308- asm(
309- DO_8_TIMES(MULADD_OP, "")
310- : [carry]"=r"(carry)
311- : [z]"r"(z), [x]"r"(x), [y]"rm"(y), "0"(carry)
312- : "cc", "%eax", "%edx");
313- return carry;
314- }
315-
316-/*
317-* Multiply-Add Accumulator
318-*/
319-inline void word3_muladd(word* w2, word* w1, word* w0, word x, word y)
320- {
321- asm(
322- ASM("mull %[y]")
323-
324- ASM("addl %[x],%[w0]")
325- ASM("adcl %[y],%[w1]")
326- ASM("adcl $0,%[w2]")
327-
328- : [w0]"=r"(*w0), [w1]"=r"(*w1), [w2]"=r"(*w2)
329- : [x]"a"(x), [y]"d"(y), "0"(*w0), "1"(*w1), "2"(*w2)
330- : "cc");
331- }
332-
333-/*
334-* Multiply-Add Accumulator
335-*/
336-inline void word3_muladd_2(word* w2, word* w1, word* w0, word x, word y)
337- {
338- asm(
339- ASM("mull %[y]")
340-
341- ASM("addl %[x],%[w0]")
342- ASM("adcl %[y],%[w1]")
343- ASM("adcl $0,%[w2]")
344-
345- ASM("addl %[x],%[w0]")
346- ASM("adcl %[y],%[w1]")
347- ASM("adcl $0,%[w2]")
348-
349- : [w0]"=r"(*w0), [w1]"=r"(*w1), [w2]"=r"(*w2)
350- : [x]"a"(x), [y]"d"(y), "0"(*w0), "1"(*w1), "2"(*w2)
351- : "cc");
352- }
353-#else
354 /*
355 * Word Addition
356 */
357@@ -2718,9 +2458,6 @@ inline void word3_muladd_2(word* w2, word* w1, word* w0, word a, word b)
358 *w1 = word_add(*w1, b, &carry);
359 *w2 = word_add(*w2, top, &carry);
360 }
361-
362-#endif
363-
364 }
365
366 }
367diff --git a/src/libs/3rdparty/botan/botan.h b/src/libs/3rdparty/botan/botan.h
368index 6a9cbe0..3a66a14 100644
369--- a/src/libs/3rdparty/botan/botan.h
370+++ b/src/libs/3rdparty/botan/botan.h
371@@ -80,9 +80,7 @@
372 #define BOTAN_GCC_VERSION 0
373 #endif
374
375-#define BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN
376-#define BOTAN_TARGET_CPU_IS_X86_FAMILY
377-#define BOTAN_TARGET_UNALIGNED_MEMORY_ACCESS_OK 1
378+#define BOTAN_TARGET_UNALIGNED_MEMORY_ACCESS_OK 0
379
380 #if defined(BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN) || \
381 defined(BOTAN_TARGET_CPU_IS_BIG_ENDIAN)
382--
3831.8.3.2
384
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 @@
1From c1c7cb2a5e6220a74f374a301e648479029f8a0e Mon Sep 17 00:00:00 2001
2From: Joerg Bornemann <joerg.bornemann@digia.com>
3Date: Mon, 12 Aug 2013 09:27:47 +0200
4Subject: [PATCH] introduce Transformer::product()
5
6Simplifies the calling code.
7Remove pointless nullpointer check from jscommandexecutor.
8
9Upstream-Status: Backport
10Signed-off-by: Jonathan Liu <net147@gmail.com>
11
12Change-Id: I867181d2b750f32f04376ce860f5dee6555d3e33
13Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
14---
15 src/lib/buildgraph/jscommandexecutor.cpp | 5 +----
16 src/lib/buildgraph/processcommandexecutor.cpp | 6 ++----
17 src/lib/buildgraph/transformer.cpp | 7 +++++++
18 src/lib/buildgraph/transformer.h | 1 +
19 4 files changed, 11 insertions(+), 8 deletions(-)
20
21diff --git a/src/shared/qbs/src/lib/buildgraph/jscommandexecutor.cpp b/src/shared/qbs/src/lib/buildgraph/jscommandexecutor.cpp
22index b7f5b1d..24ffb7e 100644
23--- a/src/shared/qbs/src/lib/buildgraph/jscommandexecutor.cpp
24+++ b/src/shared/qbs/src/lib/buildgraph/jscommandexecutor.cpp
25@@ -79,10 +79,7 @@ public slots:
26 m_result.errorMessage.clear();
27 ScriptEngine * const scriptEngine = provideScriptEngine();
28 QScriptValue scope = scriptEngine->newObject();
29- Artifact *someOutputArtifact = *transformer->outputs.begin();
30- if (!someOutputArtifact->product.isNull())
31- setupScriptEngineForProduct(scriptEngine, someOutputArtifact->product,
32- transformer->rule, scope);
33+ setupScriptEngineForProduct(scriptEngine, transformer->product(), transformer->rule, scope);
34 transformer->setupInputs(scriptEngine, scope);
35 transformer->setupOutputs(scriptEngine, scope);
36
37diff --git a/src/shared/qbs/src/lib/buildgraph/processcommandexecutor.cpp b/src/shared/qbs/src/lib/buildgraph/processcommandexecutor.cpp
38index 78f77c3..d123fe8 100644
39--- a/src/shared/qbs/src/lib/buildgraph/processcommandexecutor.cpp
40+++ b/src/shared/qbs/src/lib/buildgraph/processcommandexecutor.cpp
41@@ -276,8 +276,7 @@ void ProcessCommandExecutor::removeResponseFile()
42
43 QString ProcessCommandExecutor::findProcessCommandInPath()
44 {
45- Artifact * const outputNode = *transformer()->outputs.begin();
46- const ResolvedProductPtr product = outputNode->product;
47+ const ResolvedProductPtr product = transformer()->product();
48 const ProcessCommand * const cmd = processCommand();
49 QString fullProgramPath = product->executablePathCache.value(cmd->program());
50 if (!fullProgramPath.isEmpty())
51@@ -309,8 +308,7 @@ QString ProcessCommandExecutor::findProcessCommandInPath()
52
53 QString ProcessCommandExecutor::findProcessCommandBySuffix()
54 {
55- Artifact * const outputNode = *transformer()->outputs.begin();
56- const ResolvedProductPtr product = outputNode->product;
57+ const ResolvedProductPtr product = transformer()->product();
58 const ProcessCommand * const cmd = processCommand();
59 QString fullProgramPath = product->executablePathCache.value(cmd->program());
60 if (!fullProgramPath.isEmpty())
61diff --git a/src/shared/qbs/src/lib/buildgraph/transformer.cpp b/src/shared/qbs/src/lib/buildgraph/transformer.cpp
62index ce6baa7..363e08d 100644
63--- a/src/shared/qbs/src/lib/buildgraph/transformer.cpp
64+++ b/src/shared/qbs/src/lib/buildgraph/transformer.cpp
65@@ -85,6 +85,13 @@ QScriptValue Transformer::translateInOutputs(QScriptEngine *scriptEngine, const
66 return jsTagFiles;
67 }
68
69+ResolvedProductPtr Transformer::product() const
70+{
71+ if (outputs.isEmpty())
72+ return ResolvedProductPtr();
73+ return (*outputs.begin())->product;
74+}
75+
76 void Transformer::setupInputs(QScriptEngine *scriptEngine, QScriptValue targetScriptValue)
77 {
78 const QString &defaultModuleName = rule->module->name;
79diff --git a/src/shared/qbs/src/lib/buildgraph/transformer.h b/src/shared/qbs/src/lib/buildgraph/transformer.h
80index c9c88b6..d26c391 100644
81--- a/src/shared/qbs/src/lib/buildgraph/transformer.h
82+++ b/src/shared/qbs/src/lib/buildgraph/transformer.h
83@@ -65,6 +65,7 @@ public:
84 const ArtifactList &artifacts,
85 const QString &defaultModuleName);
86
87+ ResolvedProductPtr product() const;
88 void setupInputs(QScriptEngine *scriptEngine, QScriptValue targetScriptValue);
89 void setupOutputs(QScriptEngine *scriptEngine, QScriptValue targetScriptValue);
90 void createCommands(const PrepareScriptConstPtr &script,
91--
921.8.4
93
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 @@
1SUMMARY = "Lightweight, cross-platform integrated development environment"
2
3HOMEPAGE = "http://qt-project.org/"
4LICENSE = "LGPLv2.1"
5LIC_FILES_CHKSUM = "file://LGPL_EXCEPTION.TXT;md5=eb6c371255e1262c55ae9b652a90b528 \
6 file://LICENSE.LGPL;md5=243b725d71bb5df4a1e5920b344b86ad"
7SECTION = "qt/app"
8
9SRC_URI = "http://download.qt-project.org/official_releases/qtcreator/2.8/${PV}/${BP}-src.tar.gz \
10 file://fix.missing.cpuid.h.patch \
11 file://qbs_transformer_product.patch"
12SRC_URI[md5sum] = "79ef6c6ece0c00035ef744c9d6e3bd3b"
13SRC_URI[sha256sum] = "d5ae007a297a4288d0e95fd605edbfb8aee80f6788c7a6cfb9cb297f50c364b9"
14
15S = "${WORKDIR}/${BP}-src"
16
17inherit qt4x11
18
19do_install() {
20 oe_runmake INSTALL_ROOT=${D}${prefix} install
21 oe_runmake INSTALL_ROOT=${D}${prefix} install_docs
22 rm -f ${D}${libdir}/qtcreator/lib*.so
23}
24
25FILES_${PN} += "${datadir}/icons \
26 ${datadir}/qtcreator \
27 ${libdir}/qtcreator/*"
28FILES_${PN}-dbg += "${datadir}/qtcreator/*/*/*/*/.debug \
29 ${libdir}/qtcreator/.debug \
30 ${libdir}/qtcreator/*/*/.debug"
31RRECOMMENDS_${PN} += "packagegroup-core-buildessential \
32 packagegroup-qt-toolchain-target \
33 qt4-plugin-sqldriver-sqlite \
34"
35
36# the regexp in insane.bbclass doesn't allow this valid path:
37# qt-creator-2.8.1: qt-creator: found library in wrong location: /usr/share/qtcreator/qbs/lib/qbs/plugins/libqbs_cpp_scanner.so
38# qt-creator: found library in wrong location: /usr/share/qtcreator/qbs/lib/qbs/plugins/libqbs_qt_scanner.so
39# qt-creator-dbg: found library in wrong location: /usr/share/qtcreator/qbs/lib/qbs/plugins/.debug/libqbs_cpp_scanner.so
40# qt-creator-dbg: found library in wrong location: /usr/share/qtcreator/qbs/lib/qbs/plugins/.debug/libqbs_qt_scanner.so
41INSANE_SKIP_${PN} += "libdir"
42INSANE_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 @@
1inherit qt4e
2
3require qtserialport.inc
4
5SRCREV = "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 @@
1SUMMARY = "Qt Serial Port Library"
2SECTION = "qt/libs"
3HOMEPAGE = "http://qt-project.org/wiki/QtSerialPort"
4
5LICENSE = "(LGPL-2.1 | GPL-3.0) & GFDL-1.3"
6LIC_FILES_CHKSUM = " \
7 file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \
8 file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
9 file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \
10 "
11
12inherit pkgconfig
13
14SRC_URI = " \
15 git://gitorious.org/qt/qtserialport.git;branch=stable \
16"
17
18S = "${WORKDIR}/git"
19B = "${WORKDIR}/${BPN}-${PV}"
20
21QMAKE_PROFILES = "${S}/qtserialport.pro"
22EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
23OE_QMAKE_QMAKE = "${WORKDIR}/qmake2"
24
25do_prepare_qmake_symlink() {
26 ln -sf "${STAGING_BINDIR_NATIVE}/qmake2" ${WORKDIR}
27}
28
29addtask prepare_qmake_symlink after do_generate_qt_config_file before do_configure
30
31do_configure_prepend() {
32 sed -i -e "s|\(Prefix\ =\).*|\1${prefix}|" ${WORKDIR}/qt.conf
33 sed -i -r -e "/^(Binaries|Headers|Plugins|Mkspecs)/ d" ${WORKDIR}/qt.conf
34}
35
36do_install() {
37 oe_runmake install DESTDIR=${D} INCLUDEDIR=${includedir}
38}
39
40FILES_${PN}-dev += " \
41 ${includedir}/QtSerialPort/* \
42 ${prefix}/mkspecs/* \
43 ${libdir}/*.prl \
44"
45
46FILES_${PN}-dbg += " \
47 ${libdir}/.debug/* \
48"
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 @@
1Upstream-Status: Pending
2
3diff -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+
20diff -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
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---
3diff --git a/examples/examples.pri b/examples/examples.pri
4index 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
26diff --git a/qwtconfig.pri b/qwtconfig.pri
27index 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 ######################################################################
44diff --git a/src/src.pro b/src/src.pro
45index 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
66diff --git a/textengines/mathml/mathml.pro b/textengines/mathml/mathml.pro
67index 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
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 @@
1inherit qt4e
2
3require qwt.inc
4
5PR = "r1"
6
7SRC_URI[qwt.md5sum] = "ace68558eab873e2da7e641179c4ef0c"
8SRC_URI[qwt.sha256sum] = "3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924dbfdc8003cb2"
9
10RPROVIDES_${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.*
14EXCLUDE_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 @@
1DESCRIPTION = "Qt Widget Extension for Technical Applications"
2SECTION = "libs"
3
4# LGPLv2.1 + some exceptions
5LICENSE = "QWTv1.0"
6LIC_FILES_CHKSUM = "file://COPYING;md5=dac2743472b0462ff3cfb4af42051c88"
7
8SRC_URI = "${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tar.bz2;name=qwt \
9 file://qwt6.patch \
10 file://qwt6-fix-linking-with-ld-gold.patch"
11
12S = "${WORKDIR}/qwt-${PV}"
13
14do_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
21do_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
36PACKAGES_prepend = "${PN}-examples ${PN}-features ${PN}-plugins "
37FILES_${PN}-examples = "${bindir}/*"
38FILES_${PN}-features = "${prefix}/features"
39FILES_${PN}-plugins = "${libdir}/${QT_DIR_NAME}/plugins/designer/*.so"
40FILES_${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 @@
1inherit qt4x11
2
3require qwt.inc
4
5PR = "r1"
6
7SRC_URI[qwt.md5sum] = "ace68558eab873e2da7e641179c4ef0c"
8SRC_URI[qwt.sha256sum] = "3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924dbfdc8003cb2"
9
10RPROVIDES_${PN}-dev = "libqwt-dev"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-21 17:54:55 +0000