diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-02-27 21:38:28 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-03-02 11:22:24 +0100 |
commit | e088f366191f9a4cadc815c3d72d85086619a184 (patch) | |
tree | cf2d1b499c9b5c0cfd37fac76caca2c97c69381d | |
parent | 7d5d2d3f6969dcde88a24b43b101bca8df08e5c8 (diff) | |
download | meta-qt5-e088f366191f9a4cadc815c3d72d85086619a184.tar.gz |
qt5: upgrade to latest revisions in 5.7 branches
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
50 files changed, 73 insertions, 73 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index d7b6c987..a9a7543e 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -257,4 +257,4 @@ fakeroot do_generate_qt_environment_file() { | |||
257 | 257 | ||
258 | addtask generate_qt_environment_file after do_install before do_package | 258 | addtask generate_qt_environment_file after do_install before do_package |
259 | 259 | ||
260 | SRCREV = "611942f2d737cc75c7492dffc183174e432aa155" | 260 | SRCREV = "1d8030cc64df2cdfdc0faf3d06ea7d9ed0306948" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index dd98762f..0565136e 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -117,4 +117,4 @@ do_install() { | |||
117 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt | 117 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt |
118 | } | 118 | } |
119 | 119 | ||
120 | SRCREV = "611942f2d737cc75c7492dffc183174e432aa155" | 120 | SRCREV = "1d8030cc64df2cdfdc0faf3d06ea7d9ed0306948" |
diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index ec55658f..1f9187b7 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e9fbf13815bad3373b7124290c2d61cb34a21903 Mon Sep 17 00:00:00 2001 | 1 | From 516355ecd8ee54a8960c87c5f044b069221fa815 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/10] Add linux-oe-g++ platform | 4 | Subject: [PATCH 01/10] Add linux-oe-g++ platform |
diff --git a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 81e9eea0..4211e0a9 100644 --- a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b947e24111d40717e8aea0fec95500cf53adbce3 Mon Sep 17 00:00:00 2001 | 1 | From 1dbcf143c0e320291514d30bcf352974595a0112 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/10] qlibraryinfo: allow to set qt.conf from the outside | 4 | Subject: [PATCH 02/10] qlibraryinfo: allow to set qt.conf from the outside |
diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch index 9b4a4779..2059050a 100644 --- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From bbf13d9ca3e0178b948d51c7c5aba4dc047d8c99 Mon Sep 17 00:00:00 2001 | 1 | From 8497c1671d7dfb531ff4db43b3ce4128066e3496 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/10] Add -external-hostbindir option | 4 | Subject: [PATCH 03/10] Add -external-hostbindir option |
diff --git a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch index 11de2e94..81112b12 100644 --- a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch +++ b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 0f713d11908d282d6a0e2719b0238f07a430a7ac Mon Sep 17 00:00:00 2001 | 1 | From 884e27ee424299e2e8270cfa6d9b22fa57243eaf 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 04/10] qt_module: Fix pkgconfig and libtool replacements | 4 | Subject: [PATCH 04/10] qt_module: Fix pkgconfig and libtool replacements |
diff --git a/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch index 87916e27..a67fe063 100644 --- a/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b8ef9a31a0c5855101eb92f3b670e0ed6e00724c Mon Sep 17 00:00:00 2001 | 1 | From 795d1907fa683a35f8d09cb1a3ba2b3abc269e7e Mon Sep 17 00:00:00 2001 |
2 | From: Denys Dmytriyenko <denys@ti.com> | 2 | From: Denys Dmytriyenko <denys@ti.com> |
3 | Date: Tue, 25 Aug 2015 10:05:15 -0400 | 3 | Date: Tue, 25 Aug 2015 10:05:15 -0400 |
4 | Subject: [PATCH 05/10] configure: bump path length from 256 to 512 characters | 4 | Subject: [PATCH 05/10] configure: bump path length from 256 to 512 characters |
diff --git a/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch index dfbba036..8a27e697 100644 --- a/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch +++ b/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From eb0dd6c37d3f5136fc8bce8301509a0a7f99c976 Mon Sep 17 00:00:00 2001 | 1 | From e4750b168337002678650ecf9fefaaa56fce0038 Mon Sep 17 00:00:00 2001 |
2 | From: Jani Hautakangas <jani.hautakangas@ixonos.com> | 2 | From: Jani Hautakangas <jani.hautakangas@ixonos.com> |
3 | Date: Thu, 16 May 2013 09:52:07 +0300 | 3 | Date: Thu, 16 May 2013 09:52:07 +0300 |
4 | Subject: [PATCH 06/10] QOpenGLPaintDevice sub-area support | 4 | Subject: [PATCH 06/10] QOpenGLPaintDevice sub-area support |
diff --git a/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch b/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch index 3c378fe0..6e4d920a 100644 --- a/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch +++ b/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f07797b0127494a4121d51e5b66d3e6a4a260316 Mon Sep 17 00:00:00 2001 | 1 | From c9593918f444274c6ea248229277f5b44dbae557 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 8 Jun 2015 13:59:25 -0700 | 3 | Date: Mon, 8 Jun 2015 13:59:25 -0700 |
4 | Subject: [PATCH 07/10] linux-oe-g++: Invert conditional for defining | 4 | Subject: [PATCH 07/10] linux-oe-g++: Invert conditional for defining |
diff --git a/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch b/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch index 27049c0f..d029e415 100644 --- a/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch +++ b/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7a4999eb3738ef50eba4f18964bf0075186aeaaa Mon Sep 17 00:00:00 2001 | 1 | From 85beb0cf48cdbe99ec153bceeb964431560182e6 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
3 | Date: Fri, 13 Nov 2015 12:36:11 +0100 | 3 | Date: Fri, 13 Nov 2015 12:36:11 +0100 |
4 | Subject: [PATCH 08/10] configure paths for target qmake properly | 4 | Subject: [PATCH 08/10] configure paths for target qmake properly |
diff --git a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch index 624dbbc2..3a1614f5 100644 --- a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ebde3ef719278bc60aedeff173ff12cb3ee0114c Mon Sep 17 00:00:00 2001 | 1 | From acd673711f3b32e714226ea563d8d7f0afff7251 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, 16 Nov 2013 00:32:30 +0100 | 3 | Date: Sat, 16 Nov 2013 00:32:30 +0100 |
4 | Subject: [PATCH 09/10] Always build uic | 4 | Subject: [PATCH 09/10] Always build uic |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 7c5f52c7..1de2aede 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -218,4 +218,4 @@ do_install_append() { | |||
218 | 218 | ||
219 | RRECOMMENDS_${PN}-plugins += "${@base_contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 219 | RRECOMMENDS_${PN}-plugins += "${@base_contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
220 | 220 | ||
221 | SRCREV = "611942f2d737cc75c7492dffc183174e432aa155" | 221 | SRCREV = "1d8030cc64df2cdfdc0faf3d06ea7d9ed0306948" |
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 42728fc6..a2b19dee 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS = "qtdeclarative" | 11 | DEPENDS = "qtdeclarative" |
12 | 12 | ||
13 | SRCREV = "691d62dcd6c028e509ebb5241bb0a184faf3a5fc" | 13 | SRCREV = "be7e1d548ae150acb60e1716c9dfd4edd1fa4367" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index efe7bb67..82754c9e 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb | |||
@@ -25,4 +25,4 @@ do_configure_prepend() { | |||
25 | sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro | 25 | sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro |
26 | } | 26 | } |
27 | 27 | ||
28 | SRCREV = "fa2389dd0a6df58d73d221654db36ff791b96e43" | 28 | SRCREV = "5237ff0cb86a713845019ffd98d6066af00f71f7" |
diff --git a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch index 7501dc16..3d8fd28c 100644 --- a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch +++ b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4e4675a65fa5ad687a9ca93540799f157bd328a0 Mon Sep 17 00:00:00 2001 | 1 | From 2db2566c3594ed7b86d904fdb29e6f3bad7e9fa0 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: Sun, 26 May 2013 14:26:19 +0200 | 3 | Date: Sun, 26 May 2013 14:26:19 +0200 |
4 | Subject: [PATCH] qmltestexample: fix link | 4 | Subject: [PATCH] qmltestexample: fix link |
@@ -71,5 +71,5 @@ index 1bb913e..56f2dd5 100644 | |||
71 | 71 | ||
72 | load(qt_tool) | 72 | load(qt_tool) |
73 | -- | 73 | -- |
74 | 2.7.0 | 74 | 2.7.1 |
75 | 75 | ||
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index deb758e3..e049e716 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -33,6 +33,6 @@ do_configure_prepend() { | |||
33 | 33 | ||
34 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" | 34 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" |
35 | 35 | ||
36 | SRCREV = "20a51e87fd15b8a6c1503b905399f7befe31114b" | 36 | SRCREV = "ab2c5be35dd8f339ec39f52364625a53fa6d0ded" |
37 | 37 | ||
38 | BBCLASSEXTEND =+ "native nativesdk" | 38 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index bf72040e..950b4a7d 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb | |||
@@ -17,4 +17,4 @@ DEPENDS += "qtdeclarative" | |||
17 | 17 | ||
18 | RDEPENDS_${PN}-dev = "" | 18 | RDEPENDS_${PN}-dev = "" |
19 | 19 | ||
20 | SRCREV = "7764833edf8f7ca8a53b4ea18688051ea010b70c" | 20 | SRCREV = "74d92ef80f5e13f2e10a592e0389a10bbeab189e" |
diff --git a/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch b/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch index d42adfeb..af500879 100644 --- a/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch +++ b/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f8a7d0e55e4c59de974e6459c05ce026577826ab Mon Sep 17 00:00:00 2001 | 1 | From 7f5d3be2217e13fab5785b60c5ae97680f63b6d9 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, 4 Aug 2014 19:19:05 +0200 | 3 | Date: Mon, 4 Aug 2014 19:19:05 +0200 |
4 | Subject: [PATCH] qtimageformats.pro: Make the dependencies deterministic | 4 | Subject: [PATCH] qtimageformats.pro: Make the dependencies deterministic |
@@ -27,5 +27,5 @@ index 8382e5c..63d13ce 100644 | |||
27 | 27 | ||
28 | load(qt_parts) | 28 | load(qt_parts) |
29 | -- | 29 | -- |
30 | 2.7.0 | 30 | 2.7.1 |
31 | 31 | ||
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index c05669cb..ce87c850 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb | |||
@@ -28,4 +28,4 @@ EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'jasper', 'CONFIG+=OE_ | |||
28 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" | 28 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" |
29 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" | 29 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" |
30 | 30 | ||
31 | SRCREV = "14f86268e7f149a3c881203227321c3fd085e4d9" | 31 | SRCREV = "cb800de1f42aaacdeb423d30adbcbf8975e32f2f" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 60848306..517940b0 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -29,4 +29,4 @@ do_configure_prepend() { | |||
29 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" | 29 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" |
30 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" | 30 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" |
31 | 31 | ||
32 | SRCREV = "48651de4a7a11b7bd348487df6eb68f258ed3c6a" | 32 | SRCREV = "a6ce801018a4254efeab000efa2457317270939b" |
diff --git a/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch b/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch index 63d57834..d6dbc040 100644 --- a/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch +++ b/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e2dd9e2c359198e160bc2c743f084f5243cff69d Mon Sep 17 00:00:00 2001 | 1 | From 95d8cc0b6f90043b0b6bc708cc1e38b1d580ba80 Mon Sep 17 00:00:00 2001 |
2 | From: Yoann Lopes <yoann.lopes@digia.com> | 2 | From: Yoann Lopes <yoann.lopes@digia.com> |
3 | Date: Thu, 31 Oct 2013 15:06:30 +0100 | 3 | Date: Thu, 31 Oct 2013 15:06:30 +0100 |
4 | Subject: [PATCH] Initial porting effort to GStreamer 1.0. | 4 | Subject: [PATCH] Initial porting effort to GStreamer 1.0. |
@@ -55,5 +55,5 @@ index 98bb315..287887f 100644 | |||
55 | 55 | ||
56 | qtCompileTest(resourcepolicy) | 56 | qtCompileTest(resourcepolicy) |
57 | -- | 57 | -- |
58 | 2.7.0 | 58 | 2.7.1 |
59 | 59 | ||
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index ad3a5d0d..2dfd97eb 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
@@ -35,4 +35,4 @@ SRC_URI += "\ | |||
35 | file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ | 35 | file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ |
36 | " | 36 | " |
37 | 37 | ||
38 | SRCREV = "7610f6e9ba8b92df6d18b94fcec982064dffacbd" | 38 | SRCREV = "9500aadc219481d89d32e5c2a2de10b0740c50de" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 7d668aff..cfc06233 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
@@ -13,4 +13,4 @@ DEPENDS += "qtdeclarative" | |||
13 | 13 | ||
14 | RDEPENDS_${PN}-dev = "" | 14 | RDEPENDS_${PN}-dev = "" |
15 | 15 | ||
16 | SRCREV = "571a44a4dde8f047773f4e91a4a6941cb4cdf212" | 16 | SRCREV = "1c5f765658432a08ed52523c3a4547ab2b4a58f1" |
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 2ea4758f..ad06c941 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb | |||
@@ -27,4 +27,4 @@ ARM_INSTRUCTION_SET_armv5 = "arm" | |||
27 | 27 | ||
28 | DEPENDS += "qtbase" | 28 | DEPENDS += "qtbase" |
29 | 29 | ||
30 | SRCREV = "d80f57f60f39bb98948e22e94036104ddabd5e2b" | 30 | SRCREV = "0af88dc973d3410cdd905265ce935916693b2d44" |
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 56dd837e..6418a923 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb | |||
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \ | |||
15 | 15 | ||
16 | DEPENDS += "qtbase qtdeclarative" | 16 | DEPENDS += "qtbase qtdeclarative" |
17 | 17 | ||
18 | SRCREV = "5e8d2b4e266916761a26905f0930add305c308cf" | 18 | SRCREV = "5cf1a2f7f4ac4e71b085ef53ff5a05c4676f7ce2" |
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 37f7da50..71da104d 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb | |||
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \ | |||
15 | 15 | ||
16 | DEPENDS += "qtbase" | 16 | DEPENDS += "qtbase" |
17 | 17 | ||
18 | SRCREV = "e5c93da50f3b05d312f0e3dec50baf9fcbd5ffdc" | 18 | SRCREV = "5bee9d9f0f8cf5415ad9337aed88bccac3c15ce1" |
diff --git a/recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch b/recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch index 9f6921ef..4ee0994a 100644 --- a/recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch +++ b/recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d474ee7585372fdb77a928b401b5895b05b41e20 Mon Sep 17 00:00:00 2001 | 1 | From e196a8767dc8886f4d8f411feb21baaf2b8d741a 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, 5 Nov 2015 12:25:05 +0100 | 3 | Date: Thu, 5 Nov 2015 12:25:05 +0100 |
4 | Subject: [PATCH] textobject.pro: use DEPLOYMENT only for wince like other | 4 | Subject: [PATCH] textobject.pro: use DEPLOYMENT only for wince like other |
@@ -26,5 +26,5 @@ index 794ad32..0ecd2c7 100644 | |||
26 | + DEPLOYMENT += filesToDeploy | 26 | + DEPLOYMENT += filesToDeploy |
27 | +} | 27 | +} |
28 | -- | 28 | -- |
29 | 2.7.0 | 29 | 2.7.1 |
30 | 30 | ||
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 314679b1..bf96be43 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb | |||
@@ -13,6 +13,6 @@ LIC_FILES_CHKSUM = " \ | |||
13 | 13 | ||
14 | DEPENDS += "qtbase" | 14 | DEPENDS += "qtbase" |
15 | 15 | ||
16 | SRCREV = "b50d20b7057fcd808525921e56d25f75140c79cd" | 16 | SRCREV = "4ef60892ce9e8dea75a31b0be7895ebf473346a9" |
17 | 17 | ||
18 | SRC_URI += "file://0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch" | 18 | SRC_URI += "file://0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch" |
diff --git a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch index 717f3af1..bc902d30 100644 --- a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch +++ b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3bd799c512d03bcef2f7c0e3db7b12e0579aa53b Mon Sep 17 00:00:00 2001 | 1 | From 412772782e0e4882adb358eabd04fdd2a2166366 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, 11 Sep 2013 18:30:08 +0200 | 3 | Date: Wed, 11 Sep 2013 18:30:08 +0200 |
4 | Subject: [PATCH 1/4] Allow to build only lrelease + lupdate + lconvert | 4 | Subject: [PATCH 1/4] Allow to build only lrelease + lupdate + lconvert |
@@ -157,5 +157,5 @@ index 20b5fec..8a42d1f 100644 | |||
157 | installed_cmake.depends = cmake | 157 | installed_cmake.depends = cmake |
158 | 158 | ||
159 | -- | 159 | -- |
160 | 2.7.0 | 160 | 2.7.1 |
161 | 161 | ||
diff --git a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch index f7dd1797..c8c21265 100644 --- a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch +++ b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 59f4367fc7cd378727a5569bd7babfb8b83bc8d2 Mon Sep 17 00:00:00 2001 | 1 | From 431db9926107563b44e2443cb8da8e0b1278a18c Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
3 | Date: Fri, 17 Jan 2014 14:33:19 +0100 | 3 | Date: Fri, 17 Jan 2014 14:33:19 +0100 |
4 | Subject: [PATCH 2/4] assistant/help: fix linking of dependent libraries | 4 | Subject: [PATCH 2/4] assistant/help: fix linking of dependent libraries |
@@ -28,5 +28,5 @@ index 168d23d..a9c3b59 100644 | |||
28 | + | 28 | + |
29 | +LIBS += -lQt5CLucene | 29 | +LIBS += -lQt5CLucene |
30 | -- | 30 | -- |
31 | 2.7.0 | 31 | 2.7.1 |
32 | 32 | ||
diff --git a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch index b1b9efbf..d926cd11 100644 --- a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch +++ b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 80409fd5fcdf8dfc61e8c9007286a292a195051d Mon Sep 17 00:00:00 2001 | 1 | From a06e526751f430de47e32a39dde16559d3378845 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
3 | Date: Wed, 4 Jun 2014 11:28:16 +0200 | 3 | Date: Wed, 4 Jun 2014 11:28:16 +0200 |
4 | Subject: [PATCH 3/4] add noqtwebkit configuration | 4 | Subject: [PATCH 3/4] add noqtwebkit configuration |
@@ -47,5 +47,5 @@ index 500a153..b60fa2d 100644 | |||
47 | win32: qtHaveModule(axcontainer): SUBDIRS += activeqt | 47 | win32: qtHaveModule(axcontainer): SUBDIRS += activeqt |
48 | qtHaveModule(quickwidgets): SUBDIRS += qquickwidget | 48 | qtHaveModule(quickwidgets): SUBDIRS += qquickwidget |
49 | -- | 49 | -- |
50 | 2.7.0 | 50 | 2.7.1 |
51 | 51 | ||
diff --git a/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch b/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch index 2eed34b5..79339b0e 100644 --- a/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch +++ b/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 69a2d2bef3605edb34da7f56a51e5fff50ef3191 Mon Sep 17 00:00:00 2001 | 1 | From 7f176e511dfc24bdca2ef2ef7f71afe3177a6ce6 Mon Sep 17 00:00:00 2001 |
2 | From: Cody P Schafer <dev@codyps.com> | 2 | From: Cody P Schafer <dev@codyps.com> |
3 | Date: Thu, 9 Jul 2015 11:28:19 -0400 | 3 | Date: Thu, 9 Jul 2015 11:28:19 -0400 |
4 | Subject: [PATCH 4/4] linguist-tools cmake: allow overriding the location for | 4 | Subject: [PATCH 4/4] linguist-tools cmake: allow overriding the location for |
@@ -59,5 +59,5 @@ index 4318b16..2e3b70f 100644 | |||
59 | 59 | ||
60 | set_target_properties(Qt5::lconvert PROPERTIES | 60 | set_target_properties(Qt5::lconvert PROPERTIES |
61 | -- | 61 | -- |
62 | 2.7.0 | 62 | 2.7.1 |
63 | 63 | ||
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 11512ff4..1094162b 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -31,6 +31,6 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" | |||
31 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" | 31 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" |
32 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" | 32 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" |
33 | 33 | ||
34 | SRCREV = "36aa99b22465e10d44c1461021b93d60bc6aeead" | 34 | SRCREV = "852f4e4cf87d7db0eaa87384b1589e151f76e6cd" |
35 | 35 | ||
36 | BBCLASSEXTEND = "native nativesdk" | 36 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb index c0c04f7f..f29836ec 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bb +++ b/recipes-qt/qt5/qtwayland-native_git.bb | |||
@@ -25,4 +25,4 @@ do_install() { | |||
25 | oe_runmake install INSTALL_ROOT=${D} | 25 | oe_runmake install INSTALL_ROOT=${D} |
26 | } | 26 | } |
27 | 27 | ||
28 | SRCREV = "74b1ec474d1d48242893dcaf58b8a35f155f3fc3" | 28 | SRCREV = "1edfb6651b4433fe0b0681eb40f1472757640dda" |
diff --git a/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch index 37d3fdc0..81d0f926 100644 --- a/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch +++ b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From bb43e4a944db0095dcc9f2f0b07ca1f79f3a5206 Mon Sep 17 00:00:00 2001 | 1 | From 08b8b3ab87e5e8d03bf94e7ceb88cc5b22f66b1c Mon Sep 17 00:00:00 2001 |
2 | From: Simon Busch <morphis@gravedo.de> | 2 | From: Simon Busch <morphis@gravedo.de> |
3 | Date: Fri, 19 Jul 2013 13:35:14 +0000 | 3 | Date: Fri, 19 Jul 2013 13:35:14 +0000 |
4 | Subject: [PATCH] Install the qtwaylandscanner tool to the native side | 4 | Subject: [PATCH] Install the qtwaylandscanner tool to the native side |
@@ -28,5 +28,5 @@ index ac2d07b..7a46a24 100644 | |||
28 | +target.path = $$[QT_HOST_BINS] | 28 | +target.path = $$[QT_HOST_BINS] |
29 | +INSTALLS += target | 29 | +INSTALLS += target |
30 | -- | 30 | -- |
31 | 2.7.0 | 31 | 2.7.1 |
32 | 32 | ||
diff --git a/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch b/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch index a99fba79..48fa206b 100644 --- a/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch +++ b/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 125478ea618c1329b210621bee6f6cdec5e81032 Mon Sep 17 00:00:00 2001 | 1 | From 4a74d70a713d34b5b2195506205d79575e8b1427 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, 22 Feb 2014 17:47:44 +0100 | 3 | Date: Sat, 22 Feb 2014 17:47:44 +0100 |
4 | Subject: [PATCH] examples/wayland: include server-buffer only when building | 4 | Subject: [PATCH] examples/wayland: include server-buffer only when building |
@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
14 | 1 file changed, 3 insertions(+), 1 deletion(-) | 14 | 1 file changed, 3 insertions(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro | 16 | diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro |
17 | index 91c68b8..9cfcefe 100644 | 17 | index b67d12e..c5daad0 100644 |
18 | --- a/examples/wayland/wayland.pro | 18 | --- a/examples/wayland/wayland.pro |
19 | +++ b/examples/wayland/wayland.pro | 19 | +++ b/examples/wayland/wayland.pro |
20 | @@ -8,4 +8,6 @@ qtHaveModule(quick) { | 20 | @@ -9,4 +9,6 @@ qtHaveModule(quick) { |
21 | SUBDIRS += custom-extension | 21 | SUBDIRS += custom-extension |
22 | } | 22 | } |
23 | 23 | ||
@@ -26,5 +26,5 @@ index 91c68b8..9cfcefe 100644 | |||
26 | + SUBDIRS += server-buffer | 26 | + SUBDIRS += server-buffer |
27 | +} | 27 | +} |
28 | -- | 28 | -- |
29 | 2.7.0 | 29 | 2.7.1 |
30 | 30 | ||
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 534334ed..2cdd8b32 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -36,4 +36,4 @@ SRC_URI += " \ | |||
36 | file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ | 36 | file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ |
37 | " | 37 | " |
38 | 38 | ||
39 | SRCREV = "74b1ec474d1d48242893dcaf58b8a35f155f3fc3" | 39 | SRCREV = "1edfb6651b4433fe0b0681eb40f1472757640dda" |
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index c3fb0614..b5702c7e 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb | |||
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \ | |||
15 | 15 | ||
16 | DEPENDS += "qtdeclarative qtwebsockets" | 16 | DEPENDS += "qtdeclarative qtwebsockets" |
17 | 17 | ||
18 | SRCREV = "9507cdc31ff6778cba77764bb0991e538c493a9e" | 18 | SRCREV = "a9bad172f62fe1dda280df5477a8b7c1bd57690d" |
diff --git a/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch b/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch index 90202923..9aa061d0 100644 --- a/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch +++ b/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 0fdc77731963107902fba356b96a9f0648d03e81 Mon Sep 17 00:00:00 2001 | 1 | From 33fac625554652e137c9fb095425c25240ee83ae 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, 30 Jun 2014 20:08:17 +0200 | 3 | Date: Mon, 30 Jun 2014 20:08:17 +0200 |
4 | Subject: [PATCH 1/5] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H | 4 | Subject: [PATCH 1/5] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H |
@@ -10,7 +10,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
10 | 1 file changed, 2 insertions(+), 2 deletions(-) | 10 | 1 file changed, 2 insertions(+), 2 deletions(-) |
11 | 11 | ||
12 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf | 12 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf |
13 | index 2df689b..8d984c7 100644 | 13 | index 2f7cd39..6ae413a 100644 |
14 | --- a/tools/qmake/mkspecs/features/functions.prf | 14 | --- a/tools/qmake/mkspecs/features/functions.prf |
15 | +++ b/tools/qmake/mkspecs/features/functions.prf | 15 | +++ b/tools/qmake/mkspecs/features/functions.prf |
16 | @@ -131,9 +131,9 @@ defineReplace(mocOutput) { | 16 | @@ -131,9 +131,9 @@ defineReplace(mocOutput) { |
@@ -26,5 +26,5 @@ index 2df689b..8d984c7 100644 | |||
26 | } | 26 | } |
27 | 27 | ||
28 | -- | 28 | -- |
29 | 2.7.0 | 29 | 2.7.1 |
30 | 30 | ||
diff --git a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch index 72eec1b2..3662c441 100644 --- a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch +++ b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 75b06098b5780ba3eaa24d48dd90d91590a379d1 Mon Sep 17 00:00:00 2001 | 1 | From 958e5875c25f76e7431c86286305f289effcedf6 Mon Sep 17 00:00:00 2001 |
2 | From: Simon Busch <morphis@gravedo.de> | 2 | From: Simon Busch <morphis@gravedo.de> |
3 | Date: Tue, 18 Nov 2014 10:38:18 +0100 | 3 | Date: Tue, 18 Nov 2014 10:38:18 +0100 |
4 | Subject: [PATCH 2/5] functions.prf: Make sure we only use the file name to | 4 | Subject: [PATCH 2/5] functions.prf: Make sure we only use the file name to |
@@ -11,7 +11,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
11 | 1 file changed, 2 insertions(+), 1 deletion(-) | 11 | 1 file changed, 2 insertions(+), 1 deletion(-) |
12 | 12 | ||
13 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf | 13 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf |
14 | index 8d984c7..055e960 100644 | 14 | index 6ae413a..deaab83 100644 |
15 | --- a/tools/qmake/mkspecs/features/functions.prf | 15 | --- a/tools/qmake/mkspecs/features/functions.prf |
16 | +++ b/tools/qmake/mkspecs/features/functions.prf | 16 | +++ b/tools/qmake/mkspecs/features/functions.prf |
17 | @@ -128,7 +128,8 @@ defineReplace(findIncludedMocFiles) { | 17 | @@ -128,7 +128,8 @@ defineReplace(findIncludedMocFiles) { |
@@ -25,5 +25,5 @@ index 8d984c7..055e960 100644 | |||
25 | for(ext, $$list($${QMAKE_EXT_CPP})): \ | 25 | for(ext, $$list($${QMAKE_EXT_CPP})): \ |
26 | out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) | 26 | out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) |
27 | -- | 27 | -- |
28 | 2.7.0 | 28 | 2.7.1 |
29 | 29 | ||
diff --git a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch index 6bf29357..b3f83a39 100644 --- a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 52575f04d108183482cef6b4b871f736ef66aa1b Mon Sep 17 00:00:00 2001 | 1 | From 4c5dd531c728384326c0875661b77d2f9d0faf19 Mon Sep 17 00:00:00 2001 |
2 | From: Frieder Schrempf <frieder.schrempf@online.de> | 2 | From: Frieder Schrempf <frieder.schrempf@online.de> |
3 | Date: Mon, 1 Dec 2014 14:34:40 +0000 | 3 | Date: Mon, 1 Dec 2014 14:34:40 +0000 |
4 | Subject: [PATCH 3/5] functions.prf: allow build for linux-oe-g++ platform | 4 | Subject: [PATCH 3/5] functions.prf: allow build for linux-oe-g++ platform |
@@ -12,7 +12,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
12 | 1 file changed, 6 insertions(+) | 12 | 1 file changed, 6 insertions(+) |
13 | 13 | ||
14 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf | 14 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf |
15 | index 055e960..379c9b5 100644 | 15 | index deaab83..68cdb71 100644 |
16 | --- a/tools/qmake/mkspecs/features/functions.prf | 16 | --- a/tools/qmake/mkspecs/features/functions.prf |
17 | +++ b/tools/qmake/mkspecs/features/functions.prf | 17 | +++ b/tools/qmake/mkspecs/features/functions.prf |
18 | @@ -5,6 +5,12 @@ defineTest(isPlatformSupported) { | 18 | @@ -5,6 +5,12 @@ defineTest(isPlatformSupported) { |
@@ -29,5 +29,5 @@ index 055e960..379c9b5 100644 | |||
29 | winrt { | 29 | winrt { |
30 | skipBuild("WinRT is not supported.") | 30 | skipBuild("WinRT is not supported.") |
31 | -- | 31 | -- |
32 | 2.7.0 | 32 | 2.7.1 |
33 | 33 | ||
diff --git a/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch b/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch index efaabf04..e4dcbebc 100644 --- a/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch +++ b/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b3c28efd16c9e9a0cd2a29441dae02382b8deaea Mon Sep 17 00:00:00 2001 | 1 | From 35afd225b448d2641594f2fd7e31c423cc64ecae Mon Sep 17 00:00:00 2001 |
2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> | 2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> |
3 | Date: Fri, 25 Dec 2015 18:16:05 -0200 | 3 | Date: Fri, 25 Dec 2015 18:16:05 -0200 |
4 | Subject: [PATCH 4/5] WebEngine qquickwebengineview_p_p.h add include QColor | 4 | Subject: [PATCH 4/5] WebEngine qquickwebengineview_p_p.h add include QColor |
@@ -22,5 +22,5 @@ index e4313a4..5a8137e 100644 | |||
22 | namespace QtWebEngineCore { | 22 | namespace QtWebEngineCore { |
23 | class WebContentsAdapter; | 23 | class WebContentsAdapter; |
24 | -- | 24 | -- |
25 | 2.7.0 | 25 | 2.7.1 |
26 | 26 | ||
diff --git a/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch index b2cc4d14..dfd8e25c 100644 --- a/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch +++ b/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From cc711a443c53c61475957fd8b6ffcf84272bf7a6 Mon Sep 17 00:00:00 2001 | 1 | From 1ad078e7cb9d8fff66f05e828953a2f5b11df7ee Mon Sep 17 00:00:00 2001 |
2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> | 2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> |
3 | Date: Thu, 24 Dec 2015 15:59:51 -0200 | 3 | Date: Thu, 24 Dec 2015 15:59:51 -0200 |
4 | Subject: [PATCH 5/5] Include dependency to QCoreApplication::translate() | 4 | Subject: [PATCH 5/5] Include dependency to QCoreApplication::translate() |
@@ -22,5 +22,5 @@ index b13a9da..8a54cce 100644 | |||
22 | 22 | ||
23 | #include "base/callback.h" | 23 | #include "base/callback.h" |
24 | -- | 24 | -- |
25 | 2.7.0 | 25 | 2.7.1 |
26 | 26 | ||
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 9046c7f7..01f7eb8c 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -122,7 +122,7 @@ SRC_URI += " \ | |||
122 | file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ | 122 | file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ |
123 | " | 123 | " |
124 | 124 | ||
125 | SRCREV_qtwebengine = "835b24055cfbc953fd4c844d264e7fbc8550d575" | 125 | SRCREV_qtwebengine = "66e01f2866479fe9f27f663ddcdc32fefb52e193" |
126 | SRCREV_chromium = "df7c5f41e9f7e6a1382706e99bd78c4b7e3d1201" | 126 | SRCREV_chromium = "df7c5f41e9f7e6a1382706e99bd78c4b7e3d1201" |
127 | SRCREV = "${SRCREV_qtwebengine}" | 127 | SRCREV = "${SRCREV_qtwebengine}" |
128 | 128 | ||
diff --git a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch index e8b0e432..8ec65594 100644 --- a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch +++ b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1735a8484ef9ae336f8d607b56bda64c8af10c79 Mon Sep 17 00:00:00 2001 | 1 | From 86bdd059606252b16c24432fbe4bba461406c1e4 Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Woerner <trevor.woerner@linaro.org> | 2 | From: Trevor Woerner <trevor.woerner@linaro.org> |
3 | Date: Fri, 7 Feb 2014 04:07:17 +0100 | 3 | Date: Fri, 7 Feb 2014 04:07:17 +0100 |
4 | Subject: [PATCH 1/3] qtwebkit: fix QA issue (bad RPATH) | 4 | Subject: [PATCH 1/3] qtwebkit: fix QA issue (bad RPATH) |
@@ -26,5 +26,5 @@ index fd66af6..ef754c3 100644 | |||
26 | CONFIG(debug, debug|release)|force_debug_info { | 26 | CONFIG(debug, debug|release)|force_debug_info { |
27 | # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. | 27 | # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. |
28 | -- | 28 | -- |
29 | 2.7.0 | 29 | 2.7.1 |
30 | 30 | ||
diff --git a/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch b/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch index b3a86159..e659116d 100644 --- a/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch +++ b/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ae16ce17cc7060274a0b0c165b953fc32540f977 Mon Sep 17 00:00:00 2001 | 1 | From f6989fec34f0bafdeda549d71751f236ef1f3b96 Mon Sep 17 00:00:00 2001 |
2 | From: Magnus Granberg <zorry@gentoo.org> | 2 | From: Magnus Granberg <zorry@gentoo.org> |
3 | Date: Fri, 27 Feb 2015 11:55:09 +0100 | 3 | Date: Fri, 27 Feb 2015 11:55:09 +0100 |
4 | Subject: [PATCH 2/3] Remove TEXTREL tag in x86 | 4 | Subject: [PATCH 2/3] Remove TEXTREL tag in x86 |
@@ -75,5 +75,5 @@ index 0a2fe78..2dc40ef 100644 | |||
75 | #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) | 75 | #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) |
76 | #endif | 76 | #endif |
77 | -- | 77 | -- |
78 | 2.7.0 | 78 | 2.7.1 |
79 | 79 | ||
diff --git a/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch b/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch index 43798666..2fcaafb8 100644 --- a/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch +++ b/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6c36f0ff8c1f5852c33d2b23714f9f187cc6ff26 Mon Sep 17 00:00:00 2001 | 1 | From ed626df67e8287fadbfe2801c241c9717472dcf4 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 5 Jun 2015 19:55:05 -0700 | 3 | Date: Fri, 5 Jun 2015 19:55:05 -0700 |
4 | Subject: [PATCH 3/3] Exclude backtrace() API for non-glibc libraries | 4 | Subject: [PATCH 3/3] Exclude backtrace() API for non-glibc libraries |
@@ -34,5 +34,5 @@ index 1b2091f..ba03a28 100644 | |||
34 | #elif OS(WINDOWS) && !OS(WINCE) | 34 | #elif OS(WINDOWS) && !OS(WINCE) |
35 | // The CaptureStackBackTrace function is available in XP, but it is not defined | 35 | // The CaptureStackBackTrace function is available in XP, but it is not defined |
36 | -- | 36 | -- |
37 | 2.7.0 | 37 | 2.7.1 |
38 | 38 | ||
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 25756afa..0324c0c3 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb | |||
@@ -83,4 +83,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db | |||
83 | RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" | 83 | RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" |
84 | export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" | 84 | export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" |
85 | 85 | ||
86 | SRCREV = "e9b369b16f5b6070d11888474f1b652db6f4b4e2" | 86 | SRCREV = "2e8517924b70a778463e463873eb3d8d0b623eed" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 0b1d9b89..81554277 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtdeclarative" | 12 | DEPENDS += "qtbase qtdeclarative" |
13 | 13 | ||
14 | SRCREV = "e821221d4bbeab3715702e4265670f58290676d6" | 14 | SRCREV = "c00241ac0389cc4ee03252030e6de1257a9b50fd" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 6c5b0f2e..eca5b1fb 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb | |||
@@ -13,6 +13,6 @@ LIC_FILES_CHKSUM = " \ | |||
13 | 13 | ||
14 | DEPENDS += "qtbase" | 14 | DEPENDS += "qtbase" |
15 | 15 | ||
16 | SRCREV = "1f4c37adfacadec463884f4c22850c74a0c5893f" | 16 | SRCREV = "b24bd0e87891d9f61e0121cbdcbbe0797863f316" |
17 | 17 | ||
18 | BBCLASSEXTEND =+ "native nativesdk" | 18 | BBCLASSEXTEND =+ "native nativesdk" |