diff options
48 files changed, 80 insertions, 80 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 30033238..e7879934 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -278,4 +278,4 @@ fakeroot do_generate_qt_environment_file() { | |||
278 | 278 | ||
279 | addtask generate_qt_environment_file after do_install before do_package | 279 | addtask generate_qt_environment_file after do_install before do_package |
280 | 280 | ||
281 | SRCREV = "c619d2daac9b1f61e8ad2320b59c648b6af6af90" | 281 | SRCREV = "5afc431323454225363dae30e67a1cb909086bf9" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index d42cf571..437f41c2 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
@@ -15,4 +15,4 @@ FILES_${PN}-qmlplugins += " \ | |||
15 | ${OE_QMAKE_PATH_QML}/*/*/*.obj \ | 15 | ${OE_QMAKE_PATH_QML}/*/*/*.obj \ |
16 | " | 16 | " |
17 | 17 | ||
18 | SRCREV = "0bcb6600db2a74ee8c8b51207d3ba15e4973aa95" | 18 | SRCREV = "ec963e106397d46e5c853e9adb3fbec1b27d9b04" |
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 34b8ca43..bfe1f859 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc | |||
@@ -11,7 +11,7 @@ SRC_URI = " \ | |||
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
14 | PV = "5.5.0+git${SRCPV}" | 14 | PV = "5.5.1+git${SRCPV}" |
15 | 15 | ||
16 | #LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" | 16 | #LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" |
17 | #LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ | 17 | #LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 0f77fa29..10496f08 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -116,4 +116,4 @@ do_install() { | |||
116 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt | 116 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt |
117 | } | 117 | } |
118 | 118 | ||
119 | SRCREV = "c619d2daac9b1f61e8ad2320b59c648b6af6af90" | 119 | SRCREV = "5afc431323454225363dae30e67a1cb909086bf9" |
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 91bb9f33..a9c448dc 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 566de5f3f4dc14bae25a1b77eb6859c820447a32 Mon Sep 17 00:00:00 2001 | 1 | From 76283f2bca936a7565e8bf38a4630ec98f47ef50 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 |
@@ -350,5 +350,5 @@ index 0000000..dd12003 | |||
350 | + | 350 | + |
351 | +#endif // QPLATFORMDEFS_H | 351 | +#endif // QPLATFORMDEFS_H |
352 | -- | 352 | -- |
353 | 2.5.3 | 353 | 2.6.1 |
354 | 354 | ||
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 800d42a8..c5f14c9d 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 9e987abf08c5841fcce3331aceec51e00a26dcc8 Mon Sep 17 00:00:00 2001 | 1 | From f15c77264cc3ee82cba4127e58be4f6401b791f6 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 |
@@ -35,5 +35,5 @@ index 0cfcc4e..c3b5c2d 100644 | |||
35 | return new QSettings(qtconfig, QSettings::IniFormat); | 35 | return new QSettings(qtconfig, QSettings::IniFormat); |
36 | #ifdef QT_BUILD_QMAKE | 36 | #ifdef QT_BUILD_QMAKE |
37 | -- | 37 | -- |
38 | 2.5.3 | 38 | 2.6.1 |
39 | 39 | ||
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 de8e1a4d..e969f6fa 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 90f3f8f59dd23f67e14c9988c2f4449a31762752 Mon Sep 17 00:00:00 2001 | 1 | From 9529fdce0bd5516f86de1cb18aa6d18a66317ba5 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 |
@@ -225,5 +225,5 @@ index 99d87e2..5621dc0 100644 | |||
225 | _qt5_Widgets_check_file_exists(${imported_location}) | 225 | _qt5_Widgets_check_file_exists(${imported_location}) |
226 | 226 | ||
227 | -- | 227 | -- |
228 | 2.5.3 | 228 | 2.6.1 |
229 | 229 | ||
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 e7155bb8..b2cf522b 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 d28d15f9489ab9bb09627014003ad1bde2a79e1f Mon Sep 17 00:00:00 2001 | 1 | From b6d708efc205f2ffc0280e2da94596384bd98049 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 |
@@ -108,5 +108,5 @@ index c89b6d2..23d4366 100644 | |||
108 | } | 108 | } |
109 | 109 | ||
110 | -- | 110 | -- |
111 | 2.5.3 | 111 | 2.6.1 |
112 | 112 | ||
diff --git a/recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch index 0875bd88..64f29a58 100644 --- a/recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch +++ b/recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c3f540be8541f71fdb7b7baa9000583a914ac7f7 Mon Sep 17 00:00:00 2001 | 1 | From 168690a50a5d8bb1068d254532710cec8c93a08f 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, 19 Mar 2014 18:32:28 +0100 | 3 | Date: Wed, 19 Mar 2014 18:32:28 +0100 |
4 | Subject: [PATCH 05/10] qeglplatformintegration: Undefine CursorShape from X.h | 4 | Subject: [PATCH 05/10] qeglplatformintegration: Undefine CursorShape from X.h |
@@ -26,5 +26,5 @@ index 42fbf8c..8950f2d 100644 | |||
26 | 26 | ||
27 | class QEGLPlatformWindow; | 27 | class QEGLPlatformWindow; |
28 | -- | 28 | -- |
29 | 2.5.3 | 29 | 2.6.1 |
30 | 30 | ||
diff --git a/recipes-qt/qt5/qtbase/0006-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0006-configure-bump-path-length-from-256-to-512-character.patch index 0635a2f5..6fd8b2be 100644 --- a/recipes-qt/qt5/qtbase/0006-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase/0006-configure-bump-path-length-from-256-to-512-character.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 37aec78ac44bad8754c3bd5b56836025e4eed50a Mon Sep 17 00:00:00 2001 | 1 | From 3c6cdb9c315e8457b8d191c0f1192499e8edc009 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 06/10] configure: bump path length from 256 to 512 characters | 4 | Subject: [PATCH 06/10] configure: bump path length from 256 to 512 characters |
@@ -32,5 +32,5 @@ index a757ce5..f0f42ab 100755 | |||
32 | 32 | ||
33 | static const short qt_configure_str_offsets[] = { | 33 | static const short qt_configure_str_offsets[] = { |
34 | -- | 34 | -- |
35 | 2.5.3 | 35 | 2.6.1 |
36 | 36 | ||
diff --git a/recipes-qt/qt5/qtbase/0007-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0007-QOpenGLPaintDevice-sub-area-support.patch index e2d21155..28ecfd50 100644 --- a/recipes-qt/qt5/qtbase/0007-QOpenGLPaintDevice-sub-area-support.patch +++ b/recipes-qt/qt5/qtbase/0007-QOpenGLPaintDevice-sub-area-support.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ca3b8fabcc38a9545e935a7c530565689fb85ff7 Mon Sep 17 00:00:00 2001 | 1 | From d68aa317015ca452b7097b267e5a1fa576aaa5e8 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 07/10] QOpenGLPaintDevice sub-area support | 4 | Subject: [PATCH 07/10] QOpenGLPaintDevice sub-area support |
@@ -153,5 +153,5 @@ index c179143..fad68d5 100644 | |||
153 | } else { | 153 | } else { |
154 | if (m_vao.isCreated()) { | 154 | if (m_vao.isCreated()) { |
155 | -- | 155 | -- |
156 | 2.5.3 | 156 | 2.6.1 |
157 | 157 | ||
diff --git a/recipes-qt/qt5/qtbase/0008-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0008-Always-build-uic.patch index d84e298b..b2a478dc 100644 --- a/recipes-qt/qt5/qtbase/0008-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase/0008-Always-build-uic.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d1feb6d0a80460e66872749d931cddc8ed22851d Mon Sep 17 00:00:00 2001 | 1 | From cbd61cc5f4c447a9539e0a6a1dd378ac34471aff 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 08/10] Always build uic | 4 | Subject: [PATCH 08/10] Always build uic |
@@ -27,5 +27,5 @@ index 61e5ce2..a4047aa 100644 | |||
27 | nacl: SUBDIRS -= src_network src_testlib | 27 | nacl: SUBDIRS -= src_network src_testlib |
28 | 28 | ||
29 | -- | 29 | -- |
30 | 2.5.3 | 30 | 2.6.1 |
31 | 31 | ||
diff --git a/recipes-qt/qt5/qtbase/0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase/0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch index 9bc13157..3ba66415 100644 --- a/recipes-qt/qt5/qtbase/0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch +++ b/recipes-qt/qt5/qtbase/0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From dcc588b11abdc12b4ed08534334e338f35d96ed1 Mon Sep 17 00:00:00 2001 | 1 | From 3442aad5295956c1a177bdf7ab73e1f0d86ab5fc 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 08/10] qmake: don't build it in configure, but allow to build | 4 | Subject: [PATCH 08/10] qmake: don't build it in configure, but allow to build |
@@ -64,5 +64,5 @@ index 89d6ea5..0ff4a96 100644 | |||
64 | VPATH += \ | 64 | VPATH += \ |
65 | ../src/corelib/global \ | 65 | ../src/corelib/global \ |
66 | -- | 66 | -- |
67 | 2.5.3 | 67 | 2.6.1 |
68 | 68 | ||
diff --git a/recipes-qt/qt5/qtbase/0009-Add-external-hostbindir-option-for-native-sdk.patch b/recipes-qt/qt5/qtbase/0009-Add-external-hostbindir-option-for-native-sdk.patch index 292ced81..683cf271 100644 --- a/recipes-qt/qt5/qtbase/0009-Add-external-hostbindir-option-for-native-sdk.patch +++ b/recipes-qt/qt5/qtbase/0009-Add-external-hostbindir-option-for-native-sdk.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 22c6746515470bab482b8cbb9a256033470d3647 Mon Sep 17 00:00:00 2001 | 1 | From 12d06b2c5857a1c9cac4c964f32a582d029e9dfa 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 09/10] Add -external-hostbindir option for native(sdk) | 4 | Subject: [PATCH 09/10] Add -external-hostbindir option for native(sdk) |
@@ -130,5 +130,5 @@ index 3bf0546..53bf146 100644 | |||
130 | addConfStr(1, hostSpec); | 130 | addConfStr(1, hostSpec); |
131 | 131 | ||
132 | -- | 132 | -- |
133 | 2.5.3 | 133 | 2.6.1 |
134 | 134 | ||
diff --git a/recipes-qt/qt5/qtbase/0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch b/recipes-qt/qt5/qtbase/0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch index 760f446c..26503373 100644 --- a/recipes-qt/qt5/qtbase/0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch +++ b/recipes-qt/qt5/qtbase/0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b0648c997d24855b2a6f56fc61e3159af815fb4d Mon Sep 17 00:00:00 2001 | 1 | From 8ed228de093947c176cd1d8984a61e3b338bbe66 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 09/10] linux-oe-g++: Invert conditional for defining | 4 | Subject: [PATCH 09/10] linux-oe-g++: Invert conditional for defining |
@@ -32,5 +32,5 @@ index dd12003..8623651 100644 | |||
32 | 32 | ||
33 | #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) | 33 | #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) |
34 | -- | 34 | -- |
35 | 2.5.3 | 35 | 2.6.1 |
36 | 36 | ||
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 39d02a9f..4cffccf7 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -279,4 +279,4 @@ sysroot_stage_dirs_append() { | |||
279 | rm -rf $to${OE_QMAKE_PATH_QT_FONTS} | 279 | rm -rf $to${OE_QMAKE_PATH_QT_FONTS} |
280 | } | 280 | } |
281 | 281 | ||
282 | SRCREV = "c619d2daac9b1f61e8ad2320b59c648b6af6af90" | 282 | SRCREV = "5afc431323454225363dae30e67a1cb909086bf9" |
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 4616a213..9678a608 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 = "e372a67c1bbdf695f8e550950a3dbf3106389479" | 13 | SRCREV = "9a714258f32a6a5318eb461903af25f64b7c80d2" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 24988cda..84360e85 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb | |||
@@ -22,4 +22,4 @@ do_configure_prepend() { | |||
22 | sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro | 22 | sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro |
23 | } | 23 | } |
24 | 24 | ||
25 | SRCREV = "b31cbd7c5d6b16a20035ace6675835356b69fd65" | 25 | SRCREV = "cf8b244f94fdabf5c960d82c4bbcbf13c91c29b1" |
diff --git a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch index 5dd0aa4e..1a4b5c56 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 c866d9b3f38f1a0adabdeb19648058711a66a900 Mon Sep 17 00:00:00 2001 | 1 | From 54fca19532b5224e8f79d7a010f2654ee196d326 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 |
@@ -84,5 +84,5 @@ index 1bb913e..56f2dd5 100644 | |||
84 | 84 | ||
85 | load(qt_tool) | 85 | load(qt_tool) |
86 | -- | 86 | -- |
87 | 2.5.3 | 87 | 2.6.1 |
88 | 88 | ||
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 57e76e36..5ea53239 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 = "9794e7d66c30f012a19ec9530d719293b7c5bc7c" | 36 | SRCREV = "3e9f61f305dc4c988e6f2718df56df80f639734e" |
37 | 37 | ||
38 | BBCLASSEXTEND =+ "native nativesdk" | 38 | BBCLASSEXTEND =+ "native nativesdk" |
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 66000c59..4d0402f6 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 | |||
@@ -27,5 +27,5 @@ index 8382e5c..63d13ce 100644 | |||
27 | 27 | ||
28 | load(qt_parts) | 28 | load(qt_parts) |
29 | -- | 29 | -- |
30 | 2.5.3 | 30 | 2.6.1 |
31 | 31 | ||
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index df5a67d7..63642aa5 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 = "d1c91515ef0ad4208c41a4052f92bfb817333aca" | 32 | SRCREV = "63b118c7da215d994e1695797fd44c2ad35298c3" |
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 ec96ddce..d4601d72 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 c75cdeeb0ea705b9415c3cf777c611aee01f62c2 Mon Sep 17 00:00:00 2001 | 1 | From 64ad5e10c41e234151d18e71bfa315c7906eba16 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 1225ffb..4f675fe 100644 | |||
55 | 55 | ||
56 | qtCompileTest(resourcepolicy) | 56 | qtCompileTest(resourcepolicy) |
57 | -- | 57 | -- |
58 | 2.5.3 | 58 | 2.6.1 |
59 | 59 | ||
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 7103c040..faf05d4e 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 = "46a83d5b86a792e62f14674e27c5d95695f2b44d" | 38 | SRCREV = "0cf41ef53f7b336509ed7d1ae6518655276af70f" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index bd42cc91..54de87c7 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 = "b35b0d60c8252b44e21e53922cba9c3a2d1abbc1" | 16 | SRCREV = "61889f06fa828b483513b8315b4f0870532ece66" |
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index c37a12df..e495c5b7 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 = "a7b94516e1412073eb9d3fb57e49315ef966b183" | 18 | SRCREV = "6a16281aceedb713676e16c3074e6f7ea1e70b79" |
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 7d14014d..e1255d8b 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,7 +1,7 @@ | |||
1 | From 922931781bd4fd765de996f1709aff95b6ac3fba Mon Sep 17 00:00:00 2001 | 1 | From 922931781bd4fd765de996f1709aff95b6ac3fba 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/3] Allow to build only lrelease + lupdate + lconvert | 4 | Subject: [PATCH 1/4] Allow to build only lrelease + lupdate + lconvert |
5 | 5 | ||
6 | This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native | 6 | This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native |
7 | is built without GUI support (no-png is set) and we still want to build | 7 | is built without GUI support (no-png is set) and we still want to build |
@@ -155,5 +155,5 @@ index 20b5fec..8a42d1f 100644 | |||
155 | installed_cmake.depends = cmake | 155 | installed_cmake.depends = cmake |
156 | 156 | ||
157 | -- | 157 | -- |
158 | 2.5.3 | 158 | 2.6.1 |
159 | 159 | ||
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 7496a4a4..3116b3d9 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,7 +1,7 @@ | |||
1 | From 83493e0f4e0d8b4dbf1da982e4459fefea61c582 Mon Sep 17 00:00:00 2001 | 1 | From 83493e0f4e0d8b4dbf1da982e4459fefea61c582 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/3] assistant/help: fix linking of dependent libraries | 4 | Subject: [PATCH 2/4] assistant/help: fix linking of dependent libraries |
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 |
@@ -28,5 +28,5 @@ index 168d23d..a9c3b59 100644 | |||
28 | + | 28 | + |
29 | +LIBS += -lQt5CLucene | 29 | +LIBS += -lQt5CLucene |
30 | -- | 30 | -- |
31 | 2.5.3 | 31 | 2.6.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 55506f8b..a0306e5f 100644 --- a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch +++ b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From ad5e4266eda956a1ff408bf3fe875badc5f4c866 Mon Sep 17 00:00:00 2001 | 1 | From ad5e4266eda956a1ff408bf3fe875badc5f4c866 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/3] add noqtwebkit configuration | 4 | Subject: [PATCH 3/4] add noqtwebkit configuration |
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 |
@@ -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.5.3 | 50 | 2.6.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 ae96384d..ce4a0b7c 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,7 +1,7 @@ | |||
1 | From b105af5084ec1ee51c1428769b881c260f01d4d5 Mon Sep 17 00:00:00 2001 | 1 | From e9e9a79d1a58981dd33d18c0f43b1fb982100a61 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] linguist-tools cmake: allow overriding the location for | 4 | Subject: [PATCH 4/4] linguist-tools cmake: allow overriding the location for |
5 | lupdate and lrelease | 5 | lupdate and lrelease |
6 | 6 | ||
7 | --- | 7 | --- |
@@ -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.4.5 | 62 | 2.6.1 |
63 | 63 | ||
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb index 48a94e58..b351b384 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 = "10fd51a3e69a0a2ee6b8cd151fa6c847f684253c" | 28 | SRCREV = "9d408649458a274864ae2e7c2d67b4fa3cabbfcd" |
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 3d26a5e8..caaceef2 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 09ba9e7eaebd72be5703d29848f5a65e5ca2e21c Mon Sep 17 00:00:00 2001 | 1 | From 7d40a551397f9914cacd5470bf17ac40a7b7330b 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.5.3 | 31 | 2.6.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 d271f256..384c1fac 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 19a3382694b3d66a056207e4e0345348f1d5bd57 Mon Sep 17 00:00:00 2001 | 1 | From d1de302c09ddbb4baac4bc781a6d53de11f387b3 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 |
@@ -27,5 +27,5 @@ index d633fb9..643c7cd 100644 | |||
27 | + } | 27 | + } |
28 | } | 28 | } |
29 | -- | 29 | -- |
30 | 2.5.3 | 30 | 2.6.1 |
31 | 31 | ||
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 8e6f9d02..2ea3285e 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -46,4 +46,4 @@ do_install_append() { | |||
46 | install ${B}/include/QtCompositor/${QT_VERSION}/QtCompositor/private/*protocol*.h ${D}${OE_QMAKE_PATH_QT_HEADERS}/QtCompositor/${QT_VERSION}/QtCompositor/private | 46 | install ${B}/include/QtCompositor/${QT_VERSION}/QtCompositor/private/*protocol*.h ${D}${OE_QMAKE_PATH_QT_HEADERS}/QtCompositor/${QT_VERSION}/QtCompositor/private |
47 | } | 47 | } |
48 | 48 | ||
49 | SRCREV = "10fd51a3e69a0a2ee6b8cd151fa6c847f684253c" | 49 | SRCREV = "9d408649458a274864ae2e7c2d67b4fa3cabbfcd" |
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 60d3f38e..aa7cb254 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 = "6a7de61bc15d0cde3a3c91c58f45ba10957aa39b" | 18 | SRCREV = "906d910415454d64ff0b021b06f0df422a8c82bd" |
diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch index f8808c10..062d9ed1 100644 --- a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch +++ b/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 8752cdaf7961ad0be8482cd6ebf76c91972f5088 Mon Sep 17 00:00:00 2001 | 1 | From 2a264c2ea7080b026ea1ec85f6317de13c5a6f4f 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: Fri, 3 Oct 2014 03:52:11 +0200 | 3 | Date: Fri, 3 Oct 2014 03:52:11 +0200 |
4 | Subject: [PATCH 1/2] <chromium> base.gypi: include | 4 | Subject: [PATCH 1/2] <chromium> base.gypi: include |
@@ -23,5 +23,5 @@ index a5a285a..f1cad86 100644 | |||
23 | ['include', 'atomicops_internals_x86_gcc.cc'], | 23 | ['include', 'atomicops_internals_x86_gcc.cc'], |
24 | ], | 24 | ], |
25 | -- | 25 | -- |
26 | 2.5.3 | 26 | 2.6.1 |
27 | 27 | ||
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 cceba8d4..02381e04 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 f66dceb807d27e4c0a3d1dd4d5b4f448b08317c9 Mon Sep 17 00:00:00 2001 | 1 | From cf7f63dfcf71b7baee30112ef73fed67504033f7 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/4] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H | 4 | Subject: [PATCH 1/4] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H |
@@ -10,10 +10,10 @@ 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 69d3fd3..5689ce0 100644 | 13 | index 64064bd..8287c8f 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 | @@ -98,9 +98,9 @@ defineReplace(mocOutput) { | 16 | @@ -105,9 +105,9 @@ defineReplace(mocOutput) { |
17 | out = $$1 | 17 | out = $$1 |
18 | # The order is important, since the output of the second replace would end up accidentaly transformed by the first one | 18 | # The order is important, since the output of the second replace would end up accidentaly transformed by the first one |
19 | for(ext, $$list($${QMAKE_EXT_CPP})): \ | 19 | for(ext, $$list($${QMAKE_EXT_CPP})): \ |
@@ -26,5 +26,5 @@ index 69d3fd3..5689ce0 100644 | |||
26 | } | 26 | } |
27 | 27 | ||
28 | -- | 28 | -- |
29 | 2.5.3 | 29 | 2.6.1 |
30 | 30 | ||
diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-third_party-boringssl-Demand-for-newer-POSI.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-third_party-boringssl-Demand-for-newer-POSI.patch index 87d21dbe..ae91cd2f 100644 --- a/recipes-qt/qt5/qtwebengine/0002-chromium-third_party-boringssl-Demand-for-newer-POSI.patch +++ b/recipes-qt/qt5/qtwebengine/0002-chromium-third_party-boringssl-Demand-for-newer-POSI.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1efcdf981e6f4cc4e2b5e5dfe407030dc1e43e65 Mon Sep 17 00:00:00 2001 | 1 | From b534874479a150d1fef4e0a4fb79a176d0a342eb 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: Sat, 27 Jun 2015 13:29:52 -0700 | 3 | Date: Sat, 27 Jun 2015 13:29:52 -0700 |
4 | Subject: [PATCH 2/2] chromium/third_party/boringssl: Demand for newer POSIX | 4 | Subject: [PATCH 2/2] chromium/third_party/boringssl: Demand for newer POSIX |
@@ -34,5 +34,5 @@ index ba65a1a..66c3976 100644 | |||
34 | #include <openssl/bio.h> | 34 | #include <openssl/bio.h> |
35 | #include <openssl/err.h> | 35 | #include <openssl/err.h> |
36 | -- | 36 | -- |
37 | 2.5.3 | 37 | 2.6.1 |
38 | 38 | ||
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 14481976..2ba8fec4 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 3cdf1ffa138026a601df8e8ddff5ac0723edb0b7 Mon Sep 17 00:00:00 2001 | 1 | From 7f81bad8fcd00afcf2214285856d46f50f91b55c 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/4] functions.prf: Make sure we only use the file name to | 4 | Subject: [PATCH 2/4] functions.prf: Make sure we only use the file name to |
@@ -11,10 +11,10 @@ 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 5689ce0..e71e6e4 100644 | 14 | index 8287c8f..04bdba5 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 | @@ -95,7 +95,8 @@ defineReplace(findIncludedMocFiles) { | 17 | @@ -102,7 +102,8 @@ defineReplace(findIncludedMocFiles) { |
18 | } | 18 | } |
19 | 19 | ||
20 | defineReplace(mocOutput) { | 20 | defineReplace(mocOutput) { |
@@ -25,5 +25,5 @@ index 5689ce0..e71e6e4 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.5.3 | 28 | 2.6.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 bfde82e1..23be4890 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 b7b5fa151e1ff1749ab5b04763f0f64a156e6e48 Mon Sep 17 00:00:00 2001 | 1 | From a7bb8e37abb3a11e6257d6e154d33c7af5856dcc 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/4] functions.prf: allow build for linux-oe-g++ platform | 4 | Subject: [PATCH 3/4] 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, 1 insertion(+), 1 deletion(-) | 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
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 e71e6e4..2161505 100644 | 15 | index 04bdba5..4206661 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 | @@ -14,7 +14,7 @@ defineTest(isPlatformSupported) { | 18 | @@ -14,7 +14,7 @@ defineTest(isPlatformSupported) { |
@@ -25,5 +25,5 @@ index e71e6e4..2161505 100644 | |||
25 | 25 | ||
26 | skipBuild("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.") | 26 | skipBuild("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.") |
27 | -- | 27 | -- |
28 | 2.5.3 | 28 | 2.6.1 |
29 | 29 | ||
diff --git a/recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch b/recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch index 55dc557a..037b0e4e 100644 --- a/recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch +++ b/recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 55c5a15f0a11c76a930020ac725e57303da2ef48 Mon Sep 17 00:00:00 2001 | 1 | From 324eab1b148df1e8330b2dbbd114ab696c163e46 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@theqtcompany.com> | 2 | From: Samuli Piippo <samuli.piippo@theqtcompany.com> |
3 | Date: Mon, 11 May 2015 13:47:06 +0300 | 3 | Date: Mon, 11 May 2015 13:47:06 +0300 |
4 | Subject: [PATCH 4/4] Generate usable qmake_extras.gypi | 4 | Subject: [PATCH 4/4] Generate usable qmake_extras.gypi |
@@ -67,5 +67,5 @@ index 2a59966..317d24a 100644 | |||
67 | " 'target_defaults': {" \ | 67 | " 'target_defaults': {" \ |
68 | " 'target_conditions': [" \ | 68 | " 'target_conditions': [" \ |
69 | -- | 69 | -- |
70 | 2.5.3 | 70 | 2.6.1 |
71 | 71 | ||
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 7127c8f7..fe923386 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -82,8 +82,8 @@ SRC_URI += " \ | |||
82 | file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \ | 82 | file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \ |
83 | file://0002-chromium-third_party-boringssl-Demand-for-newer-POSI.patch \ | 83 | file://0002-chromium-third_party-boringssl-Demand-for-newer-POSI.patch \ |
84 | " | 84 | " |
85 | SRCREV_qtwebengine = "ccb373c4937777ce4af10918f7412c606cbd56ce" | 85 | SRCREV_qtwebengine = "ce095e94b686196629244073990530441b9b5f4f" |
86 | SRCREV_chromium = "305284960db83fe9b9ae47674db9914d82180c23" | 86 | SRCREV_chromium = "146ebe26dce3289eb440bed7d5d0a7988ff5f5c9" |
87 | SRCREV = "${SRCREV_qtwebengine}" | 87 | SRCREV = "${SRCREV_qtwebengine}" |
88 | 88 | ||
89 | SRCREV_FORMAT = "qtwebengine" | 89 | SRCREV_FORMAT = "qtwebengine" |
diff --git a/recipes-qt/qt5/qtwebkit-examples/0001-qtwebkit-examples-enable-building-examples-by-defaul.patch b/recipes-qt/qt5/qtwebkit-examples/0001-qtwebkit-examples-enable-building-examples-by-defaul.patch index caf8a38f..eb90a064 100644 --- a/recipes-qt/qt5/qtwebkit-examples/0001-qtwebkit-examples-enable-building-examples-by-defaul.patch +++ b/recipes-qt/qt5/qtwebkit-examples/0001-qtwebkit-examples-enable-building-examples-by-defaul.patch | |||
@@ -25,5 +25,5 @@ index 3fcecf1..2da8a36 100644 | |||
25 | -SUBDIRS += doc | 25 | -SUBDIRS += doc |
26 | +SUBDIRS += doc examples | 26 | +SUBDIRS += doc examples |
27 | -- | 27 | -- |
28 | 2.5.3 | 28 | 2.6.1 |
29 | 29 | ||
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 17f9ee43..66dfd133 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 | |||
@@ -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.5.3 | 29 | 2.6.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 39cfc622..3d4ba189 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 | |||
@@ -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.5.3 | 78 | 2.6.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 819cc272..0351e22f 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 | |||
@@ -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.5.3 | 37 | 2.6.1 |
38 | 38 | ||
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 11ce7f40..4d0a51fa 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 = "12e424f241b29ef26ad2a3a70740d8b320e9e85a" | 14 | SRCREV = "08582917b43af8670658c210b2cb2a8b06e04252" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 2581af07..bea55c41 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 = "670b2073c0b1c40f5b67fc36c18ed15fe2cdfee2" | 16 | SRCREV = "3338de7bbe76bac44652c525003bc66b14ef16d4" |
17 | 17 | ||
18 | BBCLASSEXTEND =+ "native nativesdk" | 18 | BBCLASSEXTEND =+ "native nativesdk" |