diff options
| author |   Kai Kang <kai.kang@windriver.com> | 2015-06-02 09:52:57 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-08 17:30:50 +0100 |
| commit | 4d033fdc5e754e22edb2e9074e30e58847c4b791 (patch) | |
| tree | 85189088f467605738c715ae5b2dcdc78c729354 /meta/recipes-qt/qt4/qt4-4.8.7/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch | |
| parent | 3b1d89a51445cf526ca84eb5b53de434f9585d6e (diff) | |
| download | openembedded-core-contrib-4d033fdc5e754e22edb2e9074e30e58847c4b791.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
Signed-off-by: Kai Kang <kai.kang@windriver.com>
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.patch | 34 |
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 @@ +From b6805e883c078f7647d9234aca4e3513ebd1c9bf Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Tue, 1 May 2012 07:48:15 +0200 +Subject: [PATCH 03/21] webkit2: set OUTPUT_DIR value if empty + +Without this do_configure was trying to create /include/WebCore/libdummy.prl in root of build host filesystem +now it's in proper place ${WORKDIR}/qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/include/WebCore/libdummy.prl + +First reported here: +http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg24436.html + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro b/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro +index 006a88c..5e17193 100644 +--- a/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro ++++ b/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro +@@ -3,6 +3,8 @@ TARGET = dummy + + CONFIG -= debug_and_release + ++isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../.. ++ + CONFIG(standalone_package) { + isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated + isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../WebCore/generated +-- +1.8.0 + |