summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-4.8.7/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2015-06-02 09:52:57 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-08 17:34:02 +0100
commitba93bdd38dad2146e40d42f8cd20dc7a755529dc (patch)
treef3aa3d5f31b6833c0d2e4698811d6405788164d3 /meta/recipes-qt/qt4/qt4-4.8.7/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
parent20a3a36547831349d5d8b429cb35f1415a856bda (diff)
downloadpoky-ba93bdd38dad2146e40d42f8cd20dc7a755529dc.tar.gz
qt4: upgrade to 4.8.7
Upgrade qt4 packages from version 4.8.6 to 4.8.7. * remove arm64 related patches which are merged * remove 0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch which is backported. * update 0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch and 0013-configure-add-crossarch-option.patch for new version * remove useless variable INC_PR (From OE-Core rev: 4d033fdc5e754e22edb2e9074e30e58847c4b791) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.7/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.7/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
new file mode 100644
index 0000000000..ecaea51e08
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.7/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
@@ -0,0 +1,34 @@
1From b6805e883c078f7647d9234aca4e3513ebd1c9bf Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 1 May 2012 07:48:15 +0200
4Subject: [PATCH 03/21] webkit2: set OUTPUT_DIR value if empty
5
6Without this do_configure was trying to create /include/WebCore/libdummy.prl in root of build host filesystem
7now it's in proper place ${WORKDIR}/qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/include/WebCore/libdummy.prl
8
9First reported here:
10http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg24436.html
11
12Upstream-Status: Pending
13
14Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
15---
16 src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro | 2 ++
17 1 file changed, 2 insertions(+)
18
19diff --git a/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro b/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro
20index 006a88c..5e17193 100644
21--- a/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro
22+++ b/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro
23@@ -3,6 +3,8 @@ TARGET = dummy
24
25 CONFIG -= debug_and_release
26
27+isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..
28+
29 CONFIG(standalone_package) {
30 isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated
31 isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../WebCore/generated
32--
331.8.0
34