summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-05-28 12:47:20 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-05-28 15:25:53 +0200
commit1496c6ba34bf95bce67504c72edace1bc2c0a64e (patch)
treeb2f16ae4f756fcfd5b645d29c2a815af94cd89d9 /recipes-qt/qt5/qtbase
parentf8b065ea1174dd1fa7d93359f6826bfc9d23174c (diff)
downloadmeta-qt5-1496c6ba34bf95bce67504c72edace1bc2c0a64e.tar.gz
qtbase: refresh patches
* all patches applied in recipes should be also applied in https://github.com/meta-qt5/qtbase branches to make it easier to upgrade to new version without loosing any patches * apply: 0013-Disable-mkv8snapshot.patch 0014-enables-tslib-device-to-be-read-from-env-variable.patch 0015-qtbase-allow-build-of-examples.patch also for git version, only 0016-configure-add-tslib-support.patch is now 5.0.2 specific (similar patch already applied in stable branch) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase')
-rw-r--r--recipes-qt/qt5/qtbase/0004-Disable-mkv8snapshot.patch46
1 files changed, 0 insertions, 46 deletions
diff --git a/recipes-qt/qt5/qtbase/0004-Disable-mkv8snapshot.patch b/recipes-qt/qt5/qtbase/0004-Disable-mkv8snapshot.patch
deleted file mode 100644
index ae483732..00000000
--- a/recipes-qt/qt5/qtbase/0004-Disable-mkv8snapshot.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From 2719aaabbf29a0f28638e5d67f4d68d548b593a7 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] 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>
27---
28 configure | 2 +-
29 1 files changed, 1 insertions(+), 1 deletions(-)
30
31diff --git a/configure b/configure
32index 89246c8..b7d1cb5 100755
33--- a/configure
34+++ b/configure
35@@ -779,7 +779,7 @@ CFG_BUILD_PARTS=""
36 CFG_NOBUILD_PARTS=""
37 CFG_RELEASE_QMAKE=no
38 CFG_AUDIO_BACKEND=auto
39-CFG_V8SNAPSHOT=auto
40+CFG_V8SNAPSHOT=no
41 CFG_QML_DEBUG=yes
42 CFG_JAVASCRIPTCORE_JIT=auto
43 CFG_PKGCONFIG=auto
44--
451.7.4.1
46