summaryrefslogtreecommitdiffstats
path: root/recipes-qt
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-01-31 08:35:04 +0100
committerKoen Kooi <koen@dominion.thruhere.net>2011-01-31 10:19:02 +0100
commit183ca02ebee6db8b7575057c48f8e965357eac59 (patch)
treed9135566cfdaa6b8c9c885c8c1b20fc397f99b4f /recipes-qt
parent453f31b13af76a4bfa534ab9fbe4795a10029b84 (diff)
downloadmeta-openembedded-183ca02ebee6db8b7575057c48f8e965357eac59.tar.gz
qt4: sync with paule/qt-fixes3
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'recipes-qt')
-rw-r--r--recipes-qt/qt4/files/0001-cross-compile.patch4
-rw-r--r--recipes-qt/qt4/files/0004-no-qmake.patch4
-rw-r--r--recipes-qt/qt4/files/0009-support-2bpp.patch4
-rw-r--r--recipes-qt/qt4/files/configure-paths.patch21
-rw-r--r--recipes-qt/qt4/files/fix-config-tests.patch2
-rw-r--r--recipes-qt/qt4/files/hack-out-pg_config.patch2
-rw-r--r--recipes-qt/qt4/files/qmake-exists-check.patch18
-rw-r--r--recipes-qt/qt4/files/qt-config.patch3
-rw-r--r--recipes-qt/qt4/files/qthelp-lib-qtclucene.patch86
-rw-r--r--recipes-qt/qt4/qt-4.6.3.inc26
-rw-r--r--recipes-qt/qt4/qt-4.7.1.inc38
-rw-r--r--recipes-qt/qt4/qt4-embedded.inc32
-rw-r--r--recipes-qt/qt4/qt4-embedded_4.6.3.bb4
-rw-r--r--recipes-qt/qt4/qt4-embedded_4.7.1.bb8
-rw-r--r--recipes-qt/qt4/qt4-tools-native.inc13
-rw-r--r--recipes-qt/qt4/qt4-tools-native_4.6.3.bb9
-rw-r--r--recipes-qt/qt4/qt4-tools-native_4.7.1.bb7
-rw-r--r--recipes-qt/qt4/qt4-tools-nativesdk.inc111
-rw-r--r--recipes-qt/qt4/qt4-tools-nativesdk_4.6.3.bb6
-rw-r--r--recipes-qt/qt4/qt4-tools-nativesdk_4.7.1.bb6
-rw-r--r--recipes-qt/qt4/qt4-x11-free.inc22
-rw-r--r--recipes-qt/qt4/qt4-x11-free_4.6.3.bb7
-rw-r--r--recipes-qt/qt4/qt4-x11-free_4.7.1.bb7
-rw-r--r--recipes-qt/qt4/qt4.inc65
-rw-r--r--recipes-qt/qt4/qt4_arch.inc4
25 files changed, 343 insertions, 166 deletions
diff --git a/recipes-qt/qt4/files/0001-cross-compile.patch b/recipes-qt/qt4/files/0001-cross-compile.patch
index 0cf1b8c30..053be06e5 100644
--- a/recipes-qt/qt4/files/0001-cross-compile.patch
+++ b/recipes-qt/qt4/files/0001-cross-compile.patch
@@ -1,3 +1,7 @@
1Add configure option "crossarch" for cross compiling
2
3Ported from OE by: Yu Ke <ke.yu@intel.com>
4
1Index: qt-embedded-linux-opensource-src-4.4.3/configure 5Index: qt-embedded-linux-opensource-src-4.4.3/configure
2=================================================================== 6===================================================================
3--- qt-embedded-linux-opensource-src-4.4.3.orig/configure 2009-03-26 17:02:45.000000000 +0100 7--- qt-embedded-linux-opensource-src-4.4.3.orig/configure 2009-03-26 17:02:45.000000000 +0100
diff --git a/recipes-qt/qt4/files/0004-no-qmake.patch b/recipes-qt/qt4/files/0004-no-qmake.patch
index 86613587a..a58b19f90 100644
--- a/recipes-qt/qt4/files/0004-no-qmake.patch
+++ b/recipes-qt/qt4/files/0004-no-qmake.patch
@@ -3,6 +3,10 @@ From: Michael Krelin <hacker@klever.net>
3Date: Sat, 2 Jun 2007 16:06:59 +0200 3Date: Sat, 2 Jun 2007 16:06:59 +0200
4Subject: [PATCH] no qmake 4Subject: [PATCH] no qmake
5 5
6qmake is already built in qt4-tools-native, so disable it
7
8Ported from OE by: Yu Ke <ke.yu@intel.com>
9
6--- 10---
7 configure | 2 +- 11 configure | 2 +-
8 1 files changed, 1 insertions(+), 1 deletions(-) 12 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/recipes-qt/qt4/files/0009-support-2bpp.patch b/recipes-qt/qt4/files/0009-support-2bpp.patch
index 82506bcbe..cf44ea821 100644
--- a/recipes-qt/qt4/files/0009-support-2bpp.patch
+++ b/recipes-qt/qt4/files/0009-support-2bpp.patch
@@ -1,3 +1,7 @@
1Add 2bpp support
2
3Ported from OE by: Yu Ke <ke.yu@intel.com>
4
1diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/configure qt-embedded-linux-opensource-src-4.4.3/configure 5diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/configure qt-embedded-linux-opensource-src-4.4.3/configure
2--- qt-embedded-linux-opensource-src-4.4.3.orig/configure 2008-09-27 11:01:23.000000000 +0200 6--- qt-embedded-linux-opensource-src-4.4.3.orig/configure 2008-09-27 11:01:23.000000000 +0200
3+++ qt-embedded-linux-opensource-src-4.4.3/configure 2009-01-14 14:30:53.000000000 +0100 7+++ qt-embedded-linux-opensource-src-4.4.3/configure 2009-01-14 14:30:53.000000000 +0100
diff --git a/recipes-qt/qt4/files/configure-paths.patch b/recipes-qt/qt4/files/configure-paths.patch
new file mode 100644
index 000000000..c9259a115
--- /dev/null
+++ b/recipes-qt/qt4/files/configure-paths.patch
@@ -0,0 +1,21 @@
1Index: qt-everywhere-opensource-src-4.6.3/configure
2===================================================================
3--- qt-everywhere-opensource-src-4.6.3.orig/configure 2011-01-10 15:47:37.100607001 +0000
4+++ qt-everywhere-opensource-src-4.6.3/configure 2011-01-10 15:49:14.576606999 +0000
5@@ -7198,11 +7198,11 @@
6 QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc
7
8 #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
9-QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc
10-QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic
11-QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3
12-QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc
13-QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
14+QMAKE_MOC = \${OE_QMAKE_MOC}
15+QMAKE_UIC = \${OE_QMAKE_UIC}
16+QMAKE_UIC3 = \${OE_QMAKE_UIC3}
17+QMAKE_RCC = \${OE_QMAKE_RCC}
18+QMAKE_QDBUSXML2CPP = \${OE_QMAKE_QDBUSXML2CPP}
19 QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include
20 QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib
21
diff --git a/recipes-qt/qt4/files/fix-config-tests.patch b/recipes-qt/qt4/files/fix-config-tests.patch
index 1e5101d8a..21054555b 100644
--- a/recipes-qt/qt4/files/fix-config-tests.patch
+++ b/recipes-qt/qt4/files/fix-config-tests.patch
@@ -2,6 +2,8 @@ Fix invocation in case of "ccache some-compiler-gcc". As the command "ccache som
2 2
3both visibility and relocs were affected. 3both visibility and relocs were affected.
4 4
5Ported from OE by: Yu Ke <ke.yu@intel.com>
6
5Index: qt-x11-opensource-src-4.5.2/config.tests/unix/bsymbolic_functions.test 7Index: qt-x11-opensource-src-4.5.2/config.tests/unix/bsymbolic_functions.test
6=================================================================== 8===================================================================
7--- qt-x11-opensource-src-4.5.2.orig/config.tests/unix/bsymbolic_functions.test 2009-08-01 08:01:11.000000000 +0200 9--- qt-x11-opensource-src-4.5.2.orig/config.tests/unix/bsymbolic_functions.test 2009-08-01 08:01:11.000000000 +0200
diff --git a/recipes-qt/qt4/files/hack-out-pg_config.patch b/recipes-qt/qt4/files/hack-out-pg_config.patch
index 2231adf0c..650ed7745 100644
--- a/recipes-qt/qt4/files/hack-out-pg_config.patch
+++ b/recipes-qt/qt4/files/hack-out-pg_config.patch
@@ -7,7 +7,7 @@ really cross compiling. Just comment out the test, we are passing
7the location to the postgres headers and if they are okay we 7the location to the postgres headers and if they are okay we
8will padd. 8will padd.
9 9
10 10Ported from OE by: Yu Ke <ke.yu@intel.com>
11 11
12Index: qt-embedded-linux-opensource-src-4.5.2/configure 12Index: qt-embedded-linux-opensource-src-4.5.2/configure
13=================================================================== 13===================================================================
diff --git a/recipes-qt/qt4/files/qmake-exists-check.patch b/recipes-qt/qt4/files/qmake-exists-check.patch
new file mode 100644
index 000000000..cc73837e5
--- /dev/null
+++ b/recipes-qt/qt4/files/qmake-exists-check.patch
@@ -0,0 +1,18 @@
1qt4-tools-nativesdk: avoid rebuilding qmake
2
3qt4-tools-nativesdk patch to avoids building qmake in configure if it already exists
4(as it will, since we symlink it in from the native sysroot in do_configure)
5
6Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
7
8--- qt-everywhere-opensource-src-4.6.3.orig/configure 2011-01-10 12:01:56.260607001 +0000
9+++ qt-everywhere-opensource-src-4.6.3/configure 2011-01-10 12:02:20.584607015 +0000
10@@ -4286,7 +4286,7 @@
11 }
12
13 # build qmake
14-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
15+if [ '!' -f "$outpath/bin/qmake" ]; then
16 echo "Creating qmake. Please wait..."
17
18 OLD_QCONFIG_H=
diff --git a/recipes-qt/qt4/files/qt-config.patch b/recipes-qt/qt4/files/qt-config.patch
index a4a701ccd..a31e7b3e2 100644
--- a/recipes-qt/qt4/files/qt-config.patch
+++ b/recipes-qt/qt4/files/qt-config.patch
@@ -1,3 +1,6 @@
1
2Ported from OE by: Yu Ke <ke.yu@intel.com>
3
1--- /tmp/qlibraryinfo.cpp 2008-08-02 17:16:41.000000000 +0200 4--- /tmp/qlibraryinfo.cpp 2008-08-02 17:16:41.000000000 +0200
2+++ qt-embedded-linux-opensource-src-4.4.1/src/corelib/global/qlibraryinfo.cpp 2008-08-02 17:17:42.000000000 +0200 5+++ qt-embedded-linux-opensource-src-4.4.1/src/corelib/global/qlibraryinfo.cpp 2008-08-02 17:17:42.000000000 +0200
3@@ -47,6 +47,7 @@ 6@@ -47,6 +47,7 @@
diff --git a/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch b/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch
new file mode 100644
index 000000000..1d250d8a9
--- /dev/null
+++ b/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch
@@ -0,0 +1,86 @@
1qt-embedded: fix linker error in do_compile
2
3This patch ensures that we link to libQtCLucene where required (i.e. when
4linking to libQtHelp) avoiding a linker error.
5
6Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
7
8Index: qt-everywhere-opensource-src-4.6.3/demos/qtdemo/qtdemo.pro
9===================================================================
10--- qt-everywhere-opensource-src-4.6.3.orig/demos/qtdemo/qtdemo.pro 2011-01-11 16:06:47.382828004 +0000
11+++ qt-everywhere-opensource-src-4.6.3/demos/qtdemo/qtdemo.pro 2011-01-11 16:10:06.906828001 +0000
12@@ -76,3 +76,10 @@
13 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES qtdemo.pro images xml *.ico *.icns *.rc *.plist
14 sources.path = $$[QT_INSTALL_DEMOS]/qtdemo
15
16+qclucene = QtCLucene$${QT_LIBINFIX}
17+if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
18+ mac:qclucene = $${qclucene}_debug
19+ win32:qclucene = $${qclucene}d
20+}
21+linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
22+LIBS_PRIVATE += -l$$qclucene
23Index: qt-everywhere-opensource-src-4.6.3/examples/help/contextsensitivehelp/contextsensitivehelp.pro
24===================================================================
25--- qt-everywhere-opensource-src-4.6.3.orig/examples/help/contextsensitivehelp/contextsensitivehelp.pro 2011-01-11 16:05:56.598828002 +0000
26+++ qt-everywhere-opensource-src-4.6.3/examples/help/contextsensitivehelp/contextsensitivehelp.pro 2011-01-11 16:09:57.762828002 +0000
27@@ -18,3 +18,11 @@
28 INSTALLS += target sources
29
30 symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
31+
32+qclucene = QtCLucene$${QT_LIBINFIX}
33+if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
34+ mac:qclucene = $${qclucene}_debug
35+ win32:qclucene = $${qclucene}d
36+}
37+linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
38+LIBS_PRIVATE += -l$$qclucene
39Index: qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/assistant/assistant.pro
40===================================================================
41--- qt-everywhere-opensource-src-4.6.3.orig/tools/assistant/tools/assistant/assistant.pro 2011-01-11 14:56:50.902828001 +0000
42+++ qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/assistant/assistant.pro 2011-01-11 16:09:39.914828003 +0000
43@@ -85,3 +85,11 @@
44 DEFINES += USE_STATIC_SQLITE_PLUGIN
45 }
46 }
47+
48+qclucene = QtCLucene$${QT_LIBINFIX}
49+if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
50+ mac:qclucene = $${qclucene}_debug
51+ win32:qclucene = $${qclucene}d
52+}
53+linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
54+LIBS_PRIVATE += -l$$qclucene
55Index: qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro
56===================================================================
57--- qt-everywhere-opensource-src-4.6.3.orig/tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro 2011-01-11 14:56:50.918828002 +0000
58+++ qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro 2011-01-11 16:09:44.538828001 +0000
59@@ -12,3 +12,11 @@
60 main.cpp
61
62 HEADERS += ../shared/helpgenerator.h
63+
64+qclucene = QtCLucene$${QT_LIBINFIX}
65+if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
66+ mac:qclucene = $${qclucene}_debug
67+ win32:qclucene = $${qclucene}d
68+}
69+linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
70+LIBS_PRIVATE += -l$$qclucene
71Index: qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro
72===================================================================
73--- qt-everywhere-opensource-src-4.6.3.orig/tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro 2011-01-11 14:56:50.930828002 +0000
74+++ qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro 2011-01-11 16:09:50.274828003 +0000
75@@ -12,3 +12,11 @@
76 main.cpp
77
78 HEADERS += ../shared/helpgenerator.h
79+
80+qclucene = QtCLucene$${QT_LIBINFIX}
81+if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
82+ mac:qclucene = $${qclucene}_debug
83+ win32:qclucene = $${qclucene}d
84+}
85+linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
86+LIBS_PRIVATE += -l$$qclucene
diff --git a/recipes-qt/qt4/qt-4.6.3.inc b/recipes-qt/qt4/qt-4.6.3.inc
index dc928c105..a41b48318 100644
--- a/recipes-qt/qt4/qt-4.6.3.inc
+++ b/recipes-qt/qt4/qt-4.6.3.inc
@@ -1,13 +1,9 @@
1DEFAULT_PREFERENCE = "-1"
2
3LICENSE = "LGPLv2.1 | GPLv3" 1LICENSE = "LGPLv2.1 | GPLv3"
4LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ 2LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
5 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \ 3 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
6 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" 4 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
7 5
8FILESPATHPKG .= ":qt-${PV}" 6SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
9
10SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
11 file://0001-cross-compile.patch \ 7 file://0001-cross-compile.patch \
12 file://0002-fix-resinit-declaration.patch \ 8 file://0002-fix-resinit-declaration.patch \
13 file://0004-no-qmake.patch \ 9 file://0004-no-qmake.patch \
@@ -23,8 +19,8 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.
23 file://mips-relocate.patch \ 19 file://mips-relocate.patch \
24 " 20 "
25 21
26# Set necessary variables in the profile 22SRC_URI[md5sum] = "5c69f16d452b0bb3d44bc3c10556c072"
27SRC_URI += "file://qte.sh" 23SRC_URI[sha256sum] = "f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768"
28 24
29S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" 25S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
30 26
@@ -58,19 +54,3 @@ do_compile() {
58 unset CFLAGS CXXFLAGS 54 unset CFLAGS CXXFLAGS
59 oe_runmake ${EXTRA_ENV} 55 oe_runmake ${EXTRA_ENV}
60} 56}
61
62do_install_append() {
63 install -d ${D}${bindir}
64 for i in rcc uic moc ; do
65 install -m 0755 ${S}/bin/$i ${D}${bindir}/
66 done
67
68 #Append an E to the qtdemo file
69 if [ -n "${QT_LIBINFIX}" ] ; then
70 mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
71 fi
72}
73
74SRC_URI[md5sum] = "5c69f16d452b0bb3d44bc3c10556c072"
75SRC_URI[sha256sum] = "f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768"
76
diff --git a/recipes-qt/qt4/qt-4.7.1.inc b/recipes-qt/qt4/qt-4.7.1.inc
index 682707ad7..70ee59697 100644
--- a/recipes-qt/qt4/qt-4.7.1.inc
+++ b/recipes-qt/qt4/qt-4.7.1.inc
@@ -1,5 +1,3 @@
1DEFAULT_PREFERENCE = "-1"
2
3LICENSE = "LGPLv2.1 | GPLv3" 1LICENSE = "LGPLv2.1 | GPLv3"
4LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ 2LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
5 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \ 3 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
@@ -7,17 +5,17 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
7 5
8FILESPATH =. "${FILE_DIRNAME}/qt-${PV}:" 6FILESPATH =. "${FILE_DIRNAME}/qt-${PV}:"
9 7
10SRC_URI = "\ 8SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
11 ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ 9 file://0004-no-qmake.patch \
12 file://0004-no-qmake.patch \ 10 file://hack-out-pg2-4.7.0.patch \
13 file://hack-out-pg2-4.7.0.patch \ 11 file://0006-freetype-host-includes.patch \
14 file://0006-freetype-host-includes.patch \ 12 file://0001-Added-Openembedded-crossarch-option.patch \
15 file://0001-Added-Openembedded-crossarch-option.patch \ 13 file://g++.conf \
16 file://g++.conf \ 14 file://linux.conf \
17 file://linux.conf \
18 " 15 "
19# Set necessary variables in the profile 16
20SRC_URI += "file://qte.sh" 17SRC_URI[md5sum] = "6f88d96507c84e9fea5bf3a71ebeb6d7"
18SRC_URI[sha256sum] = "8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a"
21 19
22S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" 20S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
23 21
@@ -58,19 +56,3 @@ do_compile() {
58 56
59 oe_runmake ${EXTRA_ENV} 57 oe_runmake ${EXTRA_ENV}
60} 58}
61
62do_install_append() {
63 install -d ${D}${bindir}
64 for i in rcc uic moc ; do
65 install -m 0755 ${S}/bin/$i ${D}${bindir}/
66 done
67
68 #Append an E to the qtdemo file
69 if [ -n "${QT_LIBINFIX}" ] ; then
70 mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
71 fi
72}
73
74SRC_URI[md5sum] = "6f88d96507c84e9fea5bf3a71ebeb6d7"
75SRC_URI[sha256sum] = "8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a"
76
diff --git a/recipes-qt/qt4/qt4-embedded.inc b/recipes-qt/qt4/qt4-embedded.inc
index 932f005d2..2ed1819f6 100644
--- a/recipes-qt/qt4/qt4-embedded.inc
+++ b/recipes-qt/qt4/qt4-embedded.inc
@@ -1,37 +1,19 @@
1SUMMARY = "Qt is a versatile cross-platform application framework -- this is the embedded version." 1DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the embedded version."
2DESCRIPTION = "${SUMMARY}"
3SECTION = "libs" 2SECTION = "libs"
4LICENSE = "GPL QPL" 3LICENSE = "LGPLv2.1 | GPLv3"
5PRIORITY = "optional" 4PRIORITY = "optional"
6HOMEPAGE = "http://www.trolltech.com" 5HOMEPAGE = "http://qt.nokia.com"
7DEPENDS += "directfb tslib" 6DEPENDS += "directfb tslib"
8INC_PR = "r25" 7INC_PR = "r26"
9 8
10QT_BASE_NAME ?= "qt4-embedded" 9QT_BASE_NAME ?= "qt4-embedded"
11QT_BASE_LIB ?= "libqt-embedded" 10QT_BASE_LIB ?= "libqt-embedded"
12QT_DIR_NAME = "qtopia"
13QT_LIBINFIX = "E"
14
15SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
16 file://0001-cross-compile.patch \
17 file://0002-fix-resinit-declaration.patch \
18 file://0003-no-tools.patch \
19 file://0004-no-qmake.patch \
20 file://0006-freetype-host-includes.patch \
21 file://0007-openssl-host-includes.patch \
22 file://0008-qt-lib-infix.patch \
23 file://0009-support-2bpp.patch \
24 file://fix-config-tests.patch \
25 file://g++.conf \
26 file://linux.conf \
27 "
28 11
29# Set necessary variables in the profile 12# Set necessary variables in the profile
30SRC_URI += "file://qte.sh" 13SRC_URI += "file://qte.sh"
31 14
32S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}"
33
34QT_CONFIG_FLAGS += " \ 15QT_CONFIG_FLAGS += " \
16 -embedded ${QT_ARCH} \
35 -qtlibinfix ${QT_LIBINFIX} \ 17 -qtlibinfix ${QT_LIBINFIX} \
36 -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc -plugin-gfx-directfb \ 18 -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc -plugin-gfx-directfb \
37 -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \ 19 -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \
@@ -42,8 +24,8 @@ QT_CONFIG_FLAGS += " \
42require qt4.inc 24require qt4.inc
43 25
44do_install_append() { 26do_install_append() {
45 install -d ${D}${sysconfdir}/profile.d/ 27 install -d ${D}${sysconfdir}/profile.d/
46 install -m 0755 ${WORKDIR}/qte.sh ${D}${sysconfdir}/profile.d/ 28 install -m 0755 ${WORKDIR}/qte.sh ${D}${sysconfdir}/profile.d/
47} 29}
48 30
49FILES_${PN} += " ${sysconfdir}/profile.d/qte.sh" 31FILES_${PN} += " ${sysconfdir}/profile.d/qte.sh"
diff --git a/recipes-qt/qt4/qt4-embedded_4.6.3.bb b/recipes-qt/qt4/qt4-embedded_4.6.3.bb
index 13f3f00ed..dd662aa3d 100644
--- a/recipes-qt/qt4/qt4-embedded_4.6.3.bb
+++ b/recipes-qt/qt4/qt4-embedded_4.6.3.bb
@@ -1,7 +1,9 @@
1require qt-${PV}.inc
1require qt4-embedded.inc 2require qt4-embedded.inc
2 3
4SRC_URI += "file://qthelp-lib-qtclucene.patch"
5
3PR = "${INC_PR}.1" 6PR = "${INC_PR}.1"
4 7
5QT_CONFIG_FLAGS_append_armv6 = " -no-neon " 8QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
6 9
7require qt-${PV}.inc
diff --git a/recipes-qt/qt4/qt4-embedded_4.7.1.bb b/recipes-qt/qt4/qt4-embedded_4.7.1.bb
index 1cd43a664..c3f671319 100644
--- a/recipes-qt/qt4/qt4-embedded_4.7.1.bb
+++ b/recipes-qt/qt4/qt4-embedded_4.7.1.bb
@@ -1,14 +1,10 @@
1DEFAULT_PREFERENCE = "-1" 1require qt-${PV}.inc
2
3require qt4-embedded.inc 2require qt4-embedded.inc
4 3
5PR = "${INC_PR}.0" 4PR = "${INC_PR}.1"
6 5
7QT_CONFIG_FLAGS_append_armv6 = " -no-neon " 6QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
8 7
9require qt-${PV}.inc
10
11QT_CONFIG_FLAGS += " \ 8QT_CONFIG_FLAGS += " \
12 -exceptions \ 9 -exceptions \
13" 10"
14
diff --git a/recipes-qt/qt4/qt4-tools-native.inc b/recipes-qt/qt4/qt4-tools-native.inc
index fa859af98..9114e7df6 100644
--- a/recipes-qt/qt4/qt4-tools-native.inc
+++ b/recipes-qt/qt4/qt4-tools-native.inc
@@ -1,7 +1,7 @@
1DESCRIPTION = "Native tools for Qt/[X11|Mac|Embedded] version 4.x" 1DESCRIPTION = "Native tools for Qt/[X11|Mac|Embedded] version 4.x"
2DEPENDS = "zlib-native dbus-native" 2DEPENDS = "zlib-native dbus-native"
3SECTION = "libs" 3SECTION = "libs"
4HOMEPAGE = "http://qt.nokia.com 4HOMEPAGE = "http://qt.nokia.com"
5PRIORITY = "optional" 5PRIORITY = "optional"
6 6
7LICENSE = "LGPLv2.1 | GPLv3" 7LICENSE = "LGPLv2.1 | GPLv3"
@@ -9,11 +9,11 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
9 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \ 9 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
10 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" 10 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
11 11
12INC_PR = "r10" 12INC_PR = "r11"
13 13
14inherit native 14inherit native
15 15
16SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ 16SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
17 file://qt-config.patch \ 17 file://qt-config.patch \
18 file://g++.conf \ 18 file://g++.conf \
19 file://linux.conf" 19 file://linux.conf"
@@ -51,11 +51,8 @@ TOBUILD = "\
51 src/tools/uic \ 51 src/tools/uic \
52 src/tools/rcc \ 52 src/tools/rcc \
53 src/network \ 53 src/network \
54 src/gui \
55 src/tools/uic3 \
56 tools/linguist/lrelease \ 54 tools/linguist/lrelease \
57 tools/linguist/lupdate \ 55 tools/linguist/lupdate \
58 tools/qdbus \
59" 56"
60 57
61do_compile() { 58do_compile() {
@@ -64,12 +61,10 @@ do_compile() {
64 done 61 done
65} 62}
66 63
67NATIVE_INSTALL_WORKS = "1"
68
69do_install() { 64do_install() {
70 install -d ${D}${bindir}/ 65 install -d ${D}${bindir}/
71 install -m 0755 bin/qmake ${D}${bindir}/qmake2 66 install -m 0755 bin/qmake ${D}${bindir}/qmake2
72 for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do 67 for i in moc uic rcc lrelease lupdate; do
73 install -m 0755 bin/${i} ${D}${bindir}/${i}4 68 install -m 0755 bin/${i} ${D}${bindir}/${i}4
74 done 69 done
75 70
diff --git a/recipes-qt/qt4/qt4-tools-native_4.6.3.bb b/recipes-qt/qt4/qt4-tools-native_4.6.3.bb
index be6a72b7c..dae8cd19e 100644
--- a/recipes-qt/qt4/qt4-tools-native_4.6.3.bb
+++ b/recipes-qt/qt4/qt4-tools-native_4.6.3.bb
@@ -1,12 +1,5 @@
1DEFAULT_PREFERENCE = "-1"
2
3LICENSE = "LGPLv2.1 | GPLv3"
4LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
5 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
6 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
7
8require qt4-tools-native.inc 1require qt4-tools-native.inc
9LICENSE = "LGPLv2.1 GPLv3" 2
10PR = "${INC_PR}.0" 3PR = "${INC_PR}.0"
11 4
12EXTRA_OECONF += " -no-fast -silent -no-rpath" 5EXTRA_OECONF += " -no-fast -silent -no-rpath"
diff --git a/recipes-qt/qt4/qt4-tools-native_4.7.1.bb b/recipes-qt/qt4/qt4-tools-native_4.7.1.bb
index c808777fb..e9de510fe 100644
--- a/recipes-qt/qt4/qt4-tools-native_4.7.1.bb
+++ b/recipes-qt/qt4/qt4-tools-native_4.7.1.bb
@@ -1,16 +1,9 @@
1DEFAULT_PREFERENCE = "-1"
2
3require qt4-tools-native.inc 1require qt4-tools-native.inc
4 2
5PR = "${INC_PR}.0" 3PR = "${INC_PR}.0"
6 4
7# Find the g++.conf/linux.conf in the right directory. 5# Find the g++.conf/linux.conf in the right directory.
8FILESPATHPKG =. "qt-${PV}:" 6FILESPATHPKG =. "qt-${PV}:"
9SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
10 file://qt-config.patch \
11 file://g++.conf \
12 file://linux.conf"
13S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
14 7
15EXTRA_OECONF += " -no-fast -silent -no-rpath" 8EXTRA_OECONF += " -no-fast -silent -no-rpath"
16 9
diff --git a/recipes-qt/qt4/qt4-tools-nativesdk.inc b/recipes-qt/qt4/qt4-tools-nativesdk.inc
new file mode 100644
index 000000000..f273c9fab
--- /dev/null
+++ b/recipes-qt/qt4/qt4-tools-nativesdk.inc
@@ -0,0 +1,111 @@
1DESCRIPTION = "SDK tools for Qt/[X11|Mac|Embedded] version 4.x"
2DEPENDS = "zlib-nativesdk dbus-nativesdk libx11-nativesdk qt4-tools-native"
3SECTION = "libs"
4HOMEPAGE = "http://qt.nokia.com"
5PRIORITY = "optional"
6LICENSE = "LGPLv2.1 | GPLv3"
7
8INC_PR = "r3"
9
10FILESPATHPKG =. "qt-${PV}:"
11inherit nativesdk qmake2
12
13SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
14 file://configure-lflags.patch \
15 file://compile.test-lflags.patch \
16 file://qt-config.patch \
17 file://qmake-exists-check.patch \
18 file://configure-paths.patch \
19 file://g++.conf \
20 file://linux.conf"
21
22S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
23
24LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
25 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
26 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
27
28# FIXME: make it work with "${STAGING_BINDIR_NATIVE}/pkg-config --cflags dbus-1"
29EXTRA_OECONF = "-prefix ${prefix} \
30 -qt-libjpeg -qt-gif -system-zlib \
31 -no-libjpeg -no-libpng -no-libmng -no-libtiff \
32 -no-accessibility \
33 -no-cups \
34 -no-exceptions \
35 -no-nas-sound \
36 -no-nis -no-openssl \
37 -verbose -release -fast -static \
38 -platform ${TARGET_OS}-oe-g++ \
39 -xplatform ${TARGET_OS}-oe-g++ \
40 -embedded -no-freetype -no-glib -no-iconv \
41 -qt3support \
42 -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include \
43 -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/freetype2 \
44 -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/dbus-1.0 \
45 -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/lib/dbus-1.0/include \
46 -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/c++ \
47 -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/c++/${TARGET_SYS} \
48 -L${STAGING_DIR_HOST}${SDKPATHNATIVE}/lib \
49 -L${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/lib"
50
51# yank default -e, otherwise we get the following error:
52# moc_qbuffer.cpp: No such file or directory
53EXTRA_OEMAKE = " "
54
55do_configure() {
56 if [ ! -e bin/qmake ]; then
57 ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake
58 fi
59
60 if [ ! -e mkspecs/${TARGET_OS}-oe-g++ ]; then
61 ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++
62 fi
63
64 cp ../g++.conf mkspecs/common
65 cp ../linux.conf mkspecs/common
66
67 (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
68}
69
70TOBUILD = "\
71 src/tools/bootstrap \
72 src/tools/moc \
73 src/corelib \
74 src/sql \
75 src/dbus \
76 src/qt3support \
77 src/xml \
78 src/tools/uic \
79 src/tools/rcc \
80 src/network \
81 src/gui \
82 src/tools/uic3 \
83 tools/linguist/lrelease \
84 tools/linguist/lupdate \
85 tools/qdbus \
86"
87
88do_compile() {
89 for i in ${TOBUILD}; do
90 cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
91 done
92}
93
94do_install() {
95 install -d ${D}${bindir}
96 install -m 0755 bin/qmake ${D}${bindir}/qmake2
97 for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do
98 install -m 0755 bin/${i} ${D}${bindir}/${i}4
99 done
100
101 (cd ${D}${bindir}; \
102 ln -s qmake2 qmake; \
103 for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do \
104 ln -s ${i}4 ${i}; \
105 done)
106
107 # make a symbolic link to mkspecs for compatibility with Nokia's SDK
108 # and QTCreator
109 (cd ${D}${bindir}/..; ln -s ${TARGET_SYS}/usr/share/qtopia/mkspecs mkspecs;)
110}
111
diff --git a/recipes-qt/qt4/qt4-tools-nativesdk_4.6.3.bb b/recipes-qt/qt4/qt4-tools-nativesdk_4.6.3.bb
new file mode 100644
index 000000000..d64542b5f
--- /dev/null
+++ b/recipes-qt/qt4/qt4-tools-nativesdk_4.6.3.bb
@@ -0,0 +1,6 @@
1require qt4-tools-nativesdk.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI[md5sum] = "5c69f16d452b0bb3d44bc3c10556c072"
6SRC_URI[sha256sum] = "f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768"
diff --git a/recipes-qt/qt4/qt4-tools-nativesdk_4.7.1.bb b/recipes-qt/qt4/qt4-tools-nativesdk_4.7.1.bb
new file mode 100644
index 000000000..091a53927
--- /dev/null
+++ b/recipes-qt/qt4/qt4-tools-nativesdk_4.7.1.bb
@@ -0,0 +1,6 @@
1require qt4-tools-nativesdk.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI[md5sum] = "6f88d96507c84e9fea5bf3a71ebeb6d7"
6SRC_URI[sha256sum] = "8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a"
diff --git a/recipes-qt/qt4/qt4-x11-free.inc b/recipes-qt/qt4/qt4-x11-free.inc
index 22242e421..057a129ec 100644
--- a/recipes-qt/qt4/qt4-x11-free.inc
+++ b/recipes-qt/qt4/qt4-x11-free.inc
@@ -1,25 +1,13 @@
1require qt4.inc
2
1DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version." 3DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version."
4HOMEPAGE = "http://qt.nokia.com"
2SECTION = "x11/libs" 5SECTION = "x11/libs"
3PRIORITY = "optional" 6PRIORITY = "optional"
4HOMEPAGE = "http://www.trolltech.com"
5DEPENDS += "virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" 7DEPENDS += "virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
6 8
7INC_PR = "r21" 9INC_PR = "r21"
8 10
9SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
10 file://0001-cross-compile.patch \
11 file://0002-fix-resinit-declaration.patch \
12 file://0003-no-tools.patch \
13 file://0004-no-qmake.patch \
14 file://0006-freetype-host-includes.patch \
15 file://0007-openssl-host-includes.patch \
16 file://0008-qt-lib-infix.patch \
17 file://fix-config-tests.patch \
18 file://g++.conf \
19 file://linux.conf \
20 "
21S = "${WORKDIR}/qt-x11-opensource-src-${PV}"
22
23QT_GLFLAGS ?= "-no-opengl" 11QT_GLFLAGS ?= "-no-opengl"
24QT_GLFLAGS_qemux86 = "-opengl" 12QT_GLFLAGS_qemux86 = "-opengl"
25QT_GLFLAGS_emenlow = "-opengl" 13QT_GLFLAGS_emenlow = "-opengl"
@@ -27,10 +15,6 @@ QT_GLFLAGS_atom-pc = "-opengl"
27QT_CONFIG_FLAGS += "-no-xinerama -no-xkb ${QT_GLFLAGS}" 15QT_CONFIG_FLAGS += "-no-xinerama -no-xkb ${QT_GLFLAGS}"
28QT_BASE_NAME ?= "qt4" 16QT_BASE_NAME ?= "qt4"
29QT_BASE_LIB ?= "libqt" 17QT_BASE_LIB ?= "libqt"
30QT_DIR_NAME = "qt4"
31QT_LIBINFIX = ""
32
33require qt4.inc
34 18
35inherit qt4x11 19inherit qt4x11
36 20
diff --git a/recipes-qt/qt4/qt4-x11-free_4.6.3.bb b/recipes-qt/qt4/qt4-x11-free_4.6.3.bb
index 0a03e9b5a..8cf544925 100644
--- a/recipes-qt/qt4/qt4-x11-free_4.6.3.bb
+++ b/recipes-qt/qt4/qt4-x11-free_4.6.3.bb
@@ -1,9 +1,6 @@
1require qt-${PV}.inc
1require qt4-x11-free.inc 2require qt4-x11-free.inc
2require qt-4.6.3.inc
3 3
4PR = "r1" 4PR = "${INC_PR}.0"
5 5
6QT_CONFIG_FLAGS += " -xrandr " 6QT_CONFIG_FLAGS += " -xrandr "
7
8SRC_URI[md5sum] = "5c69f16d452b0bb3d44bc3c10556c072"
9SRC_URI[sha256sum] = "f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768"
diff --git a/recipes-qt/qt4/qt4-x11-free_4.7.1.bb b/recipes-qt/qt4/qt4-x11-free_4.7.1.bb
index 79a765ed7..75c6314e7 100644
--- a/recipes-qt/qt4/qt4-x11-free_4.7.1.bb
+++ b/recipes-qt/qt4/qt4-x11-free_4.7.1.bb
@@ -1,13 +1,10 @@
1DEFAULT_PREFERENCE = "-1"
2
3require qt4-x11-free.inc 1require qt4-x11-free.inc
2require qt-${PV}.inc
4 3
5PR = "${INC_PR}.0" 4PR = "${INC_PR}.1"
6 5
7QT_CONFIG_FLAGS_append_armv6 = " -no-neon " 6QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
8 7
9require qt-${PV}.inc
10
11QT_CONFIG_FLAGS += " \ 8QT_CONFIG_FLAGS += " \
12 -no-embedded \ 9 -no-embedded \
13 -xrandr \ 10 -xrandr \
diff --git a/recipes-qt/qt4/qt4.inc b/recipes-qt/qt4/qt4.inc
index ac1fc83b1..32dee4c20 100644
--- a/recipes-qt/qt4/qt4.inc
+++ b/recipes-qt/qt4/qt4.inc
@@ -1,16 +1,20 @@
1inherit qmake_base 1inherit qmake_base
2 2
3DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base mysql5 postgresql sqlite sqlite3" 3DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3"
4 4
5require qt4_arch.inc 5require qt4_arch.inc
6QT_ARCH := "${@qt_arch(d)}" 6QT_ARCH := "${@qt_arch(d)}"
7QT_ENDIAN = "${@qt_endian(d)}" 7QT_ENDIAN = "${@qt_endian(d)}"
8 8
9QT_CONFIG_FLAGS += "-release -no-cups -no-accessibility -reduce-relocations \ 9QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm"
10 -shared -no-nas-sound -no-sm -no-nis \ 10QT_DISTRO_FLAGS_poky-lsb = "-sm"
11
12QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \
13 -shared -no-nas-sound -no-nis \
11 -qt-gif -system-libjpeg -system-libpng -system-zlib \ 14 -qt-gif -system-libjpeg -system-libpng -system-zlib \
12 -no-sql-ibase -plugin-sql-mysql -no-sql-odbc -plugin-sql-psql -plugin-sql-sqlite -plugin-sql-sqlite2 \ 15 -no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite \
13 -no-pch -qdbus -stl -glib -phonon -webkit" 16 -no-pch -qdbus -stl -glib -phonon -webkit \
17 ${QT_DISTRO_FLAGS} "
14 18
15EXTRA_OEMAKE = "-e" 19EXTRA_OEMAKE = "-e"
16 20
@@ -109,6 +113,16 @@ RRECOMMENDS_${QT_BASE_NAME}-fonts = " \
109 ${QT_BASE_NAME}-fonts-pfa \ 113 ${QT_BASE_NAME}-fonts-pfa \
110 ${QT_BASE_NAME}-fonts-pfb \ 114 ${QT_BASE_NAME}-fonts-pfb \
111 ${QT_BASE_NAME}-fonts-qpf" 115 ${QT_BASE_NAME}-fonts-qpf"
116RRECOMMENDS_${QT_BASE_NAME}-demos += " \
117 ${QT_BASE_NAME}-fonts \
118 ${QT_BASE_NAME}-examples \
119 ${QT_BASE_NAME}-plugin-sqldriver-sqlite \
120 ${QT_BASE_NAME}-plugin-imageformat-jpeg \
121 ${QT_BASE_NAME}-assistant \
122 ${PN}-doc"
123RRECOMMENDS_${QT_BASE_NAME}-examples += " \
124 ${QT_BASE_NAME}-plugin-sqldriver-sqlite \
125 ${QT_BASE_NAME}-plugin-imageformat-jpeg"
112 126
113FILES_${QT_BASE_NAME}-tools = "${bindir}/uic* ${bindir}/moc ${bindir}/rcc ${bindir}/qttracereplay ${bindir}/qdoc*" 127FILES_${QT_BASE_NAME}-tools = "${bindir}/uic* ${bindir}/moc ${bindir}/rcc ${bindir}/qttracereplay ${bindir}/qdoc*"
114FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/uic* ${bindir}/.debug/moc ${bindir}/.debug/rcc ${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc*" 128FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/uic* ${bindir}/.debug/moc ${bindir}/.debug/rcc ${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc*"
@@ -187,22 +201,11 @@ do_configure() {
187 -demosdir ${bindir}/${QT_DIR_NAME}/demos \ 201 -demosdir ${bindir}/${QT_DIR_NAME}/demos \
188 -platform ${TARGET_OS}-oe-g++ \ 202 -platform ${TARGET_OS}-oe-g++ \
189 -xplatform ${TARGET_OS}-oe-g++ \ 203 -xplatform ${TARGET_OS}-oe-g++ \
190 -embedded ${QT_ARCH} ${QT_ENDIAN} \ 204 ${QT_ENDIAN} \
191 -crossarch ${QT_ARCH} \ 205 -crossarch ${QT_ARCH} \
192 ${QT_CONFIG_FLAGS} -no-fast \ 206 ${QT_CONFIG_FLAGS} -no-fast \
193 -L${STAGING_LIBDIR} -I${STAGING_INCDIR} \ 207 -L${STAGING_LIBDIR} -I${STAGING_INCDIR} \
194 -I${STAGING_INCDIR}/freetype2 \ 208 -I${STAGING_INCDIR}/freetype2
195 -I${STAGING_INCDIR}/mysql \
196 -I${STAGING_INCDIR}/postgresql
197}
198
199do_compile() {
200 unset CFLAGS CXXFLAGS
201 install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc
202 install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc
203 install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic
204
205 oe_runmake ${EXTRA_ENV}
206} 209}
207 210
208python populate_packages_prepend() { 211python populate_packages_prepend() {
@@ -260,7 +263,7 @@ python populate_packages_prepend() {
260 263
261do_install() { 264do_install() {
262 oe_runmake install INSTALL_ROOT=${D} 265 oe_runmake install INSTALL_ROOT=${D}
263 266
264 # These are host binaries, we should only use them in staging 267 # These are host binaries, we should only use them in staging
265 rm -rf ${D}/${bindir}/qmake 268 rm -rf ${D}/${bindir}/qmake
266 269
@@ -284,18 +287,26 @@ do_install() {
284 -e s#"uic_location=.*$"#"uic_location=${bindir}/uic4"# \ 287 -e s#"uic_location=.*$"#"uic_location=${bindir}/uic4"# \
285 ${D}${libdir}/pkgconfig/*.pc 288 ${D}${libdir}/pkgconfig/*.pc
286 for name in ${QT_LIB_NAMES}; do 289 for name in ${QT_LIB_NAMES}; do
287 sed -i -e /Requires/s#"${name}"#"${name}${QT_LIBINFIX}"#g ${D}${libdir}/pkgconfig/*.pc 290 sed -i -e /Requires/s#"${name}"#"${name}${QT_LIBINFIX}"#g ${D}${libdir}/pkgconfig/*.pc
288 done 291 done
289 292
290 # QT abuses $includedir to point to its headers, which breaks pkgconfig sysroot, so manually fix it up here: 293 # QT abuses $includedir to point to its headers, which breaks pkgconfig sysroot, so manually fix it up here:
291 for pc in ${D}${libdir}/pkgconfig/*.pc ; do 294 for pc in ${D}${libdir}/pkgconfig/*.pc ; do
292 sed -i -e "s:prefix}include/${QT_BASE_NAME}/$(basename $pc .pc):prefix}/include:" \ 295 sed -i -e "s:prefix}include/${QT_BASE_NAME}/$(basename $pc .pc):prefix}/include:" \
293 -e "s,Cflags: ,Cflags: -IP{includedir}/${QT_BASE_NAME}/$(basename $pc .pc) ," \ 296 -e "s,Cflags: ,Cflags: -IP{includedir}/${QT_BASE_NAME}/$(basename $pc .pc) ," \
294 -e 's:IP{:I${:g' $pc 297 -e 's:IP{:I${:g' $pc
295 done 298 done
296 299
297 install -d ${D}/${libdir}/fonts 300 install -d ${D}/${libdir}/fonts
298 touch ${D}/${libdir}/fonts/fontdir 301 touch ${D}/${libdir}/fonts/fontdir
299}
300 302
303 install -d ${D}${bindir}
304 for i in rcc uic moc ; do
305 install -m 0755 ${S}/bin/$i ${D}${bindir}/
306 done
301 307
308 #Append an E to the qtdemo file
309 if [ -n "${QT_LIBINFIX}" ] ; then
310 mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
311 fi
312}
diff --git a/recipes-qt/qt4/qt4_arch.inc b/recipes-qt/qt4/qt4_arch.inc
index e8c8fabe6..7f4be63bc 100644
--- a/recipes-qt/qt4/qt4_arch.inc
+++ b/recipes-qt/qt4/qt4_arch.inc
@@ -17,9 +17,9 @@ def qt_arch(d):
17 17
18def qt_endian(d): 18def qt_endian(d):
19 import bb 19 import bb
20 if bb.data.getVar('SITEINFO_ENDIANNESS', d, True) == "le": 20 if bb.data.getVar('SITEINFO_ENDIANESS', d, True) == "le":
21 return "-little-endian" 21 return "-little-endian"
22 elif bb.data.getVar('SITEINFO_ENDIANNESS', d, True) == "be": 22 elif bb.data.getVar('SITEINFO_ENDIANESS', d, True) == "be":
23 return "-big-endian" 23 return "-big-endian"
24 else: 24 else:
25 assert False 25 assert False
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-30 20:19:50 +0000