diff options
60 files changed, 98 insertions, 98 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 65069280..ce5e97fc 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -280,4 +280,4 @@ do_generate_qt_environment_file() { | |||
280 | 280 | ||
281 | addtask generate_qt_environment_file after do_install before do_package | 281 | addtask generate_qt_environment_file after do_install before do_package |
282 | 282 | ||
283 | SRCREV = "f58e882b7594c59b6050d3c87562fcf836d10f60" | 283 | SRCREV = "2cb17c1fb903434274e58692c9f0df619affdab0" |
diff --git a/recipes-qt/qt5/nativesdk-qttools_git.bb b/recipes-qt/qt5/nativesdk-qttools_git.bb index 7380a4e1..73e5d222 100644 --- a/recipes-qt/qt5/nativesdk-qttools_git.bb +++ b/recipes-qt/qt5/nativesdk-qttools_git.bb | |||
@@ -42,4 +42,4 @@ do_install() { | |||
42 | rm -rf ${D}${libdir} | 42 | rm -rf ${D}${libdir} |
43 | } | 43 | } |
44 | 44 | ||
45 | SRCREV = "7f5b11a4a6357d2969e5b24bfb25c47aeb3d99f5" | 45 | SRCREV = "a6ed9b418d1b4464f088b378e5bdb96ec420db6c" |
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 2e77d459..b0571bf0 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc | |||
@@ -10,4 +10,4 @@ SRC_URI = " \ | |||
10 | 10 | ||
11 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
12 | 12 | ||
13 | PV = "5.4.1+git${SRCPV}" | 13 | PV = "5.4.2+git${SRCPV}" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 8163bd23..f84f38ee 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -121,4 +121,4 @@ do_install() { | |||
121 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt | 121 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt |
122 | } | 122 | } |
123 | 123 | ||
124 | SRCREV = "f58e882b7594c59b6050d3c87562fcf836d10f60" | 124 | SRCREV = "2cb17c1fb903434274e58692c9f0df619affdab0" |
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 f34aed42..0f6bcbe7 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 08f6be97c3f088fd8a2d752441c638093eedd990 Mon Sep 17 00:00:00 2001 | 1 | From ec414ca0df1ec459b5abd753cf0d730572715e17 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 | 3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 |
4 | Subject: [PATCH 01/12] Add linux-oe-g++ platform | 4 | Subject: [PATCH 01/12] Add linux-oe-g++ platform |
@@ -347,5 +347,5 @@ index 0000000..dd12003 | |||
347 | + | 347 | + |
348 | +#endif // QPLATFORMDEFS_H | 348 | +#endif // QPLATFORMDEFS_H |
349 | -- | 349 | -- |
350 | 2.3.5 | 350 | 2.4.2 |
351 | 351 | ||
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 ec2bcb49..69e3fdb9 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 31fa051d53e26301ef6abf72bd3f992d7c16cad2 Mon Sep 17 00:00:00 2001 | 1 | From f681cc3a7cb36e2bcc5e26e767236e86a5d49841 Mon Sep 17 00:00:00 2001 |
2 | From: Holger Freyther <zecke@selfish.org> | 2 | From: Holger Freyther <zecke@selfish.org> |
3 | Date: Wed, 26 Sep 2012 17:22:30 +0200 | 3 | Date: Wed, 26 Sep 2012 17:22:30 +0200 |
4 | Subject: [PATCH 02/12] qlibraryinfo: allow to set qt.conf from the outside | 4 | Subject: [PATCH 02/12] qlibraryinfo: allow to set qt.conf from the outside |
@@ -35,5 +35,5 @@ index d66007b..91ca643 100644 | |||
35 | if(!QFile::exists(qtconfig)) | 35 | if(!QFile::exists(qtconfig)) |
36 | qtconfig = qt_libraryInfoFile(); | 36 | qtconfig = qt_libraryInfoFile(); |
37 | -- | 37 | -- |
38 | 2.3.5 | 38 | 2.4.2 |
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 779ea918..af224060 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 cf4e996876e0b467b7aae124c7cb285f677bf6b0 Mon Sep 17 00:00:00 2001 | 1 | From 47b88e13ed8f4bb3bd34ac24dcf4b908dcba6753 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 | 3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 |
4 | Subject: [PATCH 03/12] Add -external-hostbindir option | 4 | Subject: [PATCH 03/12] Add -external-hostbindir option |
@@ -163,7 +163,7 @@ index 6d0de44..ddf7478 100644 | |||
163 | 163 | ||
164 | # If we are doing a prefix build, create a "module" pri which enables | 164 | # If we are doing a prefix build, create a "module" pri which enables |
165 | diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in | 165 | diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in |
166 | index 7213a84..a977417 100644 | 166 | index 65fd1f9..457518b 100644 |
167 | --- a/src/corelib/Qt5CoreConfigExtras.cmake.in | 167 | --- a/src/corelib/Qt5CoreConfigExtras.cmake.in |
168 | +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in | 168 | +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in |
169 | @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) | 169 | @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) |
@@ -229,5 +229,5 @@ index 99d87e2..5621dc0 100644 | |||
229 | _qt5_Widgets_check_file_exists(${imported_location}) | 229 | _qt5_Widgets_check_file_exists(${imported_location}) |
230 | 230 | ||
231 | -- | 231 | -- |
232 | 2.3.5 | 232 | 2.4.2 |
233 | 233 | ||
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 c586775f..0cd6296b 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 bf9f8df42f5a7ac4a0cb4bdad8c849228aa79b35 Mon Sep 17 00:00:00 2001 | 1 | From 3f0f3ded0b4a85a04a0c492e33d8517e598ae08e 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/12] qt_module: Fix pkgconfig and libtool replacements | 4 | Subject: [PATCH 04/12] qt_module: Fix pkgconfig and libtool replacements |
@@ -110,5 +110,5 @@ index 2437efe..2e1f014 100644 | |||
110 | } | 110 | } |
111 | 111 | ||
112 | -- | 112 | -- |
113 | 2.3.5 | 113 | 2.4.2 |
114 | 114 | ||
diff --git a/recipes-qt/qt5/qtbase/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch b/recipes-qt/qt5/qtbase/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch index 9723beac..c373a7f2 100644 --- a/recipes-qt/qt5/qtbase/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch +++ b/recipes-qt/qt5/qtbase/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f8a4e063b45b5b941738dd90ea7c74063bc1e49f Mon Sep 17 00:00:00 2001 | 1 | From 9c07ef1c5a56deda170a3946a7c285d534d59fda 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, 21 Apr 2014 19:22:04 +0200 | 3 | Date: Mon, 21 Apr 2014 19:22:04 +0200 |
4 | Subject: [PATCH 05/12] Revert "eglfs: Print the chosen config in debug mode" | 4 | Subject: [PATCH 05/12] Revert "eglfs: Print the chosen config in debug mode" |
@@ -93,5 +93,5 @@ index 7cc3300..ccbd974a 100644 | |||
93 | } | 93 | } |
94 | 94 | ||
95 | -- | 95 | -- |
96 | 2.3.5 | 96 | 2.4.2 |
97 | 97 | ||
diff --git a/recipes-qt/qt5/qtbase/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch index 04fb3709..6a056df8 100644 --- a/recipes-qt/qt5/qtbase/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch +++ b/recipes-qt/qt5/qtbase/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6061c8457ea1f76745bd9918e61bda01ef96ce56 Mon Sep 17 00:00:00 2001 | 1 | From 4699b5b9af628e120db9ab26e25bc7069d35562a 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 06/12] qeglplatformintegration: Undefine CursorShape from X.h | 4 | Subject: [PATCH 06/12] qeglplatformintegration: Undefine CursorShape from X.h |
@@ -26,5 +26,5 @@ index 2b5d5f5..a0aab03 100644 | |||
26 | 26 | ||
27 | class QEGLPlatformScreen; | 27 | class QEGLPlatformScreen; |
28 | -- | 28 | -- |
29 | 2.3.5 | 29 | 2.4.2 |
30 | 30 | ||
diff --git a/recipes-qt/qt5/qtbase/0007-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0007-configure-bump-path-length-from-256-to-512-character.patch index be75d72c..4cdad004 100644 --- a/recipes-qt/qt5/qtbase/0007-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase/0007-configure-bump-path-length-from-256-to-512-character.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a6b01490248be28c1db3abd5f710c5d7d9afee55 Mon Sep 17 00:00:00 2001 | 1 | From 6ddd04ae7fc935b91384d99bf1c16532b91ac76b Mon Sep 17 00:00:00 2001 |
2 | From: Denys Dmytriyenko <denys@ti.com> | 2 | From: Denys Dmytriyenko <denys@ti.com> |
3 | Date: Mon, 11 Nov 2013 20:27:30 -0500 | 3 | Date: Mon, 11 Nov 2013 20:27:30 -0500 |
4 | Subject: [PATCH 07/12] configure: bump path length from 256 to 512 characters | 4 | Subject: [PATCH 07/12] configure: bump path length from 256 to 512 characters |
@@ -25,5 +25,5 @@ index ad5f4cd..c19ff6a 100755 | |||
25 | "qt_prfxpath=$QT_SYSROOT_PREFIX", | 25 | "qt_prfxpath=$QT_SYSROOT_PREFIX", |
26 | "qt_docspath=$QT_SYSROOT_DOCS", | 26 | "qt_docspath=$QT_SYSROOT_DOCS", |
27 | -- | 27 | -- |
28 | 2.3.5 | 28 | 2.4.2 |
29 | 29 | ||
diff --git a/recipes-qt/qt5/qtbase/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch b/recipes-qt/qt5/qtbase/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch index e4d4327c..7f4171d4 100644 --- a/recipes-qt/qt5/qtbase/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch +++ b/recipes-qt/qt5/qtbase/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d1712999887b9809cce57b1e6c008c454330cd2e Mon Sep 17 00:00:00 2001 | 1 | From 5c0a8f073e7412d01e7f2ef05bbe06954fd39eaa 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, 5 Feb 2014 18:35:08 +0100 | 3 | Date: Wed, 5 Feb 2014 18:35:08 +0100 |
4 | Subject: [PATCH 08/12] eglfs: fix egl error for platforms only supporting one | 4 | Subject: [PATCH 08/12] eglfs: fix egl error for platforms only supporting one |
@@ -68,5 +68,5 @@ index 39a3ef9..2c05979 100644 | |||
68 | 68 | ||
69 | if (isRaster()) { | 69 | if (isRaster()) { |
70 | -- | 70 | -- |
71 | 2.3.5 | 71 | 2.4.2 |
72 | 72 | ||
diff --git a/recipes-qt/qt5/qtbase/0009-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0009-QOpenGLPaintDevice-sub-area-support.patch index bebb3d95..05110eac 100644 --- a/recipes-qt/qt5/qtbase/0009-QOpenGLPaintDevice-sub-area-support.patch +++ b/recipes-qt/qt5/qtbase/0009-QOpenGLPaintDevice-sub-area-support.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a34538ff13c520fa85df689255469a316f037d0d Mon Sep 17 00:00:00 2001 | 1 | From 3483a580cb9e5509cb59cd18b13a24c1a47a9224 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 09/12] QOpenGLPaintDevice sub-area support | 4 | Subject: [PATCH 09/12] QOpenGLPaintDevice sub-area support |
@@ -153,5 +153,5 @@ index cd268cd..997bc35 100644 | |||
153 | } else { | 153 | } else { |
154 | if (m_vao.isCreated()) { | 154 | if (m_vao.isCreated()) { |
155 | -- | 155 | -- |
156 | 2.3.5 | 156 | 2.4.2 |
157 | 157 | ||
diff --git a/recipes-qt/qt5/qtbase/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch b/recipes-qt/qt5/qtbase/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch index f2eed114..184b2d8e 100644 --- a/recipes-qt/qt5/qtbase/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch +++ b/recipes-qt/qt5/qtbase/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 16a55457ce31d467cb331ab8e94b672757ef42b9 Mon Sep 17 00:00:00 2001 | 1 | From d5308f1a78e24402b16201846378917473d02873 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: Thu, 18 Dec 2014 13:41:09 +0100 | 3 | Date: Thu, 18 Dec 2014 13:41:09 +0100 |
4 | Subject: [PATCH 10/12] Make Qt5GuiConfigExtras.cmake find gl(es) include dir | 4 | Subject: [PATCH 10/12] Make Qt5GuiConfigExtras.cmake find gl(es) include dir |
@@ -38,5 +38,5 @@ index 9a846d4..07869ef 100644 | |||
38 | if (NOT _qt5gui_OPENGL_INCLUDE_DIR) | 38 | if (NOT _qt5gui_OPENGL_INCLUDE_DIR) |
39 | message(FATAL_ERROR \"Failed to find \\\"$$CMAKE_GL_HEADER_NAME\\\" in \\\"${_GL_INCDIRS}\\\".\") | 39 | message(FATAL_ERROR \"Failed to find \\\"$$CMAKE_GL_HEADER_NAME\\\" in \\\"${_GL_INCDIRS}\\\".\") |
40 | -- | 40 | -- |
41 | 2.3.5 | 41 | 2.4.2 |
42 | 42 | ||
diff --git a/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch index da17878e..b9d45178 100644 --- a/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5a6ad20dd4fde6a0581be895d763aae43f1fc2b6 Mon Sep 17 00:00:00 2001 | 1 | From 14c4785ac0f01fa1d89d63601b9132add4ab1c2f 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 11/13] Always build uic | 4 | Subject: [PATCH 11/13] Always build uic |
@@ -27,5 +27,5 @@ index 83f7587..9dbcf70 100644 | |||
27 | nacl: SUBDIRS -= src_network src_testlib | 27 | nacl: SUBDIRS -= src_network src_testlib |
28 | 28 | ||
29 | -- | 29 | -- |
30 | 2.3.5 | 30 | 2.4.2 |
31 | 31 | ||
diff --git a/recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch index 96198b1f..f5f2a23a 100644 --- a/recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch +++ b/recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6c0cc990522454e0c9e52ba969c3a8c5937157b8 Mon Sep 17 00:00:00 2001 | 1 | From 51e7ea78d15a590f42154f19486f10d2019401e3 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 11/12] qmake: don't build it in configure, but allow to build | 4 | Subject: [PATCH 11/12] 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.3.5 | 67 | 2.4.2 |
68 | 68 | ||
diff --git a/recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch b/recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch index 4c044c0d..383b7880 100644 --- a/recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch +++ b/recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6425d71d52c5587f323fe28af62530d5c82b02fd Mon Sep 17 00:00:00 2001 | 1 | From d56aef32b8c9d1be04c047a16a55e84af71e25dd 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 12/13] Add -external-hostbindir option for native(sdk) | 4 | Subject: [PATCH 12/13] Add -external-hostbindir option for native(sdk) |
@@ -104,5 +104,5 @@ index 6e9d4aa..0ca4daf 100644 | |||
104 | << " \"qt_hostspec=" << hostSpec << "\"," << endl | 104 | << " \"qt_hostspec=" << hostSpec << "\"," << endl |
105 | << "#endif" << endl | 105 | << "#endif" << endl |
106 | -- | 106 | -- |
107 | 2.3.5 | 107 | 2.4.2 |
108 | 108 | ||
diff --git a/recipes-qt/qt5/qtbase/0012-Set-paths-for-target-properly.patch b/recipes-qt/qt5/qtbase/0012-Set-paths-for-target-properly.patch index 0a7eb15e..cb1005c9 100644 --- a/recipes-qt/qt5/qtbase/0012-Set-paths-for-target-properly.patch +++ b/recipes-qt/qt5/qtbase/0012-Set-paths-for-target-properly.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 84c23fc01b28087de35604ef971227b57fb77876 Mon Sep 17 00:00:00 2001 | 1 | From 4dd60bf7b9db89fad8154168e71581ed648cf356 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: Thu, 22 Jan 2015 16:09:35 +0100 | 3 | Date: Thu, 22 Jan 2015 16:09:35 +0100 |
4 | Subject: [PATCH 12/12] Set paths for target properly | 4 | Subject: [PATCH 12/12] Set paths for target properly |
@@ -68,5 +68,5 @@ index 7a34b11..7bb4476 100755 | |||
68 | }; | 68 | }; |
69 | static const char qt_configure_settings_path_str[256 + 12] = "qt_stngpath=$QT_INSTALL_SETTINGS"; | 69 | static const char qt_configure_settings_path_str[256 + 12] = "qt_stngpath=$QT_INSTALL_SETTINGS"; |
70 | -- | 70 | -- |
71 | 2.3.5 | 71 | 2.4.2 |
72 | 72 | ||
diff --git a/recipes-qt/qt5/qtbase/0013-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase/0013-configure-preserve-built-qmake-and-swap-with-native-.patch index 0b271a35..ea90305c 100644 --- a/recipes-qt/qt5/qtbase/0013-configure-preserve-built-qmake-and-swap-with-native-.patch +++ b/recipes-qt/qt5/qtbase/0013-configure-preserve-built-qmake-and-swap-with-native-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6b980c8132800001b2f0c5c0e76f7cc7c60d14ee Mon Sep 17 00:00:00 2001 | 1 | From d34774dc7447ff0d566b3281407c0998173a85e0 Mon Sep 17 00:00:00 2001 |
2 | From: Denys Dmytriyenko <denys@ti.com> | 2 | From: Denys Dmytriyenko <denys@ti.com> |
3 | Date: Mon, 11 Nov 2013 20:22:34 -0500 | 3 | Date: Mon, 11 Nov 2013 20:22:34 -0500 |
4 | Subject: [PATCH 13/13] configure: preserve built qmake and swap with native | 4 | Subject: [PATCH 13/13] configure: preserve built qmake and swap with native |
@@ -26,5 +26,5 @@ index c19ff6a..2d920e3 100755 | |||
26 | echo "Running configuration tests..." | 26 | echo "Running configuration tests..." |
27 | 27 | ||
28 | -- | 28 | -- |
29 | 2.3.5 | 29 | 2.4.2 |
30 | 30 | ||
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 44295a03..ec6ea170 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -269,4 +269,4 @@ sysroot_stage_dirs_append() { | |||
269 | rm -rf $to${OE_QMAKE_PATH_LIBS}/fonts | 269 | rm -rf $to${OE_QMAKE_PATH_LIBS}/fonts |
270 | } | 270 | } |
271 | 271 | ||
272 | SRCREV = "f58e882b7594c59b6050d3c87562fcf836d10f60" | 272 | SRCREV = "2cb17c1fb903434274e58692c9f0df619affdab0" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 8ed64fb4..c758d040 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb | |||
@@ -21,4 +21,4 @@ do_configure_prepend() { | |||
21 | sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro | 21 | sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro |
22 | } | 22 | } |
23 | 23 | ||
24 | SRCREV = "b4bf23453e65995bdd8827b6e146edd5cafeddc3" | 24 | SRCREV = "aa00047183008edd739df472cf0490e9fffbe655" |
diff --git a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch index 16031006..793aa846 100644 --- a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch +++ b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 1abe7b1d4de10ba3739db8a685661e99fb274a00 Mon Sep 17 00:00:00 2001 | 1 | From 0aa4fc1dd4369c50c310e20bbe86cef5a1efb21f 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 1/2] qmltestexample: fix link |
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 |
@@ -84,5 +84,5 @@ index 1bb913e..56f2dd5 100644 | |||
84 | 84 | ||
85 | load(qt_tool) | 85 | load(qt_tool) |
86 | -- | 86 | -- |
87 | 2.3.5 | 87 | 2.4.2 |
88 | 88 | ||
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 5f628c28..93330165 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -27,4 +27,4 @@ do_configure_prepend() { | |||
27 | 27 | ||
28 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" | 28 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" |
29 | 29 | ||
30 | SRCREV = "2b3c2339616680537145a9cc2e7567575add1abb" | 30 | SRCREV = "2fdb6eba0a58b629db32f9eefec2f26df08d3d2e" |
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb index 2f13a2bf..a0aff8fe 100644 --- a/recipes-qt/qt5/qtenginio_git.bb +++ b/recipes-qt/qt5/qtenginio_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns" | 11 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns" |
12 | 12 | ||
13 | QT_MODULE_BRANCH = "1.1" | 13 | QT_MODULE_BRANCH = "1.1" |
14 | SRCREV = "30ee95cd19f9a435ce337b4f651175ed2e8ba2e5" | 14 | SRCREV = "134dc76b7ff5152364f830b577e223b350560839" |
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index d7f0e87c..9da5c944 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb | |||
@@ -16,4 +16,4 @@ DEPENDS += "qtdeclarative" | |||
16 | 16 | ||
17 | RDEPENDS_${PN}-dev = "" | 17 | RDEPENDS_${PN}-dev = "" |
18 | 18 | ||
19 | SRCREV = "6eef4b5fa1836c9cb7ebc5dcb269a8d3114eb6c3" | 19 | SRCREV = "c7ed28bece292e2745e02663ef519c76d16ec762" |
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 24395209..6085f019 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 f7cc9df393826c1697e45e87c929ad17ab225256 Mon Sep 17 00:00:00 2001 | 1 | From 85f45e1d9fc833c914cebb102840337193590356 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.3.5 | 30 | 2.4.2 |
31 | 31 | ||
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index bd2f8939..31d4fb00 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb | |||
@@ -27,4 +27,4 @@ EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'jasper', 'CONFIG+=OE_ | |||
27 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" | 27 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" |
28 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" | 28 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" |
29 | 29 | ||
30 | SRCREV = "98f83553e9fe2aa5fc54b32513af6ba3aa60a07b" | 30 | SRCREV = "ec301681e4e2f5b293435ec7cf295350ee5acb18" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 7ff4c3d7..12416bbd 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 = "b13fec3c7ed08b7d0e79c08312a3c3285eb20ef3" | 32 | SRCREV = "3678bc8b3e128bf244ae263a44576a40b72e5876" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 66bba543..bab9bee3 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
@@ -34,4 +34,4 @@ SRC_URI += "\ | |||
34 | file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ | 34 | file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ |
35 | " | 35 | " |
36 | 36 | ||
37 | SRCREV = "6fe3061c1f6b7438d20c7bfb92c7652cedc5b049" | 37 | SRCREV = "cc0569a038f6116df559508518b6dacb15be8520" |
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index a90d2e3e..928963b1 100644 --- a/recipes-qt/qt5/qtquick1_git.bb +++ b/recipes-qt/qt5/qtquick1_git.bb | |||
@@ -16,4 +16,4 @@ LIC_FILES_CHKSUM = " \ | |||
16 | DEPENDS += "qtscript qtsvg qtxmlpatterns qtwebkit" | 16 | DEPENDS += "qtscript qtsvg qtxmlpatterns qtwebkit" |
17 | # qttools | 17 | # qttools |
18 | 18 | ||
19 | SRCREV = "c78f720de6de9340492f8395109252919283a955" | 19 | SRCREV = "ba0708a75784a92aee9523b7ee925ece18c69812" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 5afb31a3..af111198 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
@@ -14,4 +14,4 @@ DEPENDS += "qtdeclarative" | |||
14 | 14 | ||
15 | RDEPENDS_${PN}-dev = "" | 15 | RDEPENDS_${PN}-dev = "" |
16 | 16 | ||
17 | SRCREV = "de9145dcd904068256e28e130fdfda2e8014efe8" | 17 | SRCREV = "093312f5f306db8fcb1028f62bd3061aa63ef732" |
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 489be2e6..5751e200 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb | |||
@@ -25,4 +25,4 @@ ARM_INSTRUCTION_SET = "arm" | |||
25 | 25 | ||
26 | DEPENDS += "qtbase" | 26 | DEPENDS += "qtbase" |
27 | 27 | ||
28 | SRCREV = "822df36f252c5a16cdf82f5666f36e7011df46c4" | 28 | SRCREV = "eb08742e8f874b8dab209c1cfe840c534c68ca3b" |
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 31131d87..ec333552 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb | |||
@@ -14,4 +14,4 @@ LIC_FILES_CHKSUM = " \ | |||
14 | 14 | ||
15 | DEPENDS += "qtbase qtdeclarative" | 15 | DEPENDS += "qtbase qtdeclarative" |
16 | 16 | ||
17 | SRCREV = "26c99a8f7832a5549d315ad434e038ae3964e224" | 17 | SRCREV = "40e5aff5318701b31e712cc352483b227f61a6a4" |
diff --git a/recipes-qt/qt5/qtserialport/0001-Unix-Clear-serial_struct-instances.patch b/recipes-qt/qt5/qtserialport/0001-Unix-Clear-serial_struct-instances.patch index d0f4eb9b..e6b61943 100644 --- a/recipes-qt/qt5/qtserialport/0001-Unix-Clear-serial_struct-instances.patch +++ b/recipes-qt/qt5/qtserialport/0001-Unix-Clear-serial_struct-instances.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From cdaa89e30e12d247a8086763d341e5f020151b67 Mon Sep 17 00:00:00 2001 | 1 | From 6444a156db8b7d0ec367b8edc87c82acd0898698 Mon Sep 17 00:00:00 2001 |
2 | From: Jonathan Liu <net147@gmail.com> | 2 | From: Jonathan Liu <net147@gmail.com> |
3 | Date: Mon, 9 Mar 2015 22:35:56 +1100 | 3 | Date: Mon, 9 Mar 2015 22:35:56 +1100 |
4 | Subject: [PATCH] Unix: Clear serial_struct instances | 4 | Subject: [PATCH] Unix: Clear serial_struct instances |
@@ -38,5 +38,5 @@ index cda73b2..62c454c 100644 | |||
38 | return decodeSystemError(); | 38 | return decodeSystemError(); |
39 | 39 | ||
40 | -- | 40 | -- |
41 | 2.3.5 | 41 | 2.4.2 |
42 | 42 | ||
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index e95d564e..c59eef6d 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb | |||
@@ -18,4 +18,4 @@ SRC_URI += " \ | |||
18 | 18 | ||
19 | DEPENDS += "qtbase" | 19 | DEPENDS += "qtbase" |
20 | 20 | ||
21 | SRCREV = "b84fe7eb3d6d977a347bfbb82da724409b2eda69" | 21 | SRCREV = "e257bdc9aae5583b187bafb5e69e4a6143e3bf4e" |
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 89f0815b..1dce8c6d 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
14 | 14 | ||
15 | SRCREV = "1fb79c9f2b50294b989cf2bdd8bfaaf0a458e2a8" | 15 | SRCREV = "ccae23961e65b81b3c16a45d4e186e1e5657a2f6" |
diff --git a/recipes-qt/qt5/qttools-native_git.bb b/recipes-qt/qt5/qttools-native_git.bb index 219fc2e9..13e1b793 100644 --- a/recipes-qt/qt5/qttools-native_git.bb +++ b/recipes-qt/qt5/qttools-native_git.bb | |||
@@ -23,4 +23,4 @@ do_install() { | |||
23 | oe_runmake install INSTALL_ROOT=${D} | 23 | oe_runmake install INSTALL_ROOT=${D} |
24 | } | 24 | } |
25 | 25 | ||
26 | SRCREV = "7f5b11a4a6357d2969e5b24bfb25c47aeb3d99f5" | 26 | SRCREV = "a6ed9b418d1b4464f088b378e5bdb96ec420db6c" |
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 cb12fc1e..285ae85c 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 6d3adbdeee29af76b41a319016dfd396659ac0b0 Mon Sep 17 00:00:00 2001 | 1 | From b19c4a2f723525b995ef5b47db0e725a2bb9ab20 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/3] Allow to build only lrelease + lupdate + lconvert |
@@ -151,5 +151,5 @@ index df240e3..27ee687 100644 | |||
151 | installed_cmake.depends = cmake | 151 | installed_cmake.depends = cmake |
152 | 152 | ||
153 | -- | 153 | -- |
154 | 2.3.5 | 154 | 2.4.2 |
155 | 155 | ||
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 72fc3a47..0f016c20 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 5bf38c5d5555ddcaea4a601fdfa304b3f0e5b943 Mon Sep 17 00:00:00 2001 | 1 | From 0805ac8c2c9f81643df211970666c15eac80cfb8 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/3] 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.3.5 | 31 | 2.4.2 |
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 7ceb84a3..bbd338aa 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 c9f7a83107d01b30cb150f7783441fe73003cfa1 Mon Sep 17 00:00:00 2001 | 1 | From 594d23ecc0f62e6a0ebfcb7b9cb879435211420a 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/3] 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.3.5 | 50 | 2.4.2 |
51 | 51 | ||
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 4ba2b8ad..a4f63c79 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -24,4 +24,4 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" | |||
24 | 24 | ||
25 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" | 25 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" |
26 | 26 | ||
27 | SRCREV = "7f5b11a4a6357d2969e5b24bfb25c47aeb3d99f5" | 27 | SRCREV = "a6ed9b418d1b4464f088b378e5bdb96ec420db6c" |
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index b5fd345a..93414530 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb | |||
@@ -93,4 +93,4 @@ FILES_${PN}-qt = " \ | |||
93 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ | 93 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ |
94 | " | 94 | " |
95 | 95 | ||
96 | SRCREV = "1224b6890e0b0971e5eeea9f52d806f1890de0ed" | 96 | SRCREV = "f76e5c98b0c426ffed95443e45041c3c0deab0c6" |
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb index 3ae35b4b..d03fb487 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bb +++ b/recipes-qt/qt5/qtwayland-native_git.bb | |||
@@ -26,4 +26,4 @@ do_install() { | |||
26 | oe_runmake install INSTALL_ROOT=${D} | 26 | oe_runmake install INSTALL_ROOT=${D} |
27 | } | 27 | } |
28 | 28 | ||
29 | SRCREV = "d5e7965a87d81e2d7157c785403b0aba681de62a" | 29 | SRCREV = "182488129c3f6a67a7e781fdb7c0147777191991" |
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 a7be5e5e..c1bf3bd7 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 ecaf131c0307f198f8efbf06410976ded97aab80 Mon Sep 17 00:00:00 2001 | 1 | From be0881386edac8c39b5362d4efc4a05acb3e76c1 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.3.1 | 31 | 2.4.2 |
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 e1a41db3..7588b2f4 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,8 +1,8 @@ | |||
1 | From 90fc9f3f059c19e84ffd29718482a2f06ec3f0bf Mon Sep 17 00:00:00 2001 | 1 | From b7520d76235cea2e546e217052baf1c9324a261d 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 1/2] examples/wayland: include server-buffer only when |
5 | with opengles2 | 5 | building with opengles2 |
6 | 6 | ||
7 | * it's using glBindBuffer in | 7 | * it's using glBindBuffer in |
8 | server-buffer/client/serverbufferrenderer.cpp | 8 | server-buffer/client/serverbufferrenderer.cpp |
@@ -27,5 +27,5 @@ index d633fb9..643c7cd 100644 | |||
27 | + } | 27 | + } |
28 | } | 28 | } |
29 | -- | 29 | -- |
30 | 2.3.5 | 30 | 2.4.2 |
31 | 31 | ||
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 7f1388d0..065bc3c6 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -45,4 +45,4 @@ do_install_append() { | |||
45 | install ${B}/include/QtCompositor/${QT_VERSION}/QtCompositor/private/*protocol*.h ${D}${OE_QMAKE_PATH_QT_HEADERS}/QtCompositor/${QT_VERSION}/QtCompositor/private | 45 | install ${B}/include/QtCompositor/${QT_VERSION}/QtCompositor/private/*protocol*.h ${D}${OE_QMAKE_PATH_QT_HEADERS}/QtCompositor/${QT_VERSION}/QtCompositor/private |
46 | } | 46 | } |
47 | 47 | ||
48 | SRCREV = "d5e7965a87d81e2d7157c785403b0aba681de62a" | 48 | SRCREV = "182488129c3f6a67a7e781fdb7c0147777191991" |
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index a8008837..84336522 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb | |||
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ | |||
13 | 13 | ||
14 | DEPENDS += "qtdeclarative qtwebsockets" | 14 | DEPENDS += "qtdeclarative qtwebsockets" |
15 | 15 | ||
16 | SRCREV = "358e5acba3154a8ab4b53b22797c2c1eae4707dc" | 16 | SRCREV = "7b5da1d3dd561bc871e7ab4bf8644d33f60d5793" |
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 b4a8852e..64670f0e 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 21d008c31a262ddcaeb3a8457de49061361ed882 Mon Sep 17 00:00:00 2001 | 1 | From 59e305219cdaeac6d143cb0466a2f518b4050688 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] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc | 4 | Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc |
@@ -6,7 +6,7 @@ Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc | |||
6 | 6 | ||
7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
8 | --- | 8 | --- |
9 | chromium/base/base.gypi | 2 +- | 9 | src/3rdparty/chromium/base/base.gypi | 2 +- |
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 11 | ||
12 | diff --git a/src/3rdparty/chromium/base/base.gypi b/src/3rdparty/chromium/base/base.gypi | 12 | diff --git a/src/3rdparty/chromium/base/base.gypi b/src/3rdparty/chromium/base/base.gypi |
@@ -23,5 +23,5 @@ index a5a990a..af30cfa 100644 | |||
23 | ['include', 'atomicops_internals_x86_gcc.cc'], | 23 | ['include', 'atomicops_internals_x86_gcc.cc'], |
24 | ], | 24 | ], |
25 | -- | 25 | -- |
26 | 2.3.1 | 26 | 2.4.2 |
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 134133b3..447552e6 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,7 +1,7 @@ | |||
1 | From b6ca6c086aa21985e17d11592a830f18159f1c3b Mon Sep 17 00:00:00 2001 | 1 | From 6e468c814087bac6ff88a1d7d02549e6cf8a152c 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/3] 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 |
5 | anywhere in path, but at the end | 5 | anywhere in path, but at the end |
6 | 6 | ||
7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
@@ -25,5 +25,5 @@ index 4c2547d..64c08ad 100644 | |||
25 | } | 25 | } |
26 | 26 | ||
27 | -- | 27 | -- |
28 | 2.3.5 | 28 | 2.4.2 |
29 | 29 | ||
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 8d1c5fd1..e7f4f7f0 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,7 +1,7 @@ | |||
1 | From cfe706846298d41defbf0386f85b17e70108b7af Mon Sep 17 00:00:00 2001 | 1 | From 7a4a82af04fb228526dfd72a1d42b53b402952d1 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/3] 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 |
5 | generate it's moc'ed abbreviation | 5 | generate it's moc'ed abbreviation |
6 | 6 | ||
7 | Signed-off-by: Simon Busch <morphis@gravedo.de> | 7 | Signed-off-by: Simon Busch <morphis@gravedo.de> |
@@ -25,5 +25,5 @@ index 64c08ad..b46478b 100644 | |||
25 | out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) | 25 | out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) |
26 | out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) | 26 | out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) |
27 | -- | 27 | -- |
28 | 2.3.5 | 28 | 2.4.2 |
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 4e5e4530..a932aefc 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,7 +1,7 @@ | |||
1 | From 9595a2dd48dbf45ba1661cf1fd4d38fac8192a4f Mon Sep 17 00:00:00 2001 | 1 | From 87f1a22e6a1a6b40712eb131ba128d4f1e2da9b8 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/3] functions.prf: allow build for linux-oe-g++ platform | 4 | Subject: [PATCH 3/4] functions.prf: allow build for linux-oe-g++ platform |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [OE specific] | 6 | Upstream-Status: Inappropriate [OE specific] |
7 | 7 | ||
@@ -25,5 +25,5 @@ index b46478b..6205bf4 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.3.5 | 28 | 2.4.2 |
29 | 29 | ||
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index c14a556c..4933c132 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -81,7 +81,7 @@ SRC_URI += " \ | |||
81 | file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \ | 81 | file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \ |
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 | " | 83 | " |
84 | SRCREV_qtwebengine = "b0c48cb3a0c9630899a357fb8a01ba13ccad5395" | 84 | SRCREV_qtwebengine = "55a7fc7651136510032166ff24eb5e7e49635145" |
85 | SRCREV_chromium = "140893bef70011645c686f5fabe45018dd2e392a" | 85 | SRCREV_chromium = "140893bef70011645c686f5fabe45018dd2e392a" |
86 | SRCREV = "${SRCREV_qtwebengine}" | 86 | SRCREV = "${SRCREV_qtwebengine}" |
87 | 87 | ||
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 dd73fe67..3186e13d 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 52f75c43702ab04f3426025eea80155aa27b3422 Mon Sep 17 00:00:00 2001 | 1 | From f1367fc72dad78fb5625c6cd4b08914b34583d0f Mon Sep 17 00:00:00 2001 |
2 | From: Denys Dmytriyenko <denys@ti.com> | 2 | From: Denys Dmytriyenko <denys@ti.com> |
3 | Date: Tue, 8 Oct 2013 00:18:10 -0400 | 3 | Date: Tue, 8 Oct 2013 00:18:10 -0400 |
4 | Subject: [PATCH] qtwebkit-examples: enable building examples by default | 4 | Subject: [PATCH] qtwebkit-examples: enable building examples by default |
@@ -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.3.5 | 28 | 2.4.2 |
29 | 29 | ||
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb index 7ae9fc78..0a5017fb 100644 --- a/recipes-qt/qt5/qtwebkit-examples_git.bb +++ b/recipes-qt/qt5/qtwebkit-examples_git.bb | |||
@@ -20,4 +20,4 @@ DEPENDS += "qtwebkit" | |||
20 | RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" | 20 | RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" |
21 | RDEPENDS_${PN}-examples += "${@base_contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" | 21 | RDEPENDS_${PN}-examples += "${@base_contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" |
22 | 22 | ||
23 | SRCREV = "734663277730bc20dacf0a6b07427002a53cc107" | 23 | SRCREV = "9f20ed0b48f4e5adcc9558b2cc4171eb17f243dd" |
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 886a954d..09876dba 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 b3d43d2b8c1e11122ac36e3e0b102c2ffef83010 Mon Sep 17 00:00:00 2001 | 1 | From 5a9e19d69e4443ab6272aeca6d707e39fe1943ef 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/2] qtwebkit: fix QA issue (bad RPATH) | 4 | Subject: [PATCH 1/2] 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.3.5 | 29 | 2.4.2 |
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 de21a7c3..e384282b 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 491cbd653eb7b992202f06bd2e62cf29f5f495af Mon Sep 17 00:00:00 2001 | 1 | From 22cad8ae3c1b8601ebf785ef5dfda4516056ee53 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/2] Remove TEXTREL tag in x86 | 4 | Subject: [PATCH 2/2] 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.3.5 | 78 | 2.4.2 |
79 | 79 | ||
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 085f35d4..77568af7 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb | |||
@@ -63,4 +63,4 @@ PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE | |||
63 | RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" | 63 | RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" |
64 | export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" | 64 | export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" |
65 | 65 | ||
66 | SRCREV = "738ad7e37c66f2afdbc7a77aff3ab7fa510361a2" | 66 | SRCREV = "ea590d74eae21dd70b189e0b8ba4bfb6a9bddb94" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 9cd69b15..85e91567 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 = "5b469aa3c4d6b9c68feb9cf92d03614077518894" | 14 | SRCREV = "0002e934391ace7b77665a227068c3e06d576772" |
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index d286570a..6f60f2b0 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
14 | 14 | ||
15 | SRCREV = "bcc86311359e138ecc3a8fc1ce6eee1cda2ec0f5" | 15 | SRCREV = "32b1ce9e1b1542f6779abcbcd78613b15149aaaa" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 8b58c5ad..1be68533 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
14 | 14 | ||
15 | SRCREV = "db784fb1c01ca2a0e7ada2c407cd1aab3aa98fee" | 15 | SRCREV = "c21924d67a8ef39282afdf3ae6fef798dfca7135" |