summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.3.inc9
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.3/fix-translations.patch32
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4-native.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-nativesdk.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free.inc2
6 files changed, 40 insertions, 9 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.7.3.inc b/meta/recipes-qt/qt4/qt-4.7.3.inc
index a5b8b05bff..16c7b08908 100644
--- a/meta/recipes-qt/qt4/qt-4.7.3.inc
+++ b/meta/recipes-qt/qt4/qt-4.7.3.inc
@@ -13,6 +13,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
13 file://0009-support-2bpp.patch \ 13 file://0009-support-2bpp.patch \
14 file://0001-Added-Openembedded-crossarch-option.patch \ 14 file://0001-Added-Openembedded-crossarch-option.patch \
15 file://blacklist-diginotar-certs.diff \ 15 file://blacklist-diginotar-certs.diff \
16 file://fix-translations.patch \
16 file://g++.conf \ 17 file://g++.conf \
17 file://linux.conf \ 18 file://linux.conf \
18 " 19 "
@@ -26,7 +27,9 @@ FILES_${QT_BASE_NAME}-tools += "${bindir}/qml"
26 27
27do_configure_prepend() { 28do_configure_prepend() {
28 for pro in $(find ${S} -name "*.pro") ; do 29 for pro in $(find ${S} -name "*.pro") ; do
29 sed -i 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' $pro 30 sed -i \
31 -e 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' \
32 -e 's:qtPrepareTool(LRELEASE, lrelease):LRELEASE = ${OE_QMAKE_LRELEASE}:g' $pro
30 done 33 done
31 34
32 sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf 35 sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf
@@ -38,10 +41,6 @@ do_configure_prepend() {
38 ${S}/configure 41 ${S}/configure
39} 42}
40 43
41do_configure_append() {
42 sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile
43}
44
45QT_GLFLAGS ?= "" 44QT_GLFLAGS ?= ""
46QT_CONFIG_FLAGS += " -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}" 45QT_CONFIG_FLAGS += " -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}"
47 46
diff --git a/meta/recipes-qt/qt4/qt-4.7.3/fix-translations.patch b/meta/recipes-qt/qt4/qt-4.7.3/fix-translations.patch
new file mode 100644
index 0000000000..906d4e312f
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.7.3/fix-translations.patch
@@ -0,0 +1,32 @@
1fix phony translation linking error
2
3 | .../usr/lib/crt1.o: In function `_start':
4 | .../../sysdeps/i386/elf/start.S:115: undefined reference to `main'
5 | collect2: ld returned 1 exit status
6
7Upstream-Status: Pending
8
9Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
10
11diff --git a/translations/translations.pro b/translations/translations.pro
12index cdaf04a..24fa668 100644
13--- a/translations/translations.pro
14+++ b/translations/translations.pro
15@@ -20,7 +20,7 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN}
16 updateqm.CONFIG += no_link
17 QMAKE_EXTRA_COMPILERS += updateqm
18
19-isEmpty(vcproj) {
20+!isEmpty(vcproj) {
21 QMAKE_LINK = @: IGNORE THIS LINE
22 OBJECTS_DIR =
23 win32:CONFIG -= embed_manifest_exe
24@@ -30,7 +30,7 @@ isEmpty(vcproj) {
25 phony_src.input = PHONY_DEPS
26 phony_src.output = phony.c
27 phony_src.variable_out = GENERATED_SOURCES
28- phony_src.commands = echo int main() { return 0; } > phony.c
29+ phony_src.commands = echo \"int main() { return 0; }\" > phony.c
30 phony_src.name = CREATE phony.c
31 phony_src.CONFIG += combine
32 QMAKE_EXTRA_COMPILERS += phony_src
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index ffa5288b6f..53e1297076 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -3,7 +3,7 @@ SECTION = "libs"
3LICENSE = "LGPLv2.1 | GPLv3" 3LICENSE = "LGPLv2.1 | GPLv3"
4HOMEPAGE = "http://qt.nokia.com" 4HOMEPAGE = "http://qt.nokia.com"
5DEPENDS += "directfb tslib" 5DEPENDS += "directfb tslib"
6INC_PR = "r33" 6INC_PR = "r34"
7 7
8QT_BASE_NAME ?= "qt4-embedded" 8QT_BASE_NAME ?= "qt4-embedded"
9QT_BASE_LIB ?= "libqt-embedded" 9QT_BASE_LIB ?= "libqt-embedded"
diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc
index 59c005926a..ebbee9be25 100644
--- a/meta/recipes-qt/qt4/qt4-native.inc
+++ b/meta/recipes-qt/qt4/qt4-native.inc
@@ -9,7 +9,7 @@ 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 = "r12" 12INC_PR = "r13"
13 13
14inherit native 14inherit native
15 15
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
index 097fadc980..a71c3ae7b0 100644
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
@@ -4,7 +4,7 @@ SECTION = "libs"
4HOMEPAGE = "http://qt.nokia.com" 4HOMEPAGE = "http://qt.nokia.com"
5LICENSE = "LGPLv2.1 | GPLv3" 5LICENSE = "LGPLv2.1 | GPLv3"
6 6
7INC_PR = "r6" 7INC_PR = "r7"
8 8
9FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:" 9FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
10 10
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 93feb0ed34..f76a97f932 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
5SECTION = "x11/libs" 5SECTION = "x11/libs"
6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" 6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
7 7
8INC_PR = "r30" 8INC_PR = "r31"
9 9
10QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " 10QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
11QT_GLFLAGS_qemux86 = "-opengl" 11QT_GLFLAGS_qemux86 = "-opengl"