diff options
34 files changed, 185 insertions, 50 deletions
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch index eaa64515..1d74b3f6 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From d64321c240cbb949b9e55e2cd448c78bf9865c56 Mon Sep 17 00:00:00 2001 | 1 | From d64321c240cbb949b9e55e2cd448c78bf9865c56 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 | 3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 |
4 | Subject: [PATCH 01/12] Add linux-oe-g++ platform | 4 | Subject: [PATCH 01/16] Add linux-oe-g++ platform |
5 | 5 | ||
6 | * This qmake.conf unlike other platforms reads most variables from | 6 | * This qmake.conf unlike other platforms reads most variables from |
7 | shell environment, because it's easier for qt recipes to export | 7 | shell environment, because it's easier for qt recipes to export |
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 38aeb221..e741ca18 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 542325db6c9e9e2ffc2390b8eb1f8b16e674ca41 Mon Sep 17 00:00:00 2001 | 1 | From 542325db6c9e9e2ffc2390b8eb1f8b16e674ca41 Mon Sep 17 00:00:00 2001 |
2 | From: Holger Freyther <zecke@selfish.org> | 2 | From: Holger Freyther <zecke@selfish.org> |
3 | Date: Wed, 26 Sep 2012 17:22:30 +0200 | 3 | Date: Wed, 26 Sep 2012 17:22:30 +0200 |
4 | Subject: [PATCH 02/12] qlibraryinfo: allow to set qt.conf from the outside | 4 | Subject: [PATCH 02/16] qlibraryinfo: allow to set qt.conf from the outside |
5 | using the environment | 5 | using the environment |
6 | 6 | ||
7 | Allow to set a qt.conf from the outside using the environment. This allows | 7 | Allow to set a qt.conf from the outside using the environment. This allows |
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch index cd63c449..2ade1790 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 943c30aa55fbf1e330e7c987e989ddbd656e69c0 Mon Sep 17 00:00:00 2001 | 1 | From 943c30aa55fbf1e330e7c987e989ddbd656e69c0 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 | 3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 |
4 | Subject: [PATCH 03/12] Add -external-hostbindir option | 4 | Subject: [PATCH 03/16] Add -external-hostbindir option |
5 | 5 | ||
6 | * when cross-compiling it's sometimes useful to use existing tools from machine | 6 | * when cross-compiling it's sometimes useful to use existing tools from machine |
7 | (or in OpenEmbedded built with separate native recipe) when building for target | 7 | (or in OpenEmbedded built with separate native recipe) when building for target |
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch index 7941ef97..572d25cb 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 2a3c7bb40de7ae8f060e69bdaa77522172101f00 Mon Sep 17 00:00:00 2001 | 1 | From 2a3c7bb40de7ae8f060e69bdaa77522172101f00 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Wed, 17 Apr 2013 18:06:25 +0200 | 3 | Date: Wed, 17 Apr 2013 18:06:25 +0200 |
4 | Subject: [PATCH 04/12] qt_functions: temporary remove isEmpty check | 4 | Subject: [PATCH 04/16] qt_functions: temporary remove isEmpty check |
5 | 5 | ||
6 | * now we assume that every build will provide QT_EXTERNAL_HOST_BINS value | 6 | * now we assume that every build will provide QT_EXTERNAL_HOST_BINS value |
7 | * isEmpty works correctly only with qmake variables (e.g. $$FOO - | 7 | * isEmpty works correctly only with qmake variables (e.g. $$FOO - |
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0005-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-5.0.2/0005-qmake-is-already-built-in-qtbase-native.patch index d2418fc6..b2121cf0 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0005-qmake-is-already-built-in-qtbase-native.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0005-qmake-is-already-built-in-qtbase-native.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 7b37f7fa8c68c1807eeb45936154a42c34cda666 Mon Sep 17 00:00:00 2001 | 1 | From 7b37f7fa8c68c1807eeb45936154a42c34cda666 Mon Sep 17 00:00:00 2001 |
2 | From: Michael Krelin <hacker@klever.net> | 2 | From: Michael Krelin <hacker@klever.net> |
3 | Date: Mon, 29 Oct 2012 20:07:49 -0700 | 3 | Date: Mon, 29 Oct 2012 20:07:49 -0700 |
4 | Subject: [PATCH 05/12] qmake is already built in qtbase-native | 4 | Subject: [PATCH 05/16] qmake is already built in qtbase-native |
5 | 5 | ||
6 | Ported from OE by: Yu Ke <ke.yu@intel.com> | 6 | Ported from OE by: Yu Ke <ke.yu@intel.com> |
7 | Upstream-Status: Inappropriate [configuration] | 7 | Upstream-Status: Inappropriate [configuration] |
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch index fe03edcd..97333149 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 76537aca4118f5f7c336b7d17594c9644b6272b5 Mon Sep 17 00:00:00 2001 | 1 | From 76537aca4118f5f7c336b7d17594c9644b6272b5 Mon Sep 17 00:00:00 2001 |
2 | From: Paul Eggleton <paul.eggleton@linux.intel.com> | 2 | From: Paul Eggleton <paul.eggleton@linux.intel.com> |
3 | Date: Mon, 29 Oct 2012 20:26:36 -0700 | 3 | Date: Mon, 29 Oct 2012 20:26:36 -0700 |
4 | Subject: [PATCH 06/12] Allow building a separate qmake for the target | 4 | Subject: [PATCH 06/16] Allow building a separate qmake for the target |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [config] | 6 | Upstream-Status: Inappropriate [config] |
7 | 7 | ||
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch index 3cfe8c3b..0eb735c8 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From a1d0c7fb8fd689af7d3616ecf5d6aaf5ffd84bc9 Mon Sep 17 00:00:00 2001 | 1 | From a1d0c7fb8fd689af7d3616ecf5d6aaf5ffd84bc9 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 27 Apr 2013 22:33:33 +0200 | 3 | Date: Sat, 27 Apr 2013 22:33:33 +0200 |
4 | Subject: [PATCH 07/12] configureapp: Prefix default LIBDIRS and INCDIRS with | 4 | Subject: [PATCH 07/16] configureapp: Prefix default LIBDIRS and INCDIRS with |
5 | SYSROOT | 5 | SYSROOT |
6 | 6 | ||
7 | Upstream-Status: Pending | 7 | Upstream-Status: Pending |
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch index d7c8d35a..dee753bb 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 8a97079c1b17f27256a4a816e5cc85344c29ac6f Mon Sep 17 00:00:00 2001 | 1 | From 8a97079c1b17f27256a4a816e5cc85344c29ac6f Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 27 Apr 2013 23:15:37 +0200 | 3 | Date: Sat, 27 Apr 2013 23:15:37 +0200 |
4 | Subject: [PATCH 08/12] qt_module: Fix pkgconfig replacement | 4 | Subject: [PATCH 08/16] qt_module: Fix pkgconfig replacement |
5 | 5 | ||
6 | * in situation like this: | 6 | * in situation like this: |
7 | QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm | 7 | QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm |
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch index 13112c44..b7f64839 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From a70d48880e27586efe5f6aa195385207abf3cead Mon Sep 17 00:00:00 2001 | 1 | From a70d48880e27586efe5f6aa195385207abf3cead Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sun, 28 Apr 2013 12:56:55 +0200 | 3 | Date: Sun, 28 Apr 2013 12:56:55 +0200 |
4 | Subject: [PATCH 09/12] qt_module: Fix paths in .prl files | 4 | Subject: [PATCH 09/16] qt_module: Fix paths in .prl files |
5 | 5 | ||
6 | * qmake does not prefix them with QT_SYSROOT when using them | 6 | * qmake does not prefix them with QT_SYSROOT when using them |
7 | so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE | 7 | so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE |
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch index cac2bfed..1e8bfb7e 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 505bbe468956de2fdf2f27e8905582fe438d3b35 Mon Sep 17 00:00:00 2001 | 1 | From 505bbe468956de2fdf2f27e8905582fe438d3b35 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sun, 5 May 2013 11:18:34 +0200 | 3 | Date: Sun, 5 May 2013 11:18:34 +0200 |
4 | Subject: [PATCH 10/12] wayland-scanner: disable silent rules | 4 | Subject: [PATCH 10/16] wayland-scanner: disable silent rules |
5 | 5 | ||
6 | * for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands | 6 | * for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands |
7 | 7 | ||
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch index 9436e398..1cb7e007 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From a2439736a0efb80aea1746b0aada551ff63ad7e6 Mon Sep 17 00:00:00 2001 | 1 | From a2439736a0efb80aea1746b0aada551ff63ad7e6 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Wed, 8 May 2013 23:54:35 +0200 | 3 | Date: Wed, 8 May 2013 23:54:35 +0200 |
4 | Subject: [PATCH 11/12] configure: don't export SYSTEM_VARIABLES to .qmake.vars | 4 | Subject: [PATCH 11/16] configure: don't export SYSTEM_VARIABLES to .qmake.vars |
5 | 5 | ||
6 | * linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is | 6 | * linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is |
7 | causing issues as we need g++ to be used as linker | 7 | causing issues as we need g++ to be used as linker |
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch index fe891df0..3346566c 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From dd7756dd5a3c3eb677c3bacce257c1c8bbf03098 Mon Sep 17 00:00:00 2001 | 1 | From dd7756dd5a3c3eb677c3bacce257c1c8bbf03098 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Thu, 9 May 2013 10:06:50 +0200 | 3 | Date: Thu, 9 May 2013 10:06:50 +0200 |
4 | Subject: [PATCH 12/12] configure.prf: Allow to add extra arguments to make | 4 | Subject: [PATCH 12/16] configure.prf: Allow to add extra arguments to make |
5 | 5 | ||
6 | * sometimes we would like to add -e or define some variable and respect it from both | 6 | * sometimes we would like to add -e or define some variable and respect it from both |
7 | Makefiles used in configure tests and also Makefiles to build the application | 7 | Makefiles used in configure tests and also Makefiles to build the application |
diff --git a/recipes-qt/qt5/qtbase/0004-Disable-mkv8snapshot.patch b/recipes-qt/qt5/qtbase-5.0.2/0013-Disable-mkv8snapshot.patch index ae483732..decdc501 100644 --- a/recipes-qt/qt5/qtbase/0004-Disable-mkv8snapshot.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0013-Disable-mkv8snapshot.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 2719aaabbf29a0f28638e5d67f4d68d548b593a7 Mon Sep 17 00:00:00 2001 | 1 | From 78b716520396b5317a8b91dbca183483bea8b1d2 Mon Sep 17 00:00:00 2001 |
2 | From: Mikko Levonmaa <mikko.levonmaa@palm.com> | 2 | From: Mikko Levonmaa <mikko.levonmaa@palm.com> |
3 | Date: Tue, 8 Jan 2013 15:58:29 -0800 | 3 | Date: Tue, 8 Jan 2013 15:58:29 -0800 |
4 | Subject: [PATCH] Disable mkv8snapshot | 4 | Subject: [PATCH 13/16] Disable mkv8snapshot |
5 | 5 | ||
6 | It seems to generate code that throws SIGILL, so disabling it | 6 | It seems to generate code that throws SIGILL, so disabling it |
7 | 7 | ||
@@ -25,15 +25,15 @@ Program received signal SIGILL, Illegal instruction. | |||
25 | 25 | ||
26 | Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com> | 26 | Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com> |
27 | --- | 27 | --- |
28 | configure | 2 +- | 28 | configure | 2 +- |
29 | 1 files changed, 1 insertions(+), 1 deletions(-) | 29 | 1 file changed, 1 insertion(+), 1 deletion(-) |
30 | 30 | ||
31 | diff --git a/configure b/configure | 31 | diff --git a/configure b/configure |
32 | index 89246c8..b7d1cb5 100755 | 32 | index 34074ee..ac09bbf 100755 |
33 | --- a/configure | 33 | --- a/configure |
34 | +++ b/configure | 34 | +++ b/configure |
35 | @@ -779,7 +779,7 @@ CFG_BUILD_PARTS="" | 35 | @@ -799,7 +799,7 @@ CFG_NOBUILD_PARTS="" |
36 | CFG_NOBUILD_PARTS="" | 36 | CFG_SKIP_MODULES="" |
37 | CFG_RELEASE_QMAKE=no | 37 | CFG_RELEASE_QMAKE=no |
38 | CFG_AUDIO_BACKEND=auto | 38 | CFG_AUDIO_BACKEND=auto |
39 | -CFG_V8SNAPSHOT=auto | 39 | -CFG_V8SNAPSHOT=auto |
@@ -42,5 +42,5 @@ index 89246c8..b7d1cb5 100755 | |||
42 | CFG_JAVASCRIPTCORE_JIT=auto | 42 | CFG_JAVASCRIPTCORE_JIT=auto |
43 | CFG_PKGCONFIG=auto | 43 | CFG_PKGCONFIG=auto |
44 | -- | 44 | -- |
45 | 1.7.4.1 | 45 | 1.8.2.1 |
46 | 46 | ||
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0001-enables-tslib-device-to-be-read-from-env-variable.patch b/recipes-qt/qt5/qtbase-5.0.2/0014-enables-tslib-device-to-be-read-from-env-variable.patch index 77ddcba3..306e1379 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0001-enables-tslib-device-to-be-read-from-env-variable.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0014-enables-tslib-device-to-be-read-from-env-variable.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From cb7d4b978d7b29e3f4ef5dba1ca1319ccd289a0d Mon Sep 17 00:00:00 2001 | 1 | From f8336efd143109c3478e5548360248f99b645548 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> | 2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> |
3 | Date: Mon, 27 May 2013 18:32:37 +0200 | 3 | Date: Mon, 27 May 2013 18:32:37 +0200 |
4 | Subject: [PATCH] enables tslib device to be read from env variable | 4 | Subject: [PATCH 14/16] enables tslib device to be read from env variable |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -30,5 +30,5 @@ index 6986fd5..2ed4a69 100644 | |||
30 | device = specification.toLocal8Bit(); | 30 | device = specification.toLocal8Bit(); |
31 | 31 | ||
32 | -- | 32 | -- |
33 | 1.8.1.4 | 33 | 1.8.2.1 |
34 | 34 | ||
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0001-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase-5.0.2/0015-qtbase-allow-build-of-examples.patch index 17b951a3..15e96bd3 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0001-qtbase-allow-build-of-examples.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0015-qtbase-allow-build-of-examples.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 66558b78b5ff8c8ae9fa00a33d1d89285b8e3a00 Mon Sep 17 00:00:00 2001 | 1 | From a21c676a69388cd8cdf0bb28184de2bee58def0e Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> | 2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> |
3 | Date: Sat, 25 May 2013 17:34:32 +0200 | 3 | Date: Sat, 25 May 2013 17:34:32 +0200 |
4 | Subject: [PATCH] qtbase: allow build of examples | 4 | Subject: [PATCH 15/16] qtbase: allow build of examples |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -45,5 +45,5 @@ index 479a16a..ca1b0c7 100644 | |||
45 | - } | 45 | - } |
46 | } | 46 | } |
47 | -- | 47 | -- |
48 | 1.8.1.4 | 48 | 1.8.2.1 |
49 | 49 | ||
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0001-configure-add-tslib-support.patch b/recipes-qt/qt5/qtbase-5.0.2/0016-configure-add-tslib-support.patch index 3407f609..f69b9adf 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0001-configure-add-tslib-support.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0016-configure-add-tslib-support.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From b4edefdc1fb5ba67b202fad7df5a8def554d16fd Mon Sep 17 00:00:00 2001 | 1 | From 3038a3c7678867f8a7a30de7973d0eca8c0d737f Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> | 2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> |
3 | Date: Mon, 27 May 2013 18:45:03 +0200 | 3 | Date: Mon, 27 May 2013 18:45:03 +0200 |
4 | Subject: [PATCH] configure: add tslib support | 4 | Subject: [PATCH 16/16] configure: add tslib support |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -13,10 +13,10 @@ Signed-off-by: Eric Bénard <eric@eukrea.com> | |||
13 | 2 files changed, 28 insertions(+) | 13 | 2 files changed, 28 insertions(+) |
14 | 14 | ||
15 | diff --git a/configure b/configure | 15 | diff --git a/configure b/configure |
16 | index 2ea1ea4..727fed9 100755 | 16 | index ac09bbf..f1252a0 100755 |
17 | --- a/configure | 17 | --- a/configure |
18 | +++ b/configure | 18 | +++ b/configure |
19 | @@ -810,6 +810,7 @@ CFG_KMS=auto | 19 | @@ -829,6 +829,7 @@ CFG_KMS=auto |
20 | CFG_LIBUDEV=auto | 20 | CFG_LIBUDEV=auto |
21 | CFG_OBSOLETE_WAYLAND=no | 21 | CFG_OBSOLETE_WAYLAND=no |
22 | CFG_EVDEV=auto | 22 | CFG_EVDEV=auto |
@@ -24,7 +24,7 @@ index 2ea1ea4..727fed9 100755 | |||
24 | CFG_NIS=auto | 24 | CFG_NIS=auto |
25 | CFG_CUPS=auto | 25 | CFG_CUPS=auto |
26 | CFG_ICONV=auto | 26 | CFG_ICONV=auto |
27 | @@ -1782,6 +1783,13 @@ while [ "$#" -gt 0 ]; do | 27 | @@ -1805,6 +1806,13 @@ while [ "$#" -gt 0 ]; do |
28 | UNKNOWN_OPT=yes | 28 | UNKNOWN_OPT=yes |
29 | fi | 29 | fi |
30 | ;; | 30 | ;; |
@@ -38,7 +38,7 @@ index 2ea1ea4..727fed9 100755 | |||
38 | cups) | 38 | cups) |
39 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then | 39 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then |
40 | CFG_CUPS="$VAL" | 40 | CFG_CUPS="$VAL" |
41 | @@ -4775,6 +4783,22 @@ if [ "$CFG_EVDEV" = "no" ]; then | 41 | @@ -4815,6 +4823,22 @@ if [ "$CFG_EVDEV" = "no" ]; then |
42 | QMakeVar add DEFINES QT_NO_EVDEV | 42 | QMakeVar add DEFINES QT_NO_EVDEV |
43 | fi | 43 | fi |
44 | 44 | ||
@@ -74,5 +74,5 @@ index 078db2f..18a8295 100644 | |||
74 | + SUBDIRS += tslib | 74 | + SUBDIRS += tslib |
75 | +} | 75 | +} |
76 | -- | 76 | -- |
77 | 1.8.1.4 | 77 | 1.8.2.1 |
78 | 78 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch index f55d474a..942cc9cb 100644 --- a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From e45d617fd823f683ed426d09fd8b6edefb9517ab Mon Sep 17 00:00:00 2001 | 1 | From e45d617fd823f683ed426d09fd8b6edefb9517ab Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 | 3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 |
4 | Subject: [PATCH 01/12] Add linux-oe-g++ platform | 4 | Subject: [PATCH 01/15] Add linux-oe-g++ platform |
5 | 5 | ||
6 | * This qmake.conf unlike other platforms reads most variables from | 6 | * This qmake.conf unlike other platforms reads most variables from |
7 | shell environment, because it's easier for qt recipes to export | 7 | shell environment, because it's easier for qt recipes to export |
diff --git a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 0725347a..e1087f2a 100644 --- a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 4da4d9606efc8d3109296906e5b13814499ae698 Mon Sep 17 00:00:00 2001 | 1 | From 4da4d9606efc8d3109296906e5b13814499ae698 Mon Sep 17 00:00:00 2001 |
2 | From: Holger Freyther <zecke@selfish.org> | 2 | From: Holger Freyther <zecke@selfish.org> |
3 | Date: Wed, 26 Sep 2012 17:22:30 +0200 | 3 | Date: Wed, 26 Sep 2012 17:22:30 +0200 |
4 | Subject: [PATCH 02/12] qlibraryinfo: allow to set qt.conf from the outside | 4 | Subject: [PATCH 02/15] qlibraryinfo: allow to set qt.conf from the outside |
5 | using the environment | 5 | using the environment |
6 | 6 | ||
7 | Allow to set a qt.conf from the outside using the environment. This allows | 7 | Allow to set a qt.conf from the outside using the environment. This allows |
diff --git a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch index 2a64291a..0b98683e 100644 --- a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From c9bf00e21ae398575adf4411e67b35cdf44920e5 Mon Sep 17 00:00:00 2001 | 1 | From c9bf00e21ae398575adf4411e67b35cdf44920e5 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 | 3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 |
4 | Subject: [PATCH 03/12] Add -external-hostbindir option | 4 | Subject: [PATCH 03/15] Add -external-hostbindir option |
5 | 5 | ||
6 | * when cross-compiling it's sometimes useful to use existing tools from machine | 6 | * when cross-compiling it's sometimes useful to use existing tools from machine |
7 | (or in OpenEmbedded built with separate native recipe) when building for target | 7 | (or in OpenEmbedded built with separate native recipe) when building for target |
diff --git a/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch index 6e694544..77b1c41f 100644 --- a/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch +++ b/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From e561978ab73e72d7b088c9927fb6a87d2eff6833 Mon Sep 17 00:00:00 2001 | 1 | From e561978ab73e72d7b088c9927fb6a87d2eff6833 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Wed, 17 Apr 2013 18:06:25 +0200 | 3 | Date: Wed, 17 Apr 2013 18:06:25 +0200 |
4 | Subject: [PATCH 04/12] qt_functions: temporary remove isEmpty check | 4 | Subject: [PATCH 04/15] qt_functions: temporary remove isEmpty check |
5 | 5 | ||
6 | * now we assume that every build will provide QT_EXTERNAL_HOST_BINS value | 6 | * now we assume that every build will provide QT_EXTERNAL_HOST_BINS value |
7 | * isEmpty works correctly only with qmake variables (e.g. $$FOO - | 7 | * isEmpty works correctly only with qmake variables (e.g. $$FOO - |
diff --git a/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch index febefb8a..d95e0b45 100644 --- a/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch +++ b/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From f42c4156c3e056e9fd2d6b0542662d705efb2722 Mon Sep 17 00:00:00 2001 | 1 | From f42c4156c3e056e9fd2d6b0542662d705efb2722 Mon Sep 17 00:00:00 2001 |
2 | From: Michael Krelin <hacker@klever.net> | 2 | From: Michael Krelin <hacker@klever.net> |
3 | Date: Mon, 29 Oct 2012 20:07:49 -0700 | 3 | Date: Mon, 29 Oct 2012 20:07:49 -0700 |
4 | Subject: [PATCH 05/12] qmake is already built in qtbase-native | 4 | Subject: [PATCH 05/15] qmake is already built in qtbase-native |
5 | 5 | ||
6 | Ported from OE by: Yu Ke <ke.yu@intel.com> | 6 | Ported from OE by: Yu Ke <ke.yu@intel.com> |
7 | Upstream-Status: Inappropriate [configuration] | 7 | Upstream-Status: Inappropriate [configuration] |
diff --git a/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch index 4d04c7ce..a8778469 100644 --- a/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch +++ b/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 8be64919365240728dcce02fac44e5018aaec191 Mon Sep 17 00:00:00 2001 | 1 | From 8be64919365240728dcce02fac44e5018aaec191 Mon Sep 17 00:00:00 2001 |
2 | From: Paul Eggleton <paul.eggleton@linux.intel.com> | 2 | From: Paul Eggleton <paul.eggleton@linux.intel.com> |
3 | Date: Mon, 29 Oct 2012 20:26:36 -0700 | 3 | Date: Mon, 29 Oct 2012 20:26:36 -0700 |
4 | Subject: [PATCH 06/12] Allow building a separate qmake for the target | 4 | Subject: [PATCH 06/15] Allow building a separate qmake for the target |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [config] | 6 | Upstream-Status: Inappropriate [config] |
7 | 7 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch index a1129f79..f873aae9 100644 --- a/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ b/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 98d14c01a92c5caad2bb0e0b4a097ae11d83b58e Mon Sep 17 00:00:00 2001 | 1 | From 98d14c01a92c5caad2bb0e0b4a097ae11d83b58e Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 27 Apr 2013 22:33:33 +0200 | 3 | Date: Sat, 27 Apr 2013 22:33:33 +0200 |
4 | Subject: [PATCH 07/12] configureapp: Prefix default LIBDIRS and INCDIRS with | 4 | Subject: [PATCH 07/15] configureapp: Prefix default LIBDIRS and INCDIRS with |
5 | SYSROOT | 5 | SYSROOT |
6 | 6 | ||
7 | Upstream-Status: Pending | 7 | Upstream-Status: Pending |
diff --git a/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch index 1b3c185f..4d15ee06 100644 --- a/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch +++ b/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 1ac376893b75c36cc1ee6465e814546e2215354e Mon Sep 17 00:00:00 2001 | 1 | From 1ac376893b75c36cc1ee6465e814546e2215354e Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 27 Apr 2013 23:15:37 +0200 | 3 | Date: Sat, 27 Apr 2013 23:15:37 +0200 |
4 | Subject: [PATCH 08/12] qt_module: Fix pkgconfig replacement | 4 | Subject: [PATCH 08/15] qt_module: Fix pkgconfig replacement |
5 | 5 | ||
6 | * in situation like this: | 6 | * in situation like this: |
7 | QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm | 7 | QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm |
diff --git a/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch index 1d68efc9..8a3ef3c1 100644 --- a/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch +++ b/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 111583f7a46871d130ac1c6688972ebf98452af4 Mon Sep 17 00:00:00 2001 | 1 | From 111583f7a46871d130ac1c6688972ebf98452af4 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sun, 28 Apr 2013 12:56:55 +0200 | 3 | Date: Sun, 28 Apr 2013 12:56:55 +0200 |
4 | Subject: [PATCH 09/12] qt_module: Fix paths in .prl files | 4 | Subject: [PATCH 09/15] qt_module: Fix paths in .prl files |
5 | 5 | ||
6 | * qmake does not prefix them with QT_SYSROOT when using them | 6 | * qmake does not prefix them with QT_SYSROOT when using them |
7 | so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE | 7 | so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE |
diff --git a/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch index cac9bef4..5b14c818 100644 --- a/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch +++ b/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 1224e23a7990ac877265a2736827a98c300a8bf7 Mon Sep 17 00:00:00 2001 | 1 | From 1224e23a7990ac877265a2736827a98c300a8bf7 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sun, 5 May 2013 11:18:34 +0200 | 3 | Date: Sun, 5 May 2013 11:18:34 +0200 |
4 | Subject: [PATCH 10/12] wayland-scanner: disable silent rules | 4 | Subject: [PATCH 10/15] wayland-scanner: disable silent rules |
5 | 5 | ||
6 | * for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands | 6 | * for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands |
7 | 7 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch index fda64981..2c2360e6 100644 --- a/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch +++ b/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 9ffc6dba623bb44e1787f4e4af13af03f9f7a0d2 Mon Sep 17 00:00:00 2001 | 1 | From 9ffc6dba623bb44e1787f4e4af13af03f9f7a0d2 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Wed, 8 May 2013 23:54:35 +0200 | 3 | Date: Wed, 8 May 2013 23:54:35 +0200 |
4 | Subject: [PATCH 11/12] configure: don't export SYSTEM_VARIABLES to .qmake.vars | 4 | Subject: [PATCH 11/15] configure: don't export SYSTEM_VARIABLES to .qmake.vars |
5 | 5 | ||
6 | * linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is | 6 | * linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is |
7 | causing issues as we need g++ to be used as linker | 7 | causing issues as we need g++ to be used as linker |
diff --git a/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch index 7bcfd7f7..e6602b43 100644 --- a/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch +++ b/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 7389b5556de11258d3084ede10c12859353fb13b Mon Sep 17 00:00:00 2001 | 1 | From 7389b5556de11258d3084ede10c12859353fb13b Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Thu, 9 May 2013 10:06:50 +0200 | 3 | Date: Thu, 9 May 2013 10:06:50 +0200 |
4 | Subject: [PATCH 12/12] configure.prf: Allow to add extra arguments to make | 4 | Subject: [PATCH 12/15] configure.prf: Allow to add extra arguments to make |
5 | 5 | ||
6 | * sometimes we would like to add -e or define some variable and respect it from both | 6 | * sometimes we would like to add -e or define some variable and respect it from both |
7 | Makefiles used in configure tests and also Makefiles to build the application | 7 | Makefiles used in configure tests and also Makefiles to build the application |
diff --git a/recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch b/recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch new file mode 100644 index 00000000..cd0c0596 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From c3e47eeb4dec8348c3a9f2cf9044c568c5334070 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mikko Levonmaa <mikko.levonmaa@palm.com> | ||
3 | Date: Tue, 8 Jan 2013 15:58:29 -0800 | ||
4 | Subject: [PATCH 13/15] Disable mkv8snapshot | ||
5 | |||
6 | It seems to generate code that throws SIGILL, so disabling it | ||
7 | |||
8 | Program received signal SIGILL, Illegal instruction. | ||
9 | 0x26312c60 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 | |||
26 | Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com> | ||
27 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
28 | --- | ||
29 | configure | 2 +- | ||
30 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
31 | |||
32 | diff --git a/configure b/configure | ||
33 | index 9ca23a4..96965b6 100755 | ||
34 | --- a/configure | ||
35 | +++ b/configure | ||
36 | @@ -899,7 +899,7 @@ CFG_NOBUILD_PARTS="" | ||
37 | CFG_SKIP_MODULES="" | ||
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 | -- | ||
46 | 1.8.2.1 | ||
47 | |||
diff --git a/recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch b/recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch new file mode 100644 index 00000000..e55ac7a3 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 8d037dfbe0b9cffa098c3de7010651590c1d6e6c Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> | ||
3 | Date: Mon, 27 May 2013 18:32:37 +0200 | ||
4 | Subject: [PATCH 14/15] enables tslib device to be read from env variable | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | from : | ||
10 | https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/tslib.patch | ||
11 | |||
12 | Signed-off-by: Eric Bénard <eric@eukrea.com> | ||
13 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
14 | --- | ||
15 | src/plugins/generic/tslib/qtslib.cpp | 4 +++- | ||
16 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/src/plugins/generic/tslib/qtslib.cpp b/src/plugins/generic/tslib/qtslib.cpp | ||
19 | index 6986fd5..2ed4a69 100644 | ||
20 | --- a/src/plugins/generic/tslib/qtslib.cpp | ||
21 | +++ b/src/plugins/generic/tslib/qtslib.cpp | ||
22 | @@ -64,7 +64,9 @@ QTsLibMouseHandler::QTsLibMouseHandler(const QString &key, | ||
23 | qDebug() << "QTsLibMouseHandler" << key << specification; | ||
24 | setObjectName(QLatin1String("TSLib Mouse Handler")); | ||
25 | |||
26 | - QByteArray device = "/dev/input/event1"; | ||
27 | + QByteArray device = qgetenv("TSLIB_TSDEVICE"); | ||
28 | + if(device.isEmpty()) | ||
29 | + device = "/dev/input/event1"; | ||
30 | if (specification.startsWith("/dev/")) | ||
31 | device = specification.toLocal8Bit(); | ||
32 | |||
33 | -- | ||
34 | 1.8.2.1 | ||
35 | |||
diff --git a/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch new file mode 100644 index 00000000..45a49a62 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | From 3d83f570e081e23a6cf6d0ccf57ad8db34c5ca3e Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> | ||
3 | Date: Sat, 25 May 2013 17:34:32 +0200 | ||
4 | Subject: [PATCH 15/15] qtbase: allow build of examples | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | this revert the following commit : | ||
10 | |||
11 | commit 2b397f985e4ef6ae5c0571a928bb1320fb048c61 | ||
12 | Author: Oswald Buddenhagen <oswald.buddenhagen@digia.com> | ||
13 | Date: Fri Dec 21 19:36:12 2012 +0100 | ||
14 | |||
15 | do not actually build examples in production builds | ||
16 | |||
17 | -developer-build enables an actual build of examples, based on the | ||
18 | assumption that developers want to test it (it can be still disabled | ||
19 | with -nomake examples). regular users otoh want only the examples | ||
20 | sources installed. | ||
21 | |||
22 | Change-Id: Ifc6a108099929175a3960480802b271a758fdd38 | ||
23 | Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> | ||
24 | |||
25 | Signed-off-by: Eric Bénard <eric@eukrea.com> | ||
26 | --- | ||
27 | mkspecs/features/qt_example_installs.prf | 8 -------- | ||
28 | 1 file changed, 8 deletions(-) | ||
29 | |||
30 | diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf | ||
31 | index 479a16a..ca1b0c7 100644 | ||
32 | --- a/mkspecs/features/qt_example_installs.prf | ||
33 | +++ b/mkspecs/features/qt_example_installs.prf | ||
34 | @@ -92,12 +92,4 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples) | ||
35 | allfiles -= doc | ||
36 | !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles") | ||
37 | } | ||
38 | - | ||
39 | - # Do not actually build the examples in production builds with -prefix | ||
40 | - !equals(TEMPLATE, subdirs):prefix_build:!contains(QT_CONFIG, private_tests) { | ||
41 | - TEMPLATE = aux | ||
42 | - CONFIG -= have_target qt staticlib dll | ||
43 | - SOURCES = | ||
44 | - INSTALLS -= target | ||
45 | - } | ||
46 | } | ||
47 | -- | ||
48 | 1.8.2.1 | ||
49 | |||
diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index b50d4469..70a30724 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc | |||
@@ -24,6 +24,9 @@ SRC_URI += " \ | |||
24 | file://0010-wayland-scanner-disable-silent-rules.patch \ | 24 | file://0010-wayland-scanner-disable-silent-rules.patch \ |
25 | file://0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ | 25 | file://0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ |
26 | file://0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ | 26 | file://0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ |
27 | file://0013-Disable-mkv8snapshot.patch \ | ||
28 | file://0014-enables-tslib-device-to-be-read-from-env-variable.patch \ | ||
29 | file://0015-qtbase-allow-build-of-examples.patch \ | ||
27 | " | 30 | " |
28 | 31 | ||
29 | # specific for native version | 32 | # specific for native version |
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index f286274a..0df3b2a6 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc | |||
@@ -13,6 +13,9 @@ SRC_URI += " \ | |||
13 | file://0010-wayland-scanner-disable-silent-rules.patch \ | 13 | file://0010-wayland-scanner-disable-silent-rules.patch \ |
14 | file://0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ | 14 | file://0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ |
15 | file://0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ | 15 | file://0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ |
16 | file://0013-Disable-mkv8snapshot.patch \ | ||
17 | file://0014-enables-tslib-device-to-be-read-from-env-variable.patch \ | ||
18 | file://0015-qtbase-allow-build-of-examples.patch \ | ||
16 | " | 19 | " |
17 | 20 | ||
18 | DEPENDS += "qtbase-native freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev ${XCB_DEPENDS} ${GL_DEPENDS} ${TSLIB_DEPENDS}" | 21 | DEPENDS += "qtbase-native freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev ${XCB_DEPENDS} ${GL_DEPENDS} ${TSLIB_DEPENDS}" |
diff --git a/recipes-qt/qt5/qtbase_5.0.2.bb b/recipes-qt/qt5/qtbase_5.0.2.bb index 2cd94dd7..c93c0127 100644 --- a/recipes-qt/qt5/qtbase_5.0.2.bb +++ b/recipes-qt/qt5/qtbase_5.0.2.bb | |||
@@ -3,11 +3,9 @@ require ${PN}.inc | |||
3 | 3 | ||
4 | PR = "${INC_PR}.0" | 4 | PR = "${INC_PR}.0" |
5 | 5 | ||
6 | SRC_URI += "file://0004-Disable-mkv8snapshot.patch \ | 6 | SRC_URI += " \ |
7 | file://0001-qtbase-allow-build-of-examples.patch \ | 7 | file://0016-configure-add-tslib-support.patch \ |
8 | file://0001-enables-tslib-device-to-be-read-from-env-variable.patch \ | 8 | " |
9 | file://0001-configure-add-tslib-support.patch \ | ||
10 | " | ||
11 | 9 | ||
12 | SRC_URI[md5sum] = "a4fec8ed03867c4ee4fe5a46001a11f0" | 10 | SRC_URI[md5sum] = "a4fec8ed03867c4ee4fe5a46001a11f0" |
13 | SRC_URI[sha256sum] = "31851ee2f844c100554506a9a446d4b6abb5270bca799c2a683e5f937456a9c8" | 11 | SRC_URI[sha256sum] = "31851ee2f844c100554506a9a446d4b6abb5270bca799c2a683e5f937456a9c8" |