summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt-4.8.1/fix-translations.patch
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2012-03-28 21:46:55 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-26 10:05:05 +0100
commit54a6f8498eb3031437fd6f889787b4a2c7ce4924 (patch)
tree853a265a0c2bbd45214924a5ec3522db6215691e /meta/recipes-qt/qt4/qt-4.8.1/fix-translations.patch
parent343c85f77daa54760b456d247a71246d48a21e16 (diff)
downloadpoky-54a6f8498eb3031437fd6f889787b4a2c7ce4924.tar.gz
qt4: move from 4.8.0 to 4.8.1
* No changes other than source checksums and PR at recipe level. * DEFAULT_PREFERENCE still set to -1 (From OE-Core rev: 6a21cf0068234152b3f13866dc7c05adc6d0d9c9) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt-4.8.1/fix-translations.patch')
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.1/fix-translations.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/fix-translations.patch b/meta/recipes-qt/qt4/qt-4.8.1/fix-translations.patch
new file mode 100644
index 0000000000..906d4e312f
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.8.1/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