summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-5.1.1/0013-Disable-mkv8snapshot.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-11-02 19:06:14 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-01-12 15:01:37 +0100
commitc908fe4ebd5a04813be0b83c173fae182bb22728 (patch)
treeac8f089c2dce89598cf96532eac24cfb33567e4b /recipes-qt/qt5/qtbase-5.1.1/0013-Disable-mkv8snapshot.patch
parent775d77e482f1ea203c78003cccd2547075fd720f (diff)
downloadmeta-qt5-c908fe4ebd5a04813be0b83c173fae182bb22728.tar.gz
qt5: upgrade to 5.2.0
* drop 0027-Fix-misaligned-selection-region-with-text-when-cente.patch resolved in upstream commit 5d8a882c11201a29475c5ea71cfb76c9de6573f5 * drop 0020-Use-BGRA-extension-in-bindTexture.patch resolved in upstream commit e1325cf26e146b68725cc1a0a02b274ce3dfbe5c * drop 0008-wayland-scanner-disable-silent-rules.patch resolved upstream in: commit 2ff2a7c32d76b9e58b800f12469f112cfdb6ad3c Author: Jan Arne Petersen <jan.petersen@kdab.com> Date: Fri Jul 19 14:35:19 2013 +0200 Fix wayland-scanner to work with CONFIG+=silent * squash to match more with structure of https://github.com/meta-qt5/qtbase/tree/stable * qtmodules: bump SRCREVs for 5.2.0 tags now all modules using qt5-git should be newer than any 5.1.* version * qtbase: fix paths in packageconfig *.pc files include- and lib-paths contained build-sysroot paths * qtwebkit: Explicitly add ICU libraries to LIBS fails to build without this * qtjsbackend: remove for git versions Found in [1]: Qt Qml is now using its own built-in Javascript engine and does not depend on V8 anymore. As such the QtJSBackend shared library has disappeared. [1] http://blog.qt.digia.com/blog/2013/09/30/qt-5-2-alpha-available/ * qt5: Upgrade 5.1.1 recipes to 5.2.0 to match git recipes qtjsbackend is now completely gone it allows to share more .patch files and configuration in .inc again Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-5.1.1/0013-Disable-mkv8snapshot.patch')
-rw-r--r--recipes-qt/qt5/qtbase-5.1.1/0013-Disable-mkv8snapshot.patch47
1 files changed, 0 insertions, 47 deletions
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0013-Disable-mkv8snapshot.patch b/recipes-qt/qt5/qtbase-5.1.1/0013-Disable-mkv8snapshot.patch
deleted file mode 100644
index 2c4fa20b..00000000
--- a/recipes-qt/qt5/qtbase-5.1.1/0013-Disable-mkv8snapshot.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From 70669010c6f8a541db6f87f96aee3ff50ec8483f Mon Sep 17 00:00:00 2001
2From: Mikko Levonmaa <mikko.levonmaa@palm.com>
3Date: Tue, 8 Jan 2013 15:58:29 -0800
4Subject: [PATCH 13/22] Disable mkv8snapshot
5
6It seems to generate code that throws SIGILL, so disabling it
7
8Program received signal SIGILL, Illegal instruction.
90x26312c60 in ?? ()
10(gdb) bt
11 function=..., receiver=..., argc=1978934572, args=0x7efff254,
12 has_pending_exception=0x7efff277, qml=...)
13 at ../3rdparty/v8/src/execution.cc:125
14 argc=1, argv=0x7efff254, pending_exception=0x7efff277,
15 convert_receiver=false, qml=...) at ../3rdparty/v8/src/execution.cc:194
16 receiver=<optimized out>, argc=<optimized out>, argv=<optimized out>,
17 pending_exception=0x7efff277, convert_receiver=false)
18 at ../3rdparty/v8/src/execution.cc:161
19 data=<optimized out>, exc=0x7efff277)
20 at ../3rdparty/v8/src/execution.cc:734
21 at ../3rdparty/v8/src/api.cc:4742
22 at qml/v8/qv8contextwrapper.cpp:155
23 ownership=<optimized out>) at qml/v8/qv8engine.cpp:155
24 parent=<optimized out>) at qml/v8/qjsengine.cpp:192
25
26Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
27Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
28---
29 configure | 2 +-
30 1 file changed, 1 insertion(+), 1 deletion(-)
31
32diff --git a/configure b/configure
33index 11c11c4..521e374 100755
34--- a/configure
35+++ b/configure
36@@ -910,7 +910,7 @@ CFG_SKIP_MODULES=""
37 CFG_COMPILE_EXAMPLES=yes
38 CFG_RELEASE_QMAKE=no
39 CFG_AUDIO_BACKEND=auto
40-CFG_V8SNAPSHOT=auto
41+CFG_V8SNAPSHOT=no
42 CFG_QML_DEBUG=yes
43 CFG_JAVASCRIPTCORE_JIT=auto
44 CFG_PKGCONFIG=auto
45--
461.8.3.1
47