summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5')
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb7
-rw-r--r--recipes-qt/qt5/qt5-git.inc8
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb6
-rw-r--r--recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch22
-rw-r--r--recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch10
-rw-r--r--recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch28
-rw-r--r--recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch40
-rw-r--r--recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch10
-rw-r--r--recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch18
-rw-r--r--recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch6
-rw-r--r--recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch18
-rw-r--r--recipes-qt/qt5/qtbase/0009-Always-build-uic.patch10
-rw-r--r--recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch20
-rw-r--r--recipes-qt/qt5/qtbase_git.bb6
-rw-r--r--recipes-qt/qt5/qtcanvas3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch4
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb2
-rw-r--r--recipes-qt/qt5/qtenginio_git.bb2
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb2
-rw-r--r--recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch4
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb2
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb2
-rw-r--r--recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch8
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtquick1_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb2
-rw-r--r--recipes-qt/qt5/qtscript_git.bb2
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialport_git.bb2
-rw-r--r--recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch4
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb2
-rw-r--r--recipes-qt/qt5/qtsystems_git.bb2
-rw-r--r--recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch4
-rw-r--r--recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch4
-rw-r--r--recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch4
-rw-r--r--recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch4
-rw-r--r--recipes-qt/qt5/qttools_git.bb8
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch4
-rw-r--r--recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch4
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch8
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch10
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch (renamed from recipes-qt/qt5/qtwebengine/0001-chromium-jpeg_codec.cc_Change-false-to-FALSE-and-1-to-TRUE.patch)8
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch10
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch32
-rw-r--r--recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch (renamed from recipes-qt/qt5/qtwebengine/0003-WebEngine-qquickwebengineview_p_p.h-add-inc-QColor.patch)10
-rw-r--r--recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch (renamed from recipes-qt/qt5/qtwebengine/0002-media_capture_devices_dispatcher.h-Include-QCoreApplication-translate.patch)6
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb10
-rw-r--r--recipes-qt/qt5/qtwebkit-examples_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch4
-rw-r--r--recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch4
-rw-r--r--recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch4
-rw-r--r--recipes-qt/qt5/qtwebkit_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb2
-rw-r--r--recipes-qt/qt5/qtx11extras_git.bb2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
60 files changed, 207 insertions, 208 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index ccb09223..70b596dc 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -5,13 +5,14 @@ HOMEPAGE = "http://qt-project.org"
5 5
6LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 6LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
7LIC_FILES_CHKSUM = " \ 7LIC_FILES_CHKSUM = " \
8 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 8 file://LICENSE.LGPLv21;md5=d3bb688e8d381a9fa5ee9063114b366d \
9 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 9 file://LICENSE.LGPLv3;md5=3fd06ee442011942b532cc6dedb0b39c \
10 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 10 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \
11 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 11 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
12 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 12 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
13" 13"
14 14
15
15QT_MODULE = "qtbase" 16QT_MODULE = "qtbase"
16 17
17require nativesdk-qt5.inc 18require nativesdk-qt5.inc
@@ -255,4 +256,4 @@ fakeroot do_generate_qt_environment_file() {
255 256
256addtask generate_qt_environment_file after do_install before do_package 257addtask generate_qt_environment_file after do_install before do_package
257 258
258SRCREV = "f7f4dde80e13ff1c05a9399297ffb746ab505e62" 259SRCREV = "ac8a3b948da1980bc59bae3fc76d20b5b45662a0"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index bf0be7e2..f6149fbb 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -11,10 +11,4 @@ SRC_URI = " \
11 11
12S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
13 13
14PV = "5.5.99+5.6.0-alpha1+git${SRCPV}" 14PV = "5.5.99+5.6.0-rc+git${SRCPV}"
15
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 \
18# file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \
19# file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
20# file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 0683708b..bb104383 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -4,8 +4,8 @@ SECTION = "libs"
4HOMEPAGE = "http://qt-project.org" 4HOMEPAGE = "http://qt-project.org"
5LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 5LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
6LIC_FILES_CHKSUM = " \ 6LIC_FILES_CHKSUM = " \
7 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 7 file://LICENSE.LGPLv21;md5=d3bb688e8d381a9fa5ee9063114b366d \
8 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 8 file://LICENSE.LGPLv3;md5=3fd06ee442011942b532cc6dedb0b39c \
9 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 9 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \
10 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 10 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
@@ -117,4 +117,4 @@ do_install() {
117 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt 117 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
118} 118}
119 119
120SRCREV = "f7f4dde80e13ff1c05a9399297ffb746ab505e62" 120SRCREV = "ac8a3b948da1980bc59bae3fc76d20b5b45662a0"
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 9f5bb639..bca154cf 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,7 +1,7 @@
1From 729b7873256b11778832c5786dc50fd9ea860a7d Mon Sep 17 00:00:00 2001 1From f35a940471022c31dfd72aa5d1c942ce64ca5a6a Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 15 Apr 2013 04:29:32 +0200 3Date: Mon, 15 Apr 2013 04:29:32 +0200
4Subject: [PATCH 1/9] Add linux-oe-g++ platform 4Subject: [PATCH 01/10] Add linux-oe-g++ platform
5 5
6* This qmake.conf unlike other platforms reads most variables from 6* This qmake.conf unlike other platforms reads most variables from
7 shell environment, because it's easier for qt recipes to export 7 shell environment, because it's easier for qt recipes to export
@@ -56,7 +56,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
56 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h 56 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
57 57
58diff --git a/configure b/configure 58diff --git a/configure b/configure
59index 16e8fb4..9897fe6 100755 59index 1473a62..15207bf 100755
60--- a/configure 60--- a/configure
61+++ b/configure 61+++ b/configure
62@@ -342,6 +342,16 @@ getQMakeConf() 62@@ -342,6 +342,16 @@ getQMakeConf()
@@ -124,7 +124,7 @@ index 16e8fb4..9897fe6 100755
124 fi'` 124 fi'`
125 eval "$cmd" 125 eval "$cmd"
126 done 126 done
127@@ -3400,7 +3410,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then 127@@ -3418,7 +3428,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then
128 [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no 128 [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no
129 fi 129 fi
130 130
@@ -133,7 +133,7 @@ index 16e8fb4..9897fe6 100755
133 133
134 TEST_COMPILER=$QMAKE_CONF_COMPILER 134 TEST_COMPILER=$QMAKE_CONF_COMPILER
135 135
136@@ -3457,7 +3467,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then 136@@ -3475,7 +3485,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
137 exit 1 137 exit 1
138 fi 138 fi
139 fi 139 fi
@@ -142,7 +142,7 @@ index 16e8fb4..9897fe6 100755
142 142
143 GCC_MACHINE_DUMP= 143 GCC_MACHINE_DUMP=
144 case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac 144 case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac
145@@ -3958,6 +3968,14 @@ setBootstrapVariable() 145@@ -3976,6 +3986,14 @@ setBootstrapVariable()
146 getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" 146 getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
147 } 147 }
148 148
@@ -157,7 +157,7 @@ index 16e8fb4..9897fe6 100755
157 # build qmake 157 # build qmake
158 if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 158 if true; then ###[ '!' -f "$outpath/bin/qmake" ];
159 echo "Creating qmake..." 159 echo "Creating qmake..."
160@@ -3996,14 +4014,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 160@@ -4014,14 +4032,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
161 fi 161 fi
162 162
163 [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= 163 [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
@@ -178,9 +178,9 @@ index 16e8fb4..9897fe6 100755
178+ setBootstrapEvalVariable QMAKE_LFLAGS 178+ setBootstrapEvalVariable QMAKE_LFLAGS
179+ setBootstrapEvalVariable QMAKE_LFLAGS_GCSECTIONS 179+ setBootstrapEvalVariable QMAKE_LFLAGS_GCSECTIONS
180 180
181 if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then 181 if [ "$CFG_RELEASE_TOOLS" = "yes" ]; then
182 setBootstrapVariable QMAKE_CFLAGS_RELEASE 182 setBootstrapVariable QMAKE_CFLAGS_RELEASE
183@@ -4052,6 +4070,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 183@@ -4070,6 +4088,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
184 \"\$(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp\" \ 184 \"\$(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp\" \
185 \"\$(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp\"" 185 \"\$(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp\""
186 EXEEXT= 186 EXEEXT=
@@ -209,7 +209,7 @@ index 6b37a04..dcf6025 100644
209 write_file($$QMAKE_CONFIG_LOG, msg, append) 209 write_file($$QMAKE_CONFIG_LOG, msg, append)
210diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf 210diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf
211new file mode 100644 211new file mode 100644
212index 0000000..d0a4166 212index 0000000..311ba04
213--- /dev/null 213--- /dev/null
214+++ b/mkspecs/linux-oe-g++/qmake.conf 214+++ b/mkspecs/linux-oe-g++/qmake.conf
215@@ -0,0 +1,42 @@ 215@@ -0,0 +1,42 @@
@@ -362,5 +362,5 @@ index 0000000..dd12003
362+ 362+
363+#endif // QPLATFORMDEFS_H 363+#endif // QPLATFORMDEFS_H
364-- 364--
3652.6.2 3652.7.1
366 366
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 01832386..dcd59abb 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,8 +1,8 @@
1From f902b73eda6d459a3669fd78a3c8908ae13e705b Mon Sep 17 00:00:00 2001 1From 2fbde67aa4184e31ccbfae95e884b89567883904 Mon Sep 17 00:00:00 2001
2From: Holger Freyther <zecke@selfish.org> 2From: Holger Freyther <zecke@selfish.org>
3Date: Wed, 26 Sep 2012 17:22:30 +0200 3Date: Wed, 26 Sep 2012 17:22:30 +0200
4Subject: [PATCH 2/9] qlibraryinfo: allow to set qt.conf from the outside using 4Subject: [PATCH 02/10] qlibraryinfo: allow to set qt.conf from the outside
5 the environment 5 using the environment
6 6
7Allow to set a qt.conf from the outside using the environment. This allows 7Allow to set a qt.conf from the outside using the environment. This allows
8to inject new prefixes and other paths into qmake. This is needed when using 8to inject new prefixes and other paths into qmake. This is needed when using
@@ -19,7 +19,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
19 1 file changed, 4 insertions(+), 1 deletion(-) 19 1 file changed, 4 insertions(+), 1 deletion(-)
20 20
21diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp 21diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
22index 0cfcc4e..c3b5c2d 100644 22index 8bcacca..e1c87b5 100644
23--- a/src/corelib/global/qlibraryinfo.cpp 23--- a/src/corelib/global/qlibraryinfo.cpp
24+++ b/src/corelib/global/qlibraryinfo.cpp 24+++ b/src/corelib/global/qlibraryinfo.cpp
25@@ -157,7 +157,10 @@ void QLibrarySettings::load() 25@@ -157,7 +157,10 @@ void QLibrarySettings::load()
@@ -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--
382.6.2 382.7.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 ea152790..0cb8363f 100644
--- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
@@ -1,7 +1,7 @@
1From 175d86ddb36117c0ca2ff47ae42693980dbfa098 Mon Sep 17 00:00:00 2001 1From b28148fd6ee59d584e59a07736da63ee9ea5c1ad Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 6 Apr 2013 13:15:07 +0200 3Date: Sat, 6 Apr 2013 13:15:07 +0200
4Subject: [PATCH 3/9] Add -external-hostbindir option 4Subject: [PATCH 03/10] Add -external-hostbindir option
5 5
6* when cross-compiling it's sometimes useful to use existing tools from machine 6* when cross-compiling it's sometimes useful to use existing tools from machine
7 (or in OpenEmbedded built with separate native recipe) when building for target 7 (or in OpenEmbedded built with separate native recipe) when building for target
@@ -37,10 +37,10 @@ Conflicts:
37 7 files changed, 38 insertions(+), 12 deletions(-) 37 7 files changed, 38 insertions(+), 12 deletions(-)
38 38
39diff --git a/configure b/configure 39diff --git a/configure b/configure
40index 9897fe6..aa89d30 100755 40index 15207bf..8fafeca 100755
41--- a/configure 41--- a/configure
42+++ b/configure 42+++ b/configure
43@@ -808,6 +808,7 @@ QT_HOST_BINS= 43@@ -810,6 +810,7 @@ QT_HOST_BINS=
44 QT_HOST_LIBS= 44 QT_HOST_LIBS=
45 QT_HOST_DATA= 45 QT_HOST_DATA=
46 QT_EXT_PREFIX= 46 QT_EXT_PREFIX=
@@ -48,7 +48,7 @@ index 9897fe6..aa89d30 100755
48 48
49 #flags for SQL drivers 49 #flags for SQL drivers
50 QT_CFLAGS_PSQL= 50 QT_CFLAGS_PSQL=
51@@ -927,6 +928,7 @@ while [ "$#" -gt 0 ]; do 51@@ -929,6 +930,7 @@ while [ "$#" -gt 0 ]; do
52 -testsdir| \ 52 -testsdir| \
53 -hostdatadir| \ 53 -hostdatadir| \
54 -hostbindir| \ 54 -hostbindir| \
@@ -56,7 +56,7 @@ index 9897fe6..aa89d30 100755
56 -hostlibdir| \ 56 -hostlibdir| \
57 -extprefix| \ 57 -extprefix| \
58 -sysroot| \ 58 -sysroot| \
59@@ -1157,6 +1159,9 @@ while [ "$#" -gt 0 ]; do 59@@ -1159,6 +1161,9 @@ while [ "$#" -gt 0 ]; do
60 extprefix) 60 extprefix)
61 QT_EXT_PREFIX="$VAL" 61 QT_EXT_PREFIX="$VAL"
62 ;; 62 ;;
@@ -66,7 +66,7 @@ index 9897fe6..aa89d30 100755
66 pkg-config) 66 pkg-config)
67 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then 67 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
68 CFG_PKGCONFIG="$VAL" 68 CFG_PKGCONFIG="$VAL"
69@@ -2419,6 +2424,10 @@ Installation options: 69@@ -2428,6 +2433,10 @@ Installation options:
70 -hostdatadir <dir> . Data used by qmake will be installed to <dir> 70 -hostdatadir <dir> . Data used by qmake will be installed to <dir>
71 (default HOSTPREFIX) 71 (default HOSTPREFIX)
72 72
@@ -77,7 +77,7 @@ index 9897fe6..aa89d30 100755
77 Configure options: 77 Configure options:
78 78
79 The defaults (*) are usually acceptable. A plus (+) denotes a default value 79 The defaults (*) are usually acceptable. A plus (+) denotes a default value
80@@ -3158,6 +3167,11 @@ fi 80@@ -3172,6 +3181,11 @@ fi
81 # command line and environment validation 81 # command line and environment validation
82 #------------------------------------------------------------------------------- 82 #-------------------------------------------------------------------------------
83 83
@@ -90,7 +90,7 @@ index 9897fe6..aa89d30 100755
90 CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h 90 CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h
91 case "$CFG_QCONFIG" in 91 case "$CFG_QCONFIG" in
92diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf 92diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
93index 6616aa4..3d40bf9 100644 93index b2c2507..fba4a58 100644
94--- a/mkspecs/features/qt_functions.prf 94--- a/mkspecs/features/qt_functions.prf
95+++ b/mkspecs/features/qt_functions.prf 95+++ b/mkspecs/features/qt_functions.prf
96@@ -57,7 +57,11 @@ defineTest(qtHaveModule) { 96@@ -57,7 +57,11 @@ defineTest(qtHaveModule) {
@@ -107,7 +107,7 @@ index 6616aa4..3d40bf9 100644
107 cmd = perl -w $$system_path($${cmd}.pl) 107 cmd = perl -w $$system_path($${cmd}.pl)
108 } else: contains(QMAKE_HOST.os, Windows) { 108 } else: contains(QMAKE_HOST.os, Windows) {
109diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf 109diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
110index 3f0301a..7dc66de 100644 110index 839c3d6..45934a0 100644
111--- a/mkspecs/features/qt_tool.prf 111--- a/mkspecs/features/qt_tool.prf
112+++ b/mkspecs/features/qt_tool.prf 112+++ b/mkspecs/features/qt_tool.prf
113@@ -14,10 +14,11 @@ load(qt_app) 113@@ -14,10 +14,11 @@ load(qt_app)
@@ -125,7 +125,7 @@ index 3f0301a..7dc66de 100644
125 125
126 !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private) 126 !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private)
127diff --git a/qtbase.pro b/qtbase.pro 127diff --git a/qtbase.pro b/qtbase.pro
128index 24d0f52..d3d79b3 100644 128index 98ca86a..0eed475 100644
129--- a/qtbase.pro 129--- a/qtbase.pro
130+++ b/qtbase.pro 130+++ b/qtbase.pro
131@@ -37,12 +37,16 @@ CONFIG -= qt 131@@ -37,12 +37,16 @@ CONFIG -= qt
@@ -148,7 +148,7 @@ index 24d0f52..d3d79b3 100644
148 } 148 }
149 INSTALLS += qmake 149 INSTALLS += qmake
150 150
151@@ -54,6 +58,9 @@ licheck.files = $$PWD/bin/$$QT_LICHECK 151@@ -59,6 +63,9 @@ INSTALLS += fixqt4headers
152 #syncqt 152 #syncqt
153 syncqt.path = $$[QT_HOST_BINS] 153 syncqt.path = $$[QT_HOST_BINS]
154 syncqt.files = $$PWD/bin/syncqt.pl 154 syncqt.files = $$PWD/bin/syncqt.pl
@@ -159,7 +159,7 @@ index 24d0f52..d3d79b3 100644
159 159
160 # If we are doing a prefix build, create a "module" pri which enables 160 # If we are doing a prefix build, create a "module" pri which enables
161diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in 161diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
162index 65fd1f9..457518b 100644 162index 91a4eb6..25df27c 100644
163--- a/src/corelib/Qt5CoreConfigExtras.cmake.in 163--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
164+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in 164+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
165@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) 165@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake)
@@ -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--
2282.6.2 2282.7.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 2bbb92cc..062db89d 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,7 +1,7 @@
1From a76a6c33be512a2909904b6136a6044e4b747ffd Mon Sep 17 00:00:00 2001 1From 43305bc5cfe1db5021abb1bf2806dcc63b31f176 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 27 Apr 2013 23:15:37 +0200 3Date: Sat, 27 Apr 2013 23:15:37 +0200
4Subject: [PATCH 4/9] qt_module: Fix pkgconfig and libtool replacements 4Subject: [PATCH 04/10] qt_module: Fix pkgconfig and libtool replacements
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -63,8 +63,8 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
63Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> 63Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
64--- 64---
65 mkspecs/features/qt_common.prf | 2 +- 65 mkspecs/features/qt_common.prf | 2 +-
66 mkspecs/features/qt_module.prf | 10 ++++++++++ 66 mkspecs/features/qt_module.prf | 11 +++++++++++
67 2 files changed, 11 insertions(+), 1 deletion(-) 67 2 files changed, 12 insertions(+), 1 deletion(-)
68 68
69diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf 69diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
70index 38602f6..f9c401f 100644 70index 38602f6..f9c401f 100644
@@ -80,33 +80,27 @@ index 38602f6..f9c401f 100644
80 lib_replace.CONFIG = path 80 lib_replace.CONFIG = path
81 QMAKE_PRL_INSTALL_REPLACE += lib_replace 81 QMAKE_PRL_INSTALL_REPLACE += lib_replace
82diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf 82diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
83index 193629b..38ff9a8 100644 83index e543ea6..0624ce2 100644
84--- a/mkspecs/features/qt_module.prf 84--- a/mkspecs/features/qt_module.prf
85+++ b/mkspecs/features/qt_module.prf 85+++ b/mkspecs/features/qt_module.prf
86@@ -255,6 +255,11 @@ unix|mingw { 86@@ -273,6 +273,17 @@ load(qt_targets)
87 pclib_replace.CONFIG = path 87 ltlib_replace.replace = $$QMAKE_LIBTOOL_LIBDIR
88 QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace 88 ltlib_replace.CONFIG = path
89 89 QMAKE_LIBTOOL_INSTALL_REPLACE += ltlib_replace
90+
90+ pkgconfig_include_replace.match = $$rplbase/include 91+ pkgconfig_include_replace.match = $$rplbase/include
91+ pkgconfig_include_replace.replace = "\$$\\{includedir}" 92+ pkgconfig_include_replace.replace = "\$$\\{includedir}"
92+ pkgconfig_include_replace.CONFIG = path 93+ pkgconfig_include_replace.CONFIG = path
93+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace 94+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace
94+ 95+
95 unix { 96+ # drop -L/usr/lib in .prl files
96 CONFIG += create_libtool explicitlib 97+ prl_replace.match = "-L\$${libdir}"
97 host_build: \ 98+ prl_replace.replace = ""
98@@ -266,6 +271,11 @@ unix|mingw { 99+ prl_replace.CONFIG = path
99 ltlib_replace.replace = $$QMAKE_LIBTOOL_LIBDIR 100+ QMAKE_PRL_INSTALL_REPLACE += prl_replace
100 ltlib_replace.CONFIG = path
101 QMAKE_LIBTOOL_INSTALL_REPLACE += ltlib_replace
102+ # drop -L/usr/lib in .prl files
103+ prl_replace.match = "-L\$${libdir}"
104+ prl_replace.replace = ""
105+ prl_replace.CONFIG = path
106+ QMAKE_PRL_INSTALL_REPLACE += prl_replace
107 }
108 } 101 }
109 102
103 contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE
110-- 104--
1112.6.2 1052.7.0
112 106
diff --git a/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch
index a3470f63..c93c6f5d 100644
--- a/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch
+++ b/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch
@@ -1,7 +1,7 @@
1From 9f80241e140b0e22d58aa2ac6ef13a277c38fe9f Mon Sep 17 00:00:00 2001 1From 8bc8e96a6ad707c5f399c307e519444a1fafc4fe Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com> 2From: Denys Dmytriyenko <denys@ti.com>
3Date: Tue, 25 Aug 2015 10:05:15 -0400 3Date: Tue, 25 Aug 2015 10:05:15 -0400
4Subject: [PATCH 5/9] configure: bump path length from 256 to 512 characters 4Subject: [PATCH 05/10] configure: bump path length from 256 to 512 characters
5 5
6Increase the path length that gets hardcoded into generated config.cpp file 6Increase the path length that gets hardcoded into generated config.cpp file
7from 256 to 512 characters, as nativesdk path can be quite long. 7from 256 to 512 characters, as nativesdk path can be quite long.
@@ -14,10 +14,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
14 1 file changed, 3 insertions(+), 3 deletions(-) 14 1 file changed, 3 insertions(+), 3 deletions(-)
15 15
16diff --git a/configure b/configure 16diff --git a/configure b/configure
17index aa89d30..6edfffd 100755 17index 8fafeca..34c7b8b 100755
18--- a/configure 18--- a/configure
19+++ b/configure 19+++ b/configure
20@@ -3912,10 +3912,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ 20@@ -3930,10 +3930,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$
21 static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20"; 21 static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20";
22 22
23 /* Installation Info */ 23 /* Installation Info */
@@ -32,5 +32,5 @@ index aa89d30..6edfffd 100755
32 32
33 static const short qt_configure_str_offsets[] = { 33 static const short qt_configure_str_offsets[] = {
34-- 34--
352.6.2 352.7.1
36 36
diff --git a/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch
index 0dbee0b4..bd5cfacd 100644
--- a/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch
+++ b/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch
@@ -1,7 +1,7 @@
1From 4772fd9332b7c71543d058c1e1cfa24399a9f269 Mon Sep 17 00:00:00 2001 1From a2a195bc2782ccf582afb00ffc25021abd2ba810 Mon Sep 17 00:00:00 2001
2From: Jani Hautakangas <jani.hautakangas@ixonos.com> 2From: Jani Hautakangas <jani.hautakangas@ixonos.com>
3Date: Thu, 16 May 2013 09:52:07 +0300 3Date: Thu, 16 May 2013 09:52:07 +0300
4Subject: [PATCH 6/9] QOpenGLPaintDevice sub-area support 4Subject: [PATCH 06/10] QOpenGLPaintDevice sub-area support
5 5
6Allows creating QOpenGLPaintDevice targetting sub-area 6Allows creating QOpenGLPaintDevice targetting sub-area
7of binded framebuffer. 7of binded framebuffer.
@@ -81,10 +81,10 @@ index 54ea092..f660143 100644
81 81
82 qreal dpmx; 82 qreal dpmx;
83diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp 83diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp
84index 4836dde..3f99b16 100644 84index 0b92bf4..f41e059 100644
85--- a/src/gui/opengl/qopenglpaintengine.cpp 85--- a/src/gui/opengl/qopenglpaintengine.cpp
86+++ b/src/gui/opengl/qopenglpaintengine.cpp 86+++ b/src/gui/opengl/qopenglpaintengine.cpp
87@@ -2091,7 +2091,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) 87@@ -2078,7 +2078,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev)
88 for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) 88 for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i)
89 d->vertexAttributeArraysEnabledState[i] = false; 89 d->vertexAttributeArraysEnabledState[i] = false;
90 90
@@ -95,7 +95,7 @@ index 4836dde..3f99b16 100644
95 d->width = sz.width(); 95 d->width = sz.width();
96 d->height = sz.height(); 96 d->height = sz.height();
97 d->mode = BrushDrawingMode; 97 d->mode = BrushDrawingMode;
98@@ -2178,7 +2181,7 @@ void QOpenGL2PaintEngineEx::ensureActive() 98@@ -2165,7 +2168,7 @@ void QOpenGL2PaintEngineEx::ensureActive()
99 d->device->ensureActiveTarget(); 99 d->device->ensureActiveTarget();
100 100
101 d->transferMode(BrushDrawingMode); 101 d->transferMode(BrushDrawingMode);
@@ -104,7 +104,7 @@ index 4836dde..3f99b16 100644
104 d->needsSync = false; 104 d->needsSync = false;
105 d->shaderManager->setDirty(); 105 d->shaderManager->setDirty();
106 d->syncGlState(); 106 d->syncGlState();
107@@ -2220,6 +2223,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() 107@@ -2207,6 +2210,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
108 if (bounds == QRect(0, 0, width, height)) { 108 if (bounds == QRect(0, 0, width, height)) {
109 funcs.glDisable(GL_SCISSOR_TEST); 109 funcs.glDisable(GL_SCISSOR_TEST);
110 } else { 110 } else {
@@ -112,7 +112,7 @@ index 4836dde..3f99b16 100644
112 funcs.glEnable(GL_SCISSOR_TEST); 112 funcs.glEnable(GL_SCISSOR_TEST);
113 setScissor(bounds); 113 setScissor(bounds);
114 } 114 }
115@@ -2228,12 +2232,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() 115@@ -2215,12 +2219,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
116 116
117 void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect) 117 void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect)
118 { 118 {
@@ -128,7 +128,7 @@ index 4836dde..3f99b16 100644
128 128
129 funcs.glScissor(left, bottom, width, height); 129 funcs.glScissor(left, bottom, width, height);
130diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h 130diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h
131index 17be72b..43e88f6 100644 131index f1ec669..6d302b8 100644
132--- a/src/gui/opengl/qopenglpaintengine_p.h 132--- a/src/gui/opengl/qopenglpaintengine_p.h
133+++ b/src/gui/opengl/qopenglpaintengine_p.h 133+++ b/src/gui/opengl/qopenglpaintengine_p.h
134@@ -264,6 +264,7 @@ public: 134@@ -264,6 +264,7 @@ public:
@@ -153,5 +153,5 @@ index c179143..fad68d5 100644
153 } else { 153 } else {
154 if (m_vao.isCreated()) { 154 if (m_vao.isCreated()) {
155-- 155--
1562.6.2 1562.7.1
157 157
diff --git a/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch b/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
index 55f82765..525396f0 100644
--- a/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
+++ b/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
@@ -1,7 +1,7 @@
1From a3c5659464c911c60f31834187f3b1e914f0bf1f Mon Sep 17 00:00:00 2001 1From 4c68f97060427d3184589be4f25e1e366e26557c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 8 Jun 2015 13:59:25 -0700 3Date: Mon, 8 Jun 2015 13:59:25 -0700
4Subject: [PATCH 7/9] linux-oe-g++: Invert conditional for defining 4Subject: [PATCH 07/10] linux-oe-g++: Invert conditional for defining
5 QT_SOCKLEN_T 5 QT_SOCKLEN_T
6 6
7This helps to make sure that QT_SOCKLEN_T is defined to be 'int' 7This helps to make sure that QT_SOCKLEN_T is defined to be 'int'
@@ -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--
352.6.2 352.7.1
36 36
diff --git a/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch b/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch
index efd27a55..204b3bf6 100644
--- a/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch
+++ b/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch
@@ -1,7 +1,7 @@
1From fb519b08f564a8a640b1b2f2b6a3bd54a83e19e8 Mon Sep 17 00:00:00 2001 1From 3e343061f8f8cb71fbb4f52e6e825495880779a2 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Fri, 13 Nov 2015 12:36:11 +0100 3Date: Fri, 13 Nov 2015 12:36:11 +0100
4Subject: [PATCH] configure paths/mkspecs for target qmake properly 4Subject: [PATCH 08/10] configure paths for target qmake properly
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -11,16 +11,18 @@ conditionally based on QT_CROSS_COMPILE
11 11
12Upstream-Status: Inappropriate [OE specific] 12Upstream-Status: Inappropriate [OE specific]
13 13
14Change-Id: I2b2f00c496216e98fbe14801f9e840ef5333c4b6
14Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> 15Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
16Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
15--- 17---
16 configure | 23 +++++++++++++++++++---- 18 configure | 23 +++++++++++++++++++----
17 1 file changed, 19 insertions(+), 4 deletions(-) 19 1 file changed, 19 insertions(+), 4 deletions(-)
18 20
19diff --git a/configure b/configure 21diff --git a/configure b/configure
20index 6edfffd..de74a29 100755 22index 34c7b8b..f9869dd 100755
21--- a/configure 23--- a/configure
22+++ b/configure 24+++ b/configure
23@@ -3857,8 +3857,13 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then 25@@ -3875,8 +3875,13 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then
24 QMAKE_CONFIG="$QMAKE_CONFIG compile_examples" 26 QMAKE_CONFIG="$QMAKE_CONFIG compile_examples"
25 fi 27 fi
26 28
@@ -36,7 +38,7 @@ index 6edfffd..de74a29 100755
36 38
37 QT_CONFIGURE_STR_OFF=0 39 QT_CONFIGURE_STR_OFF=0
38 40
39@@ -3891,7 +3896,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS 41@@ -3909,7 +3914,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS
40 42
41 QT_CONFIGURE_STR_OFFSETS= 43 QT_CONFIGURE_STR_OFFSETS=
42 QT_CONFIGURE_STRS= 44 QT_CONFIGURE_STRS=
@@ -49,7 +51,7 @@ index 6edfffd..de74a29 100755
49 addConfStr "$QT_REL_HOST_BINS" 51 addConfStr "$QT_REL_HOST_BINS"
50 addConfStr "$QT_REL_HOST_LIBS" 52 addConfStr "$QT_REL_HOST_LIBS"
51 addConfStr "$QT_REL_HOST_DATA" 53 addConfStr "$QT_REL_HOST_DATA"
52@@ -3903,6 +3912,12 @@ addConfStr "$shortspec" 54@@ -3921,6 +3930,12 @@ addConfStr "$shortspec"
53 #------------------------------------------------------------------------------- 55 #-------------------------------------------------------------------------------
54 [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global" 56 [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global"
55 57
@@ -62,7 +64,7 @@ index 6edfffd..de74a29 100755
62 cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF 64 cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
63 /* License Info */ 65 /* License Info */
64 static const char qt_configure_licensee_str [256 + 12] = "qt_lcnsuser=$Licensee"; 66 static const char qt_configure_licensee_str [256 + 12] = "qt_lcnsuser=$Licensee";
65@@ -3915,7 +3930,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2 67@@ -3933,7 +3948,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2
66 static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX"; 68 static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
67 #ifdef QT_BUILD_QMAKE 69 #ifdef QT_BUILD_QMAKE
68 static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX"; 70 static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
@@ -72,5 +74,5 @@ index 6edfffd..de74a29 100755
72 74
73 static const short qt_configure_str_offsets[] = { 75 static const short qt_configure_str_offsets[] = {
74-- 76--
752.1.0 772.7.1
76 78
diff --git a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
index 359be5fb..4db32e7d 100644
--- a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
+++ b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
@@ -1,7 +1,7 @@
1From e3ce176f43e9214808cbdac13ace0aa8d8ec046d Mon Sep 17 00:00:00 2001 1From c9e825dd77c23dda786809ecb19ca1a88dccdf1b Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 16 Nov 2013 00:32:30 +0100 3Date: Sat, 16 Nov 2013 00:32:30 +0100
4Subject: [PATCH 8/9] Always build uic 4Subject: [PATCH 09/10] Always build uic
5 5
6Even if we are not building gui or widgets. This tool is needed later 6Even if we are not building gui or widgets. This tool is needed later
7as a native tool when compiling the target. 7as a native tool when compiling the target.
@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/src/src.pro b/src/src.pro 16diff --git a/src/src.pro b/src/src.pro
17index a970391..66c66d0 100644 17index 1671338..83de483 100644
18--- a/src/src.pro 18--- a/src/src.pro
19+++ b/src/src.pro 19+++ b/src/src.pro
20@@ -176,7 +176,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent 20@@ -180,7 +180,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
21 } 21 }
22 } 22 }
23 } 23 }
@@ -27,5 +27,5 @@ index a970391..66c66d0 100644
27 nacl: SUBDIRS -= src_network src_testlib 27 nacl: SUBDIRS -= src_network src_testlib
28 28
29-- 29--
302.6.2 302.7.1
31 31
diff --git a/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch b/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch
index 4d654a44..e088bba5 100644
--- a/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch
+++ b/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch
@@ -1,7 +1,7 @@
1From 38ecbe7300925d440fa3d7c58e40ed5a53b2d73a Mon Sep 17 00:00:00 2001 1From 7c548d3833e29fade57855ef82ed2abd815b7fc4 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 6 Apr 2013 13:15:07 +0200 3Date: Sat, 6 Apr 2013 13:15:07 +0200
4Subject: [PATCH 9/9] Add -external-hostbindir option for native(sdk) 4Subject: [PATCH 10/10] Add -external-hostbindir option for native(sdk)
5 5
6* when cross-compiling it's sometimes useful to use existing tools from machine 6* when cross-compiling it's sometimes useful to use existing tools from machine
7 (or in OpenEmbedded built with separate native recipe) when building for target 7 (or in OpenEmbedded built with separate native recipe) when building for target
@@ -37,10 +37,10 @@ Conflicts:
37 5 files changed, 16 insertions(+), 1 deletion(-) 37 5 files changed, 16 insertions(+), 1 deletion(-)
38 38
39diff --git a/configure b/configure 39diff --git a/configure b/configure
40index 6edfffd..313d921 100755 40index f9869dd..c81d02a 100755
41--- a/configure 41--- a/configure
42+++ b/configure 42+++ b/configure
43@@ -3895,6 +3895,7 @@ addConfStr "$CFG_SYSROOT" 43@@ -3922,6 +3922,7 @@ fi
44 addConfStr "$QT_REL_HOST_BINS" 44 addConfStr "$QT_REL_HOST_BINS"
45 addConfStr "$QT_REL_HOST_LIBS" 45 addConfStr "$QT_REL_HOST_LIBS"
46 addConfStr "$QT_REL_HOST_DATA" 46 addConfStr "$QT_REL_HOST_DATA"
@@ -61,7 +61,7 @@ index 817ae95..c69539f 100644
61 { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, 61 { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true },
62 }; 62 };
63diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp 63diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
64index c3b5c2d..1381658 100644 64index e1c87b5..d6e03ba 100644
65--- a/src/corelib/global/qlibraryinfo.cpp 65--- a/src/corelib/global/qlibraryinfo.cpp
66+++ b/src/corelib/global/qlibraryinfo.cpp 66+++ b/src/corelib/global/qlibraryinfo.cpp
67@@ -373,7 +373,7 @@ QLibraryInfo::isDebugBuild() 67@@ -373,7 +373,7 @@ QLibraryInfo::isDebugBuild()
@@ -94,10 +94,10 @@ index 1ad7637..5a8b127 100644
94 HostSpecPath, 94 HostSpecPath,
95 HostPrefixPath, 95 HostPrefixPath,
96diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp 96diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
97index 6c3217b..980c578 100644 97index 555ccbf..d9a5b08 100644
98--- a/tools/configure/configureapp.cpp 98--- a/tools/configure/configureapp.cpp
99+++ b/tools/configure/configureapp.cpp 99+++ b/tools/configure/configureapp.cpp
100@@ -1243,6 +1243,13 @@ void Configure::parseCmdLine() 100@@ -1248,6 +1248,13 @@ void Configure::parseCmdLine()
101 dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i); 101 dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i);
102 } 102 }
103 103
@@ -111,7 +111,7 @@ index 6c3217b..980c578 100644
111 else if (configCmdLine.at(i) == "-make-tool") { 111 else if (configCmdLine.at(i) == "-make-tool") {
112 ++i; 112 ++i;
113 if (i == argCount) 113 if (i == argCount)
114@@ -4198,6 +4205,9 @@ void Configure::generateQConfigCpp() 114@@ -4214,6 +4221,9 @@ void Configure::generateQConfigCpp()
115 115
116 if (dictionary["QT_REL_HOST_DATA"].isEmpty()) 116 if (dictionary["QT_REL_HOST_DATA"].isEmpty())
117 dictionary["QT_REL_HOST_DATA"] = haveHpx ? "." : dictionary["QT_REL_INSTALL_ARCHDATA"]; 117 dictionary["QT_REL_HOST_DATA"] = haveHpx ? "." : dictionary["QT_REL_INSTALL_ARCHDATA"];
@@ -121,7 +121,7 @@ index 6c3217b..980c578 100644
121 121
122 confStringOff = 0; 122 confStringOff = 0;
123 addConfStr(0, dictionary["QT_REL_INSTALL_DOCS"]); 123 addConfStr(0, dictionary["QT_REL_INSTALL_DOCS"]);
124@@ -4217,6 +4227,7 @@ void Configure::generateQConfigCpp() 124@@ -4233,6 +4243,7 @@ void Configure::generateQConfigCpp()
125 addConfStr(1, dictionary["QT_REL_HOST_BINS"]); 125 addConfStr(1, dictionary["QT_REL_HOST_BINS"]);
126 addConfStr(1, dictionary["QT_REL_HOST_LIBS"]); 126 addConfStr(1, dictionary["QT_REL_HOST_LIBS"]);
127 addConfStr(1, dictionary["QT_REL_HOST_DATA"]); 127 addConfStr(1, dictionary["QT_REL_HOST_DATA"]);
@@ -130,5 +130,5 @@ index 6c3217b..980c578 100644
130 addConfStr(1, hostSpec); 130 addConfStr(1, hostSpec);
131 131
132-- 132--
1332.6.2 1332.7.1
134 134
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 1db6b887..618f9cf2 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -3,8 +3,8 @@ require qt5-git.inc
3 3
4LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 4LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPLv21;md5=d3bb688e8d381a9fa5ee9063114b366d \
7 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv3;md5=3fd06ee442011942b532cc6dedb0b39c \
8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \
9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
@@ -260,4 +260,4 @@ sysroot_stage_dirs_append() {
260 rm -rf $to${OE_QMAKE_PATH_QT_FONTS} 260 rm -rf $to${OE_QMAKE_PATH_QT_FONTS}
261} 261}
262 262
263SRCREV = "f7f4dde80e13ff1c05a9399297ffb746ab505e62" 263SRCREV = "aa85ebc266ea7415a883094ea735f549552ff5ac"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
index c892d9b3..4990f348 100644
--- a/recipes-qt/qt5/qtcanvas3d_git.bb
+++ b/recipes-qt/qt5/qtcanvas3d_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS = "qtdeclarative" 11DEPENDS = "qtdeclarative"
12 12
13SRCREV = "a84dad27182ba6cb4c6f9bf4008a9e63346a7a83" 13SRCREV = "b351fb164af327828c9bdbc414ffd8e47e387e8c"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index f677f710..cf6d3c51 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -25,4 +25,4 @@ do_configure_prepend() {
25 sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro 25 sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro
26} 26}
27 27
28SRCREV = "a7617f963c1d375fb7ac7d5c17f450acdb2796b8" 28SRCREV = "dec32076b9153febc575a0418af702f8cb400258"
diff --git a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
index fd2586ea..b3f7621c 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 @@
1From d5e0c3af853c7bdb202f15a12117db76f744cc55 Mon Sep 17 00:00:00 2001 1From 1755b8c7ab87f9e6bf072bd0bef50086c14dd9ff Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> 2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
3Date: Sun, 26 May 2013 14:26:19 +0200 3Date: Sun, 26 May 2013 14:26:19 +0200
4Subject: [PATCH] qmltestexample: fix link 4Subject: [PATCH] qmltestexample: fix link
@@ -84,5 +84,5 @@ index 1bb913e..56f2dd5 100644
84 84
85 load(qt_tool) 85 load(qt_tool)
86-- 86--
872.6.1 872.7.0
88 88
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index de71c39b..93442fb4 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -33,6 +33,6 @@ do_configure_prepend() {
33 33
34EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 34EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
35 35
36SRCREV = "1064d5100f4d00af5f56b87331251f97d78f8b87" 36SRCREV = "0fab5761d5428aa708edd66e40fc3c449adc4b11"
37 37
38BBCLASSEXTEND =+ "native nativesdk" 38BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb
index 5854abe3..5590abdd 100644
--- a/recipes-qt/qt5/qtenginio_git.bb
+++ b/recipes-qt/qt5/qtenginio_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtdeclarative qtxmlpatterns" 12DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
13 13
14SRCREV = "34d66f3836051dca35a854577fe04b45af3630f2" 14SRCREV = "60a135102aaa37d0d817883e4d6aed456372709d"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 463e15be..c35cc809 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -17,4 +17,4 @@ DEPENDS += "qtdeclarative"
17 17
18RDEPENDS_${PN}-dev = "" 18RDEPENDS_${PN}-dev = ""
19 19
20SRCREV = "ad227e9808288b12726114365ae1474386c6cdf8" 20SRCREV = "24f3fd69a2e953619c48b4a632262ce8419fee40"
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 a1124397..8964a5dd 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 @@
1From 903682bb95cc2cdb51a1155c3977d0ec8619a73d Mon Sep 17 00:00:00 2001 1From 14a68abb4c492fb7ba55dbccaf61057e861bbf3c Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 4 Aug 2014 19:19:05 +0200 3Date: Mon, 4 Aug 2014 19:19:05 +0200
4Subject: [PATCH] qtimageformats.pro: Make the dependencies deterministic 4Subject: [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--
302.6.1 302.7.0
31 31
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index a847fb28..b49940be 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -28,4 +28,4 @@ EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'jasper', 'CONFIG+=OE_
28EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" 28EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}"
29EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" 29EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}"
30 30
31SRCREV = "67cbcf399aa1a18b9b1dbac0a6572a865687230a" 31SRCREV = "58f19cf8d51e06f1781f3142e6d872e5feb0690e"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 2c66ad47..50729032 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -29,4 +29,4 @@ do_configure_prepend() {
29EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" 29EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}"
30EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" 30EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}"
31 31
32SRCREV = "1fd85dd9426b65198b396c686edd42e42d5b8149" 32SRCREV = "03163a3c9129b7f982b690e750056506c3d06b41"
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 696f1c00..a4ac12ab 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 @@
1From 066a997479b2431d7bc479655ce37ae083e7a224 Mon Sep 17 00:00:00 2001 1From e8e2e289288acd3124536a41351e7bcd639bef07 Mon Sep 17 00:00:00 2001
2From: Yoann Lopes <yoann.lopes@digia.com> 2From: Yoann Lopes <yoann.lopes@digia.com>
3Date: Thu, 31 Oct 2013 15:06:30 +0100 3Date: Thu, 31 Oct 2013 15:06:30 +0100
4Subject: [PATCH] Initial porting effort to GStreamer 1.0. 4Subject: [PATCH] Initial porting effort to GStreamer 1.0.
@@ -17,10 +17,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
17 1 file changed, 14 insertions(+), 12 deletions(-) 17 1 file changed, 14 insertions(+), 12 deletions(-)
18 18
19diff --git a/qtmultimedia.pro b/qtmultimedia.pro 19diff --git a/qtmultimedia.pro b/qtmultimedia.pro
20index 1225ffb..4f675fe 100644 20index 98bb315..287887f 100644
21--- a/qtmultimedia.pro 21--- a/qtmultimedia.pro
22+++ b/qtmultimedia.pro 22+++ b/qtmultimedia.pro
23@@ -18,19 +18,21 @@ win32 { 23@@ -17,19 +17,21 @@ win32 {
24 contains(QT_CONFIG, alsa):qtCompileTest(alsa) 24 contains(QT_CONFIG, alsa):qtCompileTest(alsa)
25 contains(QT_CONFIG, pulseaudio):qtCompileTest(pulseaudio) 25 contains(QT_CONFIG, pulseaudio):qtCompileTest(pulseaudio)
26 26
@@ -55,5 +55,5 @@ index 1225ffb..4f675fe 100644
55 55
56 qtCompileTest(resourcepolicy) 56 qtCompileTest(resourcepolicy)
57-- 57--
582.6.1 582.7.0
59 59
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 96a21cd8..ce423021 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
38SRCREV = "ac1b772ec8e428acd23322a6fccbde2bda6b8bd2" 38SRCREV = "3b6de26fe585c586d055ac86c5911cc6df0e3887"
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index d7cf4345..e0a264d4 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -23,4 +23,4 @@ do_configure_prepend() {
23 sed -i 's#^qtHaveModule(webkitwidgets):#enable-webkit:qtHaveModule(webkitwidgets):#g' ${S}/src/imports/imports.pro 23 sed -i 's#^qtHaveModule(webkitwidgets):#enable-webkit:qtHaveModule(webkitwidgets):#g' ${S}/src/imports/imports.pro
24} 24}
25 25
26SRCREV = "b0382acf65dbc0debcb7cf956ba954117a682d90" 26SRCREV = "87f2415adf34da08e6cd58f5da6f6a7d0d9cf141"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 644b70ec..1e25d6e0 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -13,4 +13,4 @@ DEPENDS += "qtdeclarative"
13 13
14RDEPENDS_${PN}-dev = "" 14RDEPENDS_${PN}-dev = ""
15 15
16SRCREV = "2e48d16e4a230069884ac0585ae111037f4171fb" 16SRCREV = "93d06fb27d7eae9290db33b6684916a225939f0b"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index c53217a3..32f6ebf3 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -27,4 +27,4 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
27 27
28DEPENDS += "qtbase" 28DEPENDS += "qtbase"
29 29
30SRCREV = "7ebf02ea3e8e91b13eb2d34847c005d8a487e9da" 30SRCREV = "a5e814fd8809dd6a8a3c3efd4b911b36e3325a2a"
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index a422544b..4fbd15b1 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
15 15
16DEPENDS += "qtbase qtdeclarative" 16DEPENDS += "qtbase qtdeclarative"
17 17
18SRCREV = "d8d4a5e9ac1251e82d1ec639bc3bff7e7f53c083" 18SRCREV = "fbaca62cd0a7309f04bf82101c8e20dbbf423192"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index c95844c5..f32a8e13 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
15 15
16DEPENDS += "qtbase" 16DEPENDS += "qtbase"
17 17
18SRCREV = "2575d33fab4042baba67384f92119c58c0ce0245" 18SRCREV = "02e4a66a8bd9ce4d2f7f8c89cd1bddf4b6385b5f"
diff --git a/recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch b/recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch
index 4c9c643d..c0e13898 100644
--- a/recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch
+++ b/recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch
@@ -1,4 +1,4 @@
1From d539c7e4ef98fd4933573eac606a4edee6655d8c Mon Sep 17 00:00:00 2001 1From f3b363acbe125c1eb1f1d4cf28973d2914cda024 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 5 Nov 2015 12:25:05 +0100 3Date: Thu, 5 Nov 2015 12:25:05 +0100
4Subject: [PATCH] textobject.pro: use DEPLOYMENT only for wince like other 4Subject: [PATCH] textobject.pro: use DEPLOYMENT only for wince like other
@@ -26,5 +26,5 @@ index 794ad32..0ecd2c7 100644
26+ DEPLOYMENT += filesToDeploy 26+ DEPLOYMENT += filesToDeploy
27+} 27+}
28-- 28--
292.6.2 292.7.0
30 30
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 57e9b4fa..d2699f70 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -13,6 +13,6 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "9ee5ee12a7b92a57624dafed935b3ac1fad426d9" 16SRCREV = "a9ac71a443260de66f720f0184646847b03fcb46"
17 17
18SRC_URI += "file://0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch" 18SRC_URI += "file://0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch"
diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb
index 9d9d245d..868e051d 100644
--- a/recipes-qt/qt5/qtsystems_git.bb
+++ b/recipes-qt/qt5/qtsystems_git.bb
@@ -33,4 +33,4 @@ QT_MODULE_BRANCH = "dev"
33# qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 33# qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1
34# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.6 34# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.6
35 35
36SRCREV = "0577ffca58b7fed78c1820fc1c2b7ab3533d5698" 36SRCREV = "cc2077700bd5503d1fcf53aef83cbb76975e745a"
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 e743a352..45a4fc73 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 @@
1From 0fb675dfdff64a270b92d768bedc0d6b355675b4 Mon Sep 17 00:00:00 2001 1From a6f3bde30cb78e109a26fec6b336f8a504d4fa3c Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.jansa@gmail.com> 2From: Martin Jansa <Martin.jansa@gmail.com>
3Date: Wed, 11 Sep 2013 18:30:08 +0200 3Date: Wed, 11 Sep 2013 18:30:08 +0200
4Subject: [PATCH 1/4] Allow to build only lrelease + lupdate + lconvert 4Subject: [PATCH 1/4] Allow to build only lrelease + lupdate + lconvert
@@ -157,5 +157,5 @@ index 20b5fec..8a42d1f 100644
157 installed_cmake.depends = cmake 157 installed_cmake.depends = cmake
158 158
159-- 159--
1602.6.2 1602.7.0
161 161
diff --git a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
index 754213fe..c4c0a14d 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 @@
1From d480a725a36482f7a1df52c5c170961382a8e730 Mon Sep 17 00:00:00 2001 1From 1140fd4bb5768d49cad9e834a9ce5eb05b711d0e Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Fri, 17 Jan 2014 14:33:19 +0100 3Date: Fri, 17 Jan 2014 14:33:19 +0100
4Subject: [PATCH 2/4] assistant/help: fix linking of dependent libraries 4Subject: [PATCH 2/4] assistant/help: fix linking of dependent libraries
@@ -28,5 +28,5 @@ index 168d23d..a9c3b59 100644
28+ 28+
29+LIBS += -lQt5CLucene 29+LIBS += -lQt5CLucene
30-- 30--
312.6.2 312.7.0
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 3e87400b..81b511f4 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 @@
1From d26b82742e20d4fff96856f7b9a7828ccb1aea68 Mon Sep 17 00:00:00 2001 1From a0637f231d513dfc15f1eec185d5d5e7fb03e292 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Wed, 4 Jun 2014 11:28:16 +0200 3Date: Wed, 4 Jun 2014 11:28:16 +0200
4Subject: [PATCH 3/4] add noqtwebkit configuration 4Subject: [PATCH 3/4] add noqtwebkit configuration
@@ -47,5 +47,5 @@ index 500a153..b60fa2d 100644
47 win32: qtHaveModule(axcontainer): SUBDIRS += activeqt 47 win32: qtHaveModule(axcontainer): SUBDIRS += activeqt
48 qtHaveModule(quickwidgets): SUBDIRS += qquickwidget 48 qtHaveModule(quickwidgets): SUBDIRS += qquickwidget
49-- 49--
502.6.2 502.7.0
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 55e7ec54..0e7061a9 100644
--- a/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch
+++ b/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch
@@ -1,4 +1,4 @@
1From eb882650473cea1cd71cef7813512b381429fd5c Mon Sep 17 00:00:00 2001 1From 3f1754dec603e3508a45f3e1800edf0a44411084 Mon Sep 17 00:00:00 2001
2From: Cody P Schafer <dev@codyps.com> 2From: Cody P Schafer <dev@codyps.com>
3Date: Thu, 9 Jul 2015 11:28:19 -0400 3Date: Thu, 9 Jul 2015 11:28:19 -0400
4Subject: [PATCH 4/4] linguist-tools cmake: allow overriding the location for 4Subject: [PATCH 4/4] linguist-tools cmake: allow overriding the location for
@@ -59,5 +59,5 @@ index 4318b16..2e3b70f 100644
59 59
60 set_target_properties(Qt5::lconvert PROPERTIES 60 set_target_properties(Qt5::lconvert PROPERTIES
61-- 61--
622.6.2 622.7.0
63 63
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 8c22e757..89916337 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -3,9 +3,9 @@ require qt5-git.inc
3 3
4LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 4LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPLv21;md5=d3bb688e8d381a9fa5ee9063114b366d \
7 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv3;md5=3fd06ee442011942b532cc6dedb0b39c \
8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.GPLv3;md5=a40e2bb02b1ac431f461afd03ff9d1d6 \
9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
11" 11"
@@ -31,6 +31,6 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
31EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" 31EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
32EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" 32EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}"
33 33
34SRCREV = "57301c0003e9d776d31953f1411cc06a395b752e" 34SRCREV = "05206b44cf25ca6a895cc9a8716f2b7f2f14191f"
35 35
36BBCLASSEXTEND = "native nativesdk" 36BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 72a29b3b..5d3818e7 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -104,4 +104,4 @@ FILES_${PN}-qt = " \
104 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ 104 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \
105" 105"
106 106
107SRCREV = "9c6d1af76ac28de8d59be344ea3a21b2607fa118" 107SRCREV = "ce85e4ee4ee22e5dea3b44707a27dab44319708e"
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb
index ba07591a..b164a670 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
28SRCREV = "bd21beea9a433a8878c0e719a7bfb8c14df47840" 28SRCREV = "bebe9beff3e9874498474cec32634cf281ddc453"
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 8b539b69..06168e32 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 @@
1From 7c34dff33e7669e9227df548c8ab08a850c72e39 Mon Sep 17 00:00:00 2001 1From 8841d31cb66fda833dc0ae557f13887716f4c46b Mon Sep 17 00:00:00 2001
2From: Simon Busch <morphis@gravedo.de> 2From: Simon Busch <morphis@gravedo.de>
3Date: Fri, 19 Jul 2013 13:35:14 +0000 3Date: Fri, 19 Jul 2013 13:35:14 +0000
4Subject: [PATCH] Install the qtwaylandscanner tool to the native side 4Subject: [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--
312.6.1 312.7.0
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 27dada21..36047570 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 @@
1From e3469724404a8afaa51939e17fc85f6cb40b5196 Mon Sep 17 00:00:00 2001 1From efec881d1bff247e6452a10a60821612c2585c67 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 22 Feb 2014 17:47:44 +0100 3Date: Sat, 22 Feb 2014 17:47:44 +0100
4Subject: [PATCH] examples/wayland: include server-buffer only when building 4Subject: [PATCH] examples/wayland: include server-buffer only when building
@@ -27,5 +27,5 @@ index d633fb9..643c7cd 100644
27+ } 27+ }
28 } 28 }
29-- 29--
302.6.1 302.7.0
31 31
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 128794c9..78d8a3eb 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -36,4 +36,4 @@ SRC_URI += " \
36 file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ 36 file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \
37" 37"
38 38
39SRCREV = "bd21beea9a433a8878c0e719a7bfb8c14df47840" 39SRCREV = "bebe9beff3e9874498474cec32634cf281ddc453"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index e070d13d..eb4475b6 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
15 15
16DEPENDS += "qtdeclarative qtwebsockets" 16DEPENDS += "qtdeclarative qtwebsockets"
17 17
18SRCREV = "97577a0f27a1f427948871ae535645a2e0788bf7" 18SRCREV = "3fa1c9d2cf5e00e7431d042e7955a6dd75e6e2b1"
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 b6500ea0..a1ea375f 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,8 +1,8 @@
1From 53e16d6f07005c1176455a4488cd8f93218e3cde Mon Sep 17 00:00:00 2001 1From 90d2f7aefa8922c3aa29e6907c1520c814d1797f Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Fri, 3 Oct 2014 03:52:11 +0200 3Date: Fri, 3 Oct 2014 03:52:11 +0200
4Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc 4Subject: [PATCH 1/2] <chromium> base.gypi: include
5 when building for x64 arch 5 atomicops_internals_x86_gcc.cc when building for x64 arch
6 6
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8--- 8---
@@ -23,5 +23,5 @@ index b860735..0ed5de3 100644
23 ['include', 'atomicops_internals_x86_gcc.cc'], 23 ['include', 'atomicops_internals_x86_gcc.cc'],
24 ], 24 ],
25-- 25--
262.6.1 262.7.0
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 ce76afa6..88d4826e 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 @@
1From 38efc016f223a1277bd3a92e4c78ac816adbcdaa Mon Sep 17 00:00:00 2001 1From f052458fe39733602751f9f9a09d1c0d78bea421 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 30 Jun 2014 20:08:17 +0200 3Date: Mon, 30 Jun 2014 20:08:17 +0200
4Subject: [PATCH 1/3] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H 4Subject: [PATCH 1/5] 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
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
@@ -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
12diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf 12diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
13index d5265ab..2825457 100644 13index 2df689b..8d984c7 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@@ -113,9 +113,9 @@ defineReplace(mocOutput) { 16@@ -131,9 +131,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 d5265ab..2825457 100644
26 } 26 }
27 27
28-- 28--
292.6.2 292.7.0
30 30
diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-jpeg_codec.cc_Change-false-to-FALSE-and-1-to-TRUE.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
index 3707cbeb..1227d0a0 100644
--- a/recipes-qt/qt5/qtwebengine/0001-chromium-jpeg_codec.cc_Change-false-to-FALSE-and-1-to-TRUE.patch
+++ b/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
@@ -1,9 +1,11 @@
1From 54b183ada5b5ead1c4b6e6532e24d21f372d70d7 Mon Sep 17 00:00:00 2001 1From a015bddaf2005cac376be7dda4603637afc5844c Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com> 2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Thu, 24 Dec 2015 12:46:58 -0200 3Date: Thu, 24 Dec 2015 12:46:58 -0200
4Subject: [PATCH] Change false to FALSE and 1 to TRUE, FIX qtwebengine compile 4Subject: [PATCH 2/2] chromium: Change false to FALSE and 1 to TRUE, FIX
5 qtwebengine compile
5 6
6Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> 7Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7--- 9---
8 src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc | 12 ++++++------ 10 src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc | 12 ++++++------
9 1 file changed, 6 insertions(+), 6 deletions(-) 11 1 file changed, 6 insertions(+), 6 deletions(-)
@@ -60,5 +62,5 @@ index 8a08fe0..32b2a05 100644
60 // we want to always get RGB data out 62 // we want to always get RGB data out
61 switch (cinfo.jpeg_color_space) { 63 switch (cinfo.jpeg_color_space) {
62-- 64--
631.8.1.2 652.7.0
64 66
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 f2dcaed2..dbc1e24e 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 @@
1From ebfec8ca32379bffd18cbab1f4335a458fcc7e41 Mon Sep 17 00:00:00 2001 1From 5f6389fe3493420c2afeec8f2786165f1d08901a Mon Sep 17 00:00:00 2001
2From: Simon Busch <morphis@gravedo.de> 2From: Simon Busch <morphis@gravedo.de>
3Date: Tue, 18 Nov 2014 10:38:18 +0100 3Date: Tue, 18 Nov 2014 10:38:18 +0100
4Subject: [PATCH 2/3] functions.prf: Make sure we only use the file name to 4Subject: [PATCH 2/5] 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
7Signed-off-by: Simon Busch <morphis@gravedo.de> 7Signed-off-by: Simon Busch <morphis@gravedo.de>
@@ -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
13diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf 13diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
14index 2825457..f761b64 100644 14index 8d984c7..055e960 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@@ -110,7 +110,8 @@ defineReplace(findIncludedMocFiles) { 17@@ -128,7 +128,8 @@ defineReplace(findIncludedMocFiles) {
18 } 18 }
19 19
20 defineReplace(mocOutput) { 20 defineReplace(mocOutput) {
@@ -25,5 +25,5 @@ index 2825457..f761b64 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--
282.6.2 282.7.0
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 a3ea02a7..28960ed4 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,27 +1,33 @@
1From daf1deee393576f86b22178a7cc18717962cb68e Mon Sep 17 00:00:00 2001 1From 348a74cb924cf6ac4384069d84ee3995644b2ce1 Mon Sep 17 00:00:00 2001
2From: Frieder Schrempf <frieder.schrempf@online.de> 2From: Frieder Schrempf <frieder.schrempf@online.de>
3Date: Mon, 1 Dec 2014 14:34:40 +0000 3Date: Mon, 1 Dec 2014 14:34:40 +0000
4Subject: [PATCH 3/3] functions.prf: allow build for linux-oe-g++ platform 4Subject: [PATCH 3/5] functions.prf: allow build for linux-oe-g++ platform
5 5
6Upstream-Status: Inappropriate [OE specific] 6Upstream-Status: Inappropriate [OE specific]
7 7
8Signed-off-by: Frieder Schrempf <frieder.schrempf@online.de> 8Signed-off-by: Frieder Schrempf <frieder.schrempf@online.de>
9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10--- 10---
11 tools/qmake/mkspecs/features/functions.prf | 2 +- 11 tools/qmake/mkspecs/features/functions.prf | 6 ++++++
12 1 file changed, 1 insertion(+), 1 deletion(-) 12 1 file changed, 6 insertions(+)
13 13
14diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf 14diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
15index f761b64..ab5f018 100644 15index 055e960..379c9b5 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@@ -1,5 +1,5 @@ 18@@ -5,6 +5,12 @@ defineTest(isPlatformSupported) {
19 defineTest(isPlatformSupported) { 19 return(false)
20- !linux-g++*:!linux-clang:!win32-msvc2013*:!win32-msvc2015*:!macx-clang*:!boot2qt { 20 }
21+ !linux-g++*:!linux-oe-g++*:!linux-clang:!win32-msvc2013*:!win32-msvc2015*:!macx-clang*:!boot2qt { 21 gcc:!clang:!isGCCVersionSupported(): return(false)
22 skipBuild("Qt WebEngine can currently only be built for Linux (GCC/clang), Windows (MSVC 2013 or 2015), OS X (10.9/XCode 5.1+) or Qt for Device Creation.") 22+ } else:linux-oe-g++* {
23 return(false) 23+ !gcc:!clang {
24 } 24+ skipBuild("Qt WebEngine on Linux requires clang or GCC.")
25+ return(false)
26+ }
27+ gcc:!clang:!isGCCVersionSupported(): return(false)
28 } else:win32 {
29 winrt {
30 skipBuild("WinRT is not supported.")
25-- 31--
262.6.2 322.7.0
27 33
diff --git a/recipes-qt/qt5/qtwebengine/0003-WebEngine-qquickwebengineview_p_p.h-add-inc-QColor.patch b/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
index 544db3ac..4a3deb9b 100644
--- a/recipes-qt/qt5/qtwebengine/0003-WebEngine-qquickwebengineview_p_p.h-add-inc-QColor.patch
+++ b/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
@@ -1,15 +1,15 @@
1From 741f83397be4157cd34386f619f6d74fca4da149 Mon Sep 17 00:00:00 2001 1From 80f5e26073ef58c1a2ff510c6ccdb7423bcb2fc3 Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com> 2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Fri, 25 Dec 2015 18:16:05 -0200 3Date: Fri, 25 Dec 2015 18:16:05 -0200
4Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor 4Subject: [PATCH 4/5] WebEngine qquickwebengineview_p_p.h add include QColor
5 5
6Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> 6Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
7--- 7---
8 qquickwebengineview_p_p.h | 2 ++ 8 src/webengine/api/qquickwebengineview_p_p.h | 2 ++
9 1 file changed, 2 insertions(+) 9 1 file changed, 2 insertions(+)
10 10
11diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h 11diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
12index c221085..d39aba7 100644 12index dbbbf91..94268b6 100644
13--- a/src/webengine/api/qquickwebengineview_p_p.h 13--- a/src/webengine/api/qquickwebengineview_p_p.h
14+++ b/src/webengine/api/qquickwebengineview_p_p.h 14+++ b/src/webengine/api/qquickwebengineview_p_p.h
15@@ -56,6 +56,8 @@ 15@@ -56,6 +56,8 @@
@@ -22,5 +22,5 @@ index c221085..d39aba7 100644
22 namespace QtWebEngineCore { 22 namespace QtWebEngineCore {
23 class WebContentsAdapter; 23 class WebContentsAdapter;
24-- 24--
251.8.1.2 252.7.0
26 26
diff --git a/recipes-qt/qt5/qtwebengine/0002-media_capture_devices_dispatcher.h-Include-QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch
index 1b637cbf..6fd9e499 100644
--- a/recipes-qt/qt5/qtwebengine/0002-media_capture_devices_dispatcher.h-Include-QCoreApplication-translate.patch
+++ b/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch
@@ -1,7 +1,7 @@
1From 23e391f08f36d9ab9c0030ae52b3821ec9f3c3ed Mon Sep 17 00:00:00 2001 1From b3f3154e4852a830fdc4e311d4f5105fc337e8f2 Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com> 2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Thu, 24 Dec 2015 15:59:51 -0200 3Date: Thu, 24 Dec 2015 15:59:51 -0200
4Subject: [PATCH] Include dependency to QCoreApplication::translate() 4Subject: [PATCH 5/5] Include dependency to QCoreApplication::translate()
5 5
6Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> 6Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
7--- 7---
@@ -22,5 +22,5 @@ index 500fe76..eda2824 100644
22 22
23 #include "base/callback.h" 23 #include "base/callback.h"
24-- 24--
251.8.1.2 252.7.0
26 26
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 76609322..47d3613d 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -111,14 +111,14 @@ SRC_URI += " \
111 file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ 111 file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \
112 file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \ 112 file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \
113 file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \ 113 file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \
114 file://0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \
115 file://0005-Include-dependency-to-QCoreApplication-translate.patch \
114 file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \ 116 file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \
115 file://0002-media_capture_devices_dispatcher.h-Include-QCoreApplication-translate.patch \ 117 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \
116 file://0003-WebEngine-qquickwebengineview_p_p.h-add-inc-QColor.patch \
117 file://0001-chromium-jpeg_codec.cc_Change-false-to-FALSE-and-1-to-TRUE.patch \
118" 118"
119 119
120SRCREV_qtwebengine = "40ef43e0d69c4a86c9430b7f264d2cde6340ee0f" 120SRCREV_qtwebengine = "3f02c25de46f5ff296b8189af3435ce5800b39a7"
121SRCREV_chromium = "ec5b3304fc266dfdec7666b8b73d57a3971ea35f" 121SRCREV_chromium = "779a2388fc123a7f3a178ce2ced921ee4a307e2c"
122SRCREV = "${SRCREV_qtwebengine}" 122SRCREV = "${SRCREV_qtwebengine}"
123 123
124SRCREV_FORMAT = "qtwebengine_chromium" 124SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb
index a0d4e9fd..63d02fac 100644
--- a/recipes-qt/qt5/qtwebkit-examples_git.bb
+++ b/recipes-qt/qt5/qtwebkit-examples_git.bb
@@ -19,4 +19,4 @@ DEPENDS += "qtwebkit qtxmlpatterns"
19RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" 19RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
20RDEPENDS_${PN}-examples += "${@base_contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" 20RDEPENDS_${PN}-examples += "${@base_contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"
21 21
22SRCREV = "7988aecdbcb07f3a214c2c804a39db3fc5617844" 22SRCREV = "1b9a0fc9d1ded4f4f11b04eb0bb7d1de82d6eb34"
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 33e7dd28..e8b0e432 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 @@
1From a5aae8adf808bb07b0326edbf2dc66bfb4917963 Mon Sep 17 00:00:00 2001 1From 1735a8484ef9ae336f8d607b56bda64c8af10c79 Mon Sep 17 00:00:00 2001
2From: Trevor Woerner <trevor.woerner@linaro.org> 2From: Trevor Woerner <trevor.woerner@linaro.org>
3Date: Fri, 7 Feb 2014 04:07:17 +0100 3Date: Fri, 7 Feb 2014 04:07:17 +0100
4Subject: [PATCH 1/3] qtwebkit: fix QA issue (bad RPATH) 4Subject: [PATCH 1/3] qtwebkit: fix QA issue (bad RPATH)
@@ -26,5 +26,5 @@ index fd66af6..ef754c3 100644
26 CONFIG(debug, debug|release)|force_debug_info { 26 CONFIG(debug, debug|release)|force_debug_info {
27 # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. 27 # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
28-- 28--
292.6.1 292.7.0
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 3c3b4893..b3a86159 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 @@
1From 08e983e065acce369aa95e3fcb5b7fe6ca563e04 Mon Sep 17 00:00:00 2001 1From ae16ce17cc7060274a0b0c165b953fc32540f977 Mon Sep 17 00:00:00 2001
2From: Magnus Granberg <zorry@gentoo.org> 2From: Magnus Granberg <zorry@gentoo.org>
3Date: Fri, 27 Feb 2015 11:55:09 +0100 3Date: Fri, 27 Feb 2015 11:55:09 +0100
4Subject: [PATCH 2/3] Remove TEXTREL tag in x86 4Subject: [PATCH 2/3] Remove TEXTREL tag in x86
@@ -75,5 +75,5 @@ index 0a2fe78..2dc40ef 100644
75 #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) 75 #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name)
76 #endif 76 #endif
77-- 77--
782.6.1 782.7.0
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 44650931..43798666 100644
--- a/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
+++ b/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
@@ -1,4 +1,4 @@
1From d4ea11922ebaf865f0b0c57e6746d6b985bf840f Mon Sep 17 00:00:00 2001 1From 6c36f0ff8c1f5852c33d2b23714f9f187cc6ff26 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 5 Jun 2015 19:55:05 -0700 3Date: Fri, 5 Jun 2015 19:55:05 -0700
4Subject: [PATCH 3/3] Exclude backtrace() API for non-glibc libraries 4Subject: [PATCH 3/3] Exclude backtrace() API for non-glibc libraries
@@ -34,5 +34,5 @@ index 1b2091f..ba03a28 100644
34 #elif OS(WINDOWS) && !OS(WINCE) 34 #elif OS(WINDOWS) && !OS(WINCE)
35 // The CaptureStackBackTrace function is available in XP, but it is not defined 35 // The CaptureStackBackTrace function is available in XP, but it is not defined
36-- 36--
372.6.1 372.7.0
38 38
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index a9523065..559efacb 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -65,4 +65,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db
65RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" 65RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
66export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" 66export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
67 67
68SRCREV = "93cc8d306f8033551fb60e2e1f8f480330778a21" 68SRCREV = "d2ff5a085572b1ee24dcb42ae107063f3142d14e"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index 6aea0a6f..fbce6be6 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtdeclarative" 12DEPENDS += "qtbase qtdeclarative"
13 13
14SRCREV = "469f748515b65cd4c9bec8794ec37ca6cf5df026" 14SRCREV = "2d8c94cf11097b61689757f8a0162bb7dd9d7d0b"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index ac33fb26..0ae8e4a2 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "d64ee96f0df4d3baa6959b8552bc59d53cb0b451" 16SRCREV = "5df9fa8f3a7209c067a5d5068776b9aa52273d3b"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 4b511d0c..c4245628 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -13,6 +13,6 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "94136d42805abeaf3dd9d6ded7b74e3d27fd3777" 16SRCREV = "a8d103a05bc195dd045779f3aebdf67bd0140df1"
17 17
18BBCLASSEXTEND =+ "native nativesdk" 18BBCLASSEXTEND =+ "native nativesdk"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 21:33:52 +0000