diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-06 08:07:33 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-06 08:07:33 +0300 |
commit | 7d0ec758e43f46f067464da0a4f4f94dbfec9556 (patch) | |
tree | a7f3d2c0b284ab8d52bd7ee229e0052394cf98ed | |
parent | 1716c294770b10e41af1b11cbe820ca857168556 (diff) | |
parent | c1deb9aafe5fe20de1175944ed863e6d94dad71b (diff) | |
download | meta-qt5-7d0ec758e43f46f067464da0a4f4f94dbfec9556.tar.gz |
Merge remote-tracking branch 'qtyocto/5.12' into 5.13
* qtyocto/5.12:
ogl-runtime: Fix format-security issues
ogl-runtime: fix build errors
qtvirtualkeyboard: update supported layouts
qt3d-runtime: update to ogl-runtime v2.4
qtbase: update module
qt5: update submodules
qt5: update submodules
qtbase: fix build with gcc-9
qtlocation: add PACKAGECONFIGs for geoservices
qmake5_base.bbclass: Don't expand find -name search patterns
qt5: update submodules
Change-Id: Id6648d939ba54df0719660ace40d45fa3f1e1fbe
-rw-r--r-- | classes/qmake5_base.bbclass | 6 | ||||
-rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 8 | ||||
-rw-r--r-- | recipes-qt/qt5/ogl-runtime/0001-Fix-examples-build-error.patch | 62 | ||||
-rw-r--r-- | recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch | 75 | ||||
-rw-r--r-- | recipes-qt/qt5/ogl-runtime_git.bb | 27 | ||||
-rw-r--r-- | recipes-qt/qt5/qt3d-runtime_git.bb | 16 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 10 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch (renamed from recipes-qt/qt5/qtbase/0017-Always-build-uic-and-qvkgen.patch) | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch (renamed from recipes-qt/qt5/qtbase/0018-Avoid-renameeat2-for-native-sdk-builds.patch) | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch (renamed from recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch) | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtlocation_git.bb | 5 | ||||
-rw-r--r-- | recipes-qt/qt5/qtvirtualkeyboard_git.bb | 22 |
13 files changed, 207 insertions, 32 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index fb5f9364..3f1bba23 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass | |||
@@ -242,17 +242,17 @@ qmake5_base_do_install() { | |||
242 | qmake5_base_fix_install ${STAGING_DIR_NATIVE} | 242 | qmake5_base_fix_install ${STAGING_DIR_NATIVE} |
243 | 243 | ||
244 | # Replace host paths with qmake built-in properties | 244 | # Replace host paths with qmake built-in properties |
245 | find ${D} \( -name *.pri -or -name *.prl \) -exec \ | 245 | find ${D} \( -name "*.pri" -or -name "*.prl" \) -exec \ |
246 | sed -i -e 's|${STAGING_DIR_NATIVE}|$$[QT_HOST_PREFIX/get]|g' \ | 246 | sed -i -e 's|${STAGING_DIR_NATIVE}|$$[QT_HOST_PREFIX/get]|g' \ |
247 | -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' {} \; | 247 | -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' {} \; |
248 | 248 | ||
249 | # Replace host paths with pkg-config built-in variable | 249 | # Replace host paths with pkg-config built-in variable |
250 | find ${D} -name *.pc -exec \ | 250 | find ${D} -name "*.pc" -exec \ |
251 | sed -i -e 's|prefix=${STAGING_DIR_HOST}|prefix=|g' \ | 251 | sed -i -e 's|prefix=${STAGING_DIR_HOST}|prefix=|g' \ |
252 | -e 's|${STAGING_DIR_HOST}|${pc_sysrootdir}|g' {} \; | 252 | -e 's|${STAGING_DIR_HOST}|${pc_sysrootdir}|g' {} \; |
253 | 253 | ||
254 | # Replace resolved lib path with the lib name | 254 | # Replace resolved lib path with the lib name |
255 | find ${D} -name *.cmake -exec \ | 255 | find ${D} -name "*.cmake" -exec \ |
256 | sed -i -e 's@/[^;]*/lib\([^;]*\)\.\(so\|a\)@\1@g' {} \; | 256 | sed -i -e 's@/[^;]*/lib\([^;]*\)\.\(so\|a\)@\1@g' {} \; |
257 | 257 | ||
258 | } | 258 | } |
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 739c12bf..9688c380 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -23,7 +23,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" | |||
23 | 23 | ||
24 | # common for qtbase-native, qtbase-nativesdk and qtbase | 24 | # common for qtbase-native, qtbase-nativesdk and qtbase |
25 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared | 25 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared |
26 | # 5.12.meta-qt5-shared.7 | 26 | # 5.12.meta-qt5-shared.8 |
27 | SRC_URI += "\ | 27 | SRC_URI += "\ |
28 | file://0001-Add-linux-oe-g-platform.patch \ | 28 | file://0001-Add-linux-oe-g-platform.patch \ |
29 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ | 29 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ |
@@ -45,10 +45,10 @@ SRC_URI += "\ | |||
45 | 45 | ||
46 | # common for qtbase-native and nativesdk-qtbase | 46 | # common for qtbase-native and nativesdk-qtbase |
47 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native | 47 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native |
48 | # 5.12.meta-qt5-native.7 | 48 | # 5.12.meta-qt5-native.8 |
49 | SRC_URI += " \ | 49 | SRC_URI += " \ |
50 | file://0017-Always-build-uic-and-qvkgen.patch \ | 50 | file://0018-Always-build-uic-and-qvkgen.patch \ |
51 | file://0018-Avoid-renameeat2-for-native-sdk-builds.patch \ | 51 | file://0019-Avoid-renameeat2-for-native-sdk-builds.patch \ |
52 | " | 52 | " |
53 | 53 | ||
54 | # CMake's toolchain configuration of nativesdk-qtbase | 54 | # CMake's toolchain configuration of nativesdk-qtbase |
diff --git a/recipes-qt/qt5/ogl-runtime/0001-Fix-examples-build-error.patch b/recipes-qt/qt5/ogl-runtime/0001-Fix-examples-build-error.patch new file mode 100644 index 00000000..0d2f165f --- /dev/null +++ b/recipes-qt/qt5/ogl-runtime/0001-Fix-examples-build-error.patch | |||
@@ -0,0 +1,62 @@ | |||
1 | From 4fa69c1c5396bded20edccb2a1dd9b61f0b1140d Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Fri, 2 Aug 2019 12:39:50 +0300 | ||
4 | Subject: [PATCH] Fix examples build error | ||
5 | |||
6 | Add workaround for QTBUG-77288 which causes examples to fail to build | ||
7 | |||
8 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | ||
9 | --- | ||
10 | examples/studio3d/cppdatainput/cppdatainput.pro | 1 + | ||
11 | examples/studio3d/dynamicelement/dynamicelement.pro | 1 + | ||
12 | examples/studio3d/qmldatainput/qmldatainput.pro | 1 + | ||
13 | examples/studio3d/simpleqml/simpleqml.pro | 1 + | ||
14 | 4 files changed, 4 insertions(+) | ||
15 | |||
16 | diff --git a/examples/studio3d/cppdatainput/cppdatainput.pro b/examples/studio3d/cppdatainput/cppdatainput.pro | ||
17 | index 20b5c68..bbb403a 100644 | ||
18 | --- a/examples/studio3d/cppdatainput/cppdatainput.pro | ||
19 | +++ b/examples/studio3d/cppdatainput/cppdatainput.pro | ||
20 | @@ -1,5 +1,6 @@ | ||
21 | CONFIG += c++11 | ||
22 | QT += widgets qml quick studio3d | ||
23 | +QMAKE_LIBS += $$QMAKE_LIBS_3DSQMLSTREAMER $$QMAKE_LIBS_3DSOPENGL | ||
24 | |||
25 | target.path = $$[QT_INSTALL_EXAMPLES]/studio3d/$$TARGET | ||
26 | INSTALLS += target | ||
27 | diff --git a/examples/studio3d/dynamicelement/dynamicelement.pro b/examples/studio3d/dynamicelement/dynamicelement.pro | ||
28 | index 1b804fd..ae3c005 100644 | ||
29 | --- a/examples/studio3d/dynamicelement/dynamicelement.pro | ||
30 | +++ b/examples/studio3d/dynamicelement/dynamicelement.pro | ||
31 | @@ -1,6 +1,7 @@ | ||
32 | TEMPLATE = app | ||
33 | |||
34 | QT += qml quick studio3d | ||
35 | +QMAKE_LIBS += $$QMAKE_LIBS_3DSQMLSTREAMER $$QMAKE_LIBS_3DSOPENGL | ||
36 | |||
37 | SOURCES += \ | ||
38 | demo.cpp \ | ||
39 | diff --git a/examples/studio3d/qmldatainput/qmldatainput.pro b/examples/studio3d/qmldatainput/qmldatainput.pro | ||
40 | index 9bafed5..496c2c1 100644 | ||
41 | --- a/examples/studio3d/qmldatainput/qmldatainput.pro | ||
42 | +++ b/examples/studio3d/qmldatainput/qmldatainput.pro | ||
43 | @@ -1,6 +1,7 @@ | ||
44 | TEMPLATE = app | ||
45 | |||
46 | QT += widgets qml quick studio3d | ||
47 | +QMAKE_LIBS += $$QMAKE_LIBS_3DSQMLSTREAMER $$QMAKE_LIBS_3DSOPENGL | ||
48 | |||
49 | integrity: DEFINES += USE_EMBEDDED_FONTS | ||
50 | |||
51 | diff --git a/examples/studio3d/simpleqml/simpleqml.pro b/examples/studio3d/simpleqml/simpleqml.pro | ||
52 | index 62afa78..1a0784b 100644 | ||
53 | --- a/examples/studio3d/simpleqml/simpleqml.pro | ||
54 | +++ b/examples/studio3d/simpleqml/simpleqml.pro | ||
55 | @@ -1,6 +1,7 @@ | ||
56 | TEMPLATE = app | ||
57 | |||
58 | QT += widgets qml quick studio3d | ||
59 | +QMAKE_LIBS += $$QMAKE_LIBS_3DSQMLSTREAMER $$QMAKE_LIBS_3DSOPENGL | ||
60 | |||
61 | SOURCES += \ | ||
62 | main.cpp | ||
diff --git a/recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch b/recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch new file mode 100644 index 00000000..fcf6915d --- /dev/null +++ b/recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch | |||
@@ -0,0 +1,75 @@ | |||
1 | From c80b588cc3e11a80ffedd778fab3f19c686552f7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Mon, 5 Aug 2019 14:24:44 +0300 | ||
4 | Subject: [PATCH] Fix format-security issues | ||
5 | |||
6 | format not a string literal and no format arguments [-Wformat-security] | ||
7 | |||
8 | Change-Id: I04c1d1598948b664b9d85036030c6f89fcf3c8b7 | ||
9 | --- | ||
10 | src/render/backends/gl/Q3DSRenderBackendGLES2.cpp | 4 ++-- | ||
11 | src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp | 8 ++++---- | ||
12 | 2 files changed, 6 insertions(+), 6 deletions(-) | ||
13 | |||
14 | diff --git a/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp b/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp | ||
15 | index ac5b992..02046ac 100644 | ||
16 | --- a/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp | ||
17 | +++ b/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp | ||
18 | @@ -663,7 +663,7 @@ NVRenderBackendGLES2Impl::CreateRenderbuffer(NVRenderRenderBufferFormats::Enum s | ||
19 | // check for error | ||
20 | GLenum error = m_glFunctions->glGetError(); | ||
21 | if (error != GL_NO_ERROR) { | ||
22 | - qCCritical(GL_ERROR, GLConversion::processGLError(error)); | ||
23 | + qCCritical(GL_ERROR) << GLConversion::processGLError(error); | ||
24 | QT3DS_ASSERT(false); | ||
25 | GL_CALL_EXTRA_FUNCTION(glDeleteRenderbuffers(1, &bufID)); | ||
26 | bufID = 0; | ||
27 | @@ -699,7 +699,7 @@ bool NVRenderBackendGLES2Impl::ResizeRenderbuffer(NVRenderBackendRenderbufferObj | ||
28 | // check for error | ||
29 | GLenum error = m_glFunctions->glGetError(); | ||
30 | if (error != GL_NO_ERROR) { | ||
31 | - qCCritical(GL_ERROR, GLConversion::processGLError(error)); | ||
32 | + qCCritical(GL_ERROR) << GLConversion::processGLError(error); | ||
33 | QT3DS_ASSERT(false); | ||
34 | success = false; | ||
35 | } | ||
36 | diff --git a/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp b/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp | ||
37 | index 0fe6e0f..5dfe9d1 100644 | ||
38 | --- a/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp | ||
39 | +++ b/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp | ||
40 | @@ -604,7 +604,7 @@ NVRenderBackendGLBase::CreateBuffer(size_t size, NVRenderBufferBindFlags bindFla | ||
41 | } else { | ||
42 | GL_CALL_FUNCTION(glDeleteBuffers(1, &bufID)); | ||
43 | bufID = 0; | ||
44 | - qCCritical(GL_ERROR, GLConversion::processGLError(target)); | ||
45 | + qCCritical(GL_ERROR) << GLConversion::processGLError(target); | ||
46 | } | ||
47 | } | ||
48 | |||
49 | @@ -832,7 +832,7 @@ NVRenderBackendGLBase::CreateRenderbuffer(NVRenderRenderBufferFormats::Enum stor | ||
50 | // check for error | ||
51 | GLenum error = m_glFunctions->glGetError(); | ||
52 | if (error != GL_NO_ERROR) { | ||
53 | - qCCritical(GL_ERROR, GLConversion::processGLError(error)); | ||
54 | + qCCritical(GL_ERROR) << GLConversion::processGLError(error); | ||
55 | QT3DS_ASSERT(false); | ||
56 | GL_CALL_FUNCTION(glDeleteRenderbuffers(1, &bufID)); | ||
57 | bufID = 0; | ||
58 | @@ -869,7 +869,7 @@ bool NVRenderBackendGLBase::ResizeRenderbuffer(NVRenderBackendRenderbufferObject | ||
59 | // check for error | ||
60 | GLenum error = m_glFunctions->glGetError(); | ||
61 | if (error != GL_NO_ERROR) { | ||
62 | - qCCritical(GL_ERROR, GLConversion::processGLError(error)); | ||
63 | + qCCritical(GL_ERROR) << GLConversion::processGLError(error); | ||
64 | QT3DS_ASSERT(false); | ||
65 | success = false; | ||
66 | } | ||
67 | @@ -1306,7 +1306,7 @@ bool NVRenderBackendGLBase::compileSource(GLuint shaderID, NVConstDataRef<QT3DSI | ||
68 | GLenum binaryError = m_glFunctions->glGetError(); | ||
69 | if (binaryError != GL_NO_ERROR) { | ||
70 | shaderStatus = GL_FALSE; | ||
71 | - qCCritical(GL_ERROR, GLConversion::processGLError(binaryError)); | ||
72 | + qCCritical(GL_ERROR) << GLConversion::processGLError(binaryError); | ||
73 | } | ||
74 | } | ||
75 | |||
diff --git a/recipes-qt/qt5/ogl-runtime_git.bb b/recipes-qt/qt5/ogl-runtime_git.bb new file mode 100644 index 00000000..ecc8ba2b --- /dev/null +++ b/recipes-qt/qt5/ogl-runtime_git.bb | |||
@@ -0,0 +1,27 @@ | |||
1 | require qt5.inc | ||
2 | require qt5-git.inc | ||
3 | |||
4 | LICENSE = "GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial" | ||
5 | LIC_FILES_CHKSUM = " \ | ||
6 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | ||
7 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | ||
8 | " | ||
9 | |||
10 | DEPENDS += "qtbase qtdeclarative qtquickcontrols2" | ||
11 | |||
12 | QT_MODULE_BRANCH = "2.4" | ||
13 | QT_MODULE_BRANCH_EASTL = "master" | ||
14 | QT_GIT_PROJECT = "qt3dstudio" | ||
15 | PV = "2.4+git${SRCPV}" | ||
16 | |||
17 | SRC_URI += " \ | ||
18 | ${QT_GIT}/qt3dstudio-eastl.git;name=EASTL;branch=${QT_MODULE_BRANCH_EASTL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/EASTL \ | ||
19 | file://0001-Fix-examples-build-error.patch \ | ||
20 | file://0002-Fix-format-security-issues.patch \ | ||
21 | " | ||
22 | |||
23 | SRCREV_ogl-runtime = "a41270dced230d90e0e07f2ebb880e4f97317a7f" | ||
24 | SRCREV_EASTL = "31697c758f2ed19bd7c6bbe61f1b91f9e12035b5" | ||
25 | SRCREV = "${SRCREV_ogl-runtime}" | ||
26 | |||
27 | SRCREV_FORMAT = "ogl-runtime_EASTL" | ||
diff --git a/recipes-qt/qt5/qt3d-runtime_git.bb b/recipes-qt/qt5/qt3d-runtime_git.bb deleted file mode 100644 index fb018e58..00000000 --- a/recipes-qt/qt5/qt3d-runtime_git.bb +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | require qt5.inc | ||
2 | require qt5-git.inc | ||
3 | |||
4 | LICENSE = "GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial" | ||
5 | LIC_FILES_CHKSUM = " \ | ||
6 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | ||
7 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | ||
8 | " | ||
9 | |||
10 | DEPENDS += "qtbase qtdeclarative qt3d" | ||
11 | |||
12 | QT_MODULE_BRANCH = "2.3" | ||
13 | QT_GIT_PROJECT = "qt3dstudio" | ||
14 | PV = "2.3+git${SRCPV}" | ||
15 | |||
16 | SRCREV = "5e0bfe934b9930b7e41d457b4f88fce91342a0ea" | ||
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index d917595a..0cde79b5 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -18,7 +18,7 @@ require qt5-git.inc | |||
18 | 18 | ||
19 | # common for qtbase-native, qtbase-nativesdk and qtbase | 19 | # common for qtbase-native, qtbase-nativesdk and qtbase |
20 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared | 20 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared |
21 | # 5.12.meta-qt5-shared.7 | 21 | # 5.12.meta-qt5-shared.8 |
22 | SRC_URI += "\ | 22 | SRC_URI += "\ |
23 | file://0001-Add-linux-oe-g-platform.patch \ | 23 | file://0001-Add-linux-oe-g-platform.patch \ |
24 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ | 24 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ |
@@ -40,15 +40,15 @@ SRC_URI += "\ | |||
40 | 40 | ||
41 | # common for qtbase-native and nativesdk-qtbase | 41 | # common for qtbase-native and nativesdk-qtbase |
42 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native | 42 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native |
43 | # 5.12.meta-qt5-native.7 | 43 | # 5.12.meta-qt5-native.8 |
44 | SRC_URI += " \ | 44 | SRC_URI += " \ |
45 | file://0017-Always-build-uic-and-qvkgen.patch \ | 45 | file://0018-Always-build-uic-and-qvkgen.patch \ |
46 | file://0018-Avoid-renameeat2-for-native-sdk-builds.patch \ | 46 | file://0019-Avoid-renameeat2-for-native-sdk-builds.patch \ |
47 | " | 47 | " |
48 | 48 | ||
49 | # only for qtbase-native | 49 | # only for qtbase-native |
50 | SRC_URI += " \ | 50 | SRC_URI += " \ |
51 | file://0019-Bootstrap-without-linkat-feature.patch \ | 51 | file://0020-Bootstrap-without-linkat-feature.patch \ |
52 | " | 52 | " |
53 | 53 | ||
54 | CLEANBROKEN = "1" | 54 | CLEANBROKEN = "1" |
diff --git a/recipes-qt/qt5/qtbase/0017-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch index 69410925..7ae15d0a 100644 --- a/recipes-qt/qt5/qtbase/0017-Always-build-uic-and-qvkgen.patch +++ b/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4b0ca5d85afd944d1e5a3df545ba99566207c184 Mon Sep 17 00:00:00 2001 | 1 | From 0db28cf06f557a714f8cffafbfcdbe68378c8f8a 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] Always build uic and qvkgen | 4 | Subject: [PATCH] Always build uic and qvkgen |
diff --git a/recipes-qt/qt5/qtbase/0018-Avoid-renameeat2-for-native-sdk-builds.patch b/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch index 0ca038f5..b3c2c767 100644 --- a/recipes-qt/qt5/qtbase/0018-Avoid-renameeat2-for-native-sdk-builds.patch +++ b/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 69aeac9c7233e0d76a8a00b1a45c53c1670c9b49 Mon Sep 17 00:00:00 2001 | 1 | From 0c79a6761e75441f433fd397bc3b79e78b6c5ef8 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
3 | Date: Sun, 14 Apr 2019 13:27:58 +0200 | 3 | Date: Sun, 14 Apr 2019 13:27:58 +0200 |
4 | Subject: [PATCH] Avoid renameeat2 for native(sdk) builds | 4 | Subject: [PATCH] Avoid renameeat2 for native(sdk) builds |
diff --git a/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch index a1d08236..e681bfbb 100644 --- a/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch +++ b/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 703f89e35aaaec5ad781c222ae2dcd30f31320e9 Mon Sep 17 00:00:00 2001 | 1 | From d52010c7d58f1a25f51a909b3179df656ed9d9c4 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Fri, 24 Nov 2017 15:16:31 +0200 | 3 | Date: Fri, 24 Nov 2017 15:16:31 +0200 |
4 | Subject: [PATCH] Bootstrap without linkat feature | 4 | Subject: [PATCH] Bootstrap without linkat feature |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 5e4a89b2..b44b3d49 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ | |||
14 | 14 | ||
15 | # common for qtbase-native, qtbase-nativesdk and qtbase | 15 | # common for qtbase-native, qtbase-nativesdk and qtbase |
16 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared | 16 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared |
17 | # 5.12.meta-qt5-shared.7 | 17 | # 5.12.meta-qt5-shared.8 |
18 | SRC_URI += "\ | 18 | SRC_URI += "\ |
19 | file://0001-Add-linux-oe-g-platform.patch \ | 19 | file://0001-Add-linux-oe-g-platform.patch \ |
20 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ | 20 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 62c76b06..2b73bf9b 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -17,6 +17,11 @@ PACKAGECONFIG ??= "" | |||
17 | # older geoclue 0.12.99 is needed | 17 | # older geoclue 0.12.99 is needed |
18 | PACKAGECONFIG[geoclue] = ",,geoclue" | 18 | PACKAGECONFIG[geoclue] = ",,geoclue" |
19 | PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy" | 19 | PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy" |
20 | PACKAGECONFIG[geoservices_here] = "-feature-geoservices_here,-no-feature-geoservices_here" | ||
21 | PACKAGECONFIG[geoservices_mapbox] = "-feature-geoservices_mapbox,-no-feature-geoservices_mapbox" | ||
22 | PACKAGECONFIG[geoservices_esri] = "-feature-geoservices_esri,-no-feature-geoservices_esri" | ||
23 | PACKAGECONFIG[geoservices_itemsoverlay] = "-feature-geoservices_itemsoverlay,-no-feature-geoservices_itemsoverlay" | ||
24 | PACKAGECONFIG[geoservices_osm] = "-feature-geoservices_osm,-no-feature-geoservices_osm" | ||
20 | PACKAGECONFIG[geoservices_mapboxgl] = "-feature-geoservices_mapboxgl,-no-feature-geoservices_mapboxgl" | 25 | PACKAGECONFIG[geoservices_mapboxgl] = "-feature-geoservices_mapboxgl,-no-feature-geoservices_mapboxgl" |
21 | 26 | ||
22 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 27 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index b8026230..c83d8d4b 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb | |||
@@ -19,23 +19,45 @@ PACKAGECONFIG[t9write] = "CONFIG+=t9write" | |||
19 | PACKAGECONFIG[lipi-toolkit] = "CONFIG+=lipi-toolkit" | 19 | PACKAGECONFIG[lipi-toolkit] = "CONFIG+=lipi-toolkit" |
20 | PACKAGECONFIG[lang-all] = "CONFIG+=lang-all" | 20 | PACKAGECONFIG[lang-all] = "CONFIG+=lang-all" |
21 | PACKAGECONFIG[lang-ar_AR] = "CONFIG+=lang-ar_AR" | 21 | PACKAGECONFIG[lang-ar_AR] = "CONFIG+=lang-ar_AR" |
22 | PACKAGECONFIG[lang-bg_BG] = "CONFIG+=lang-bg_BG" | ||
23 | PACKAGECONFIG[lang-cs_CZ] = "CONFIG+=lang-cs_CZ" | ||
22 | PACKAGECONFIG[lang-da_DK] = "CONFIG+=lang-da_DK" | 24 | PACKAGECONFIG[lang-da_DK] = "CONFIG+=lang-da_DK" |
23 | PACKAGECONFIG[lang-de_DE] = "CONFIG+=lang-de_DE" | 25 | PACKAGECONFIG[lang-de_DE] = "CONFIG+=lang-de_DE" |
26 | PACKAGECONFIG[lang-el_GR] = "CONFIG+=lang-el_GR" | ||
24 | PACKAGECONFIG[lang-en_GB] = "CONFIG+=lang-en_GB" | 27 | PACKAGECONFIG[lang-en_GB] = "CONFIG+=lang-en_GB" |
28 | PACKAGECONFIG[lang-en_US] = "CONFIG+=lang-en_US" | ||
25 | PACKAGECONFIG[lang-es_ES] = "CONFIG+=lang-es_ES" | 29 | PACKAGECONFIG[lang-es_ES] = "CONFIG+=lang-es_ES" |
30 | PACKAGECONFIG[lang-es_MX] = "CONFIG+=lang-es_MX" | ||
31 | PACKAGECONFIG[lang-et_EE] = "CONFIG+=lang-et_EE" | ||
26 | PACKAGECONFIG[lang-fa_FA] = "CONFIG+=lang-fa_FA" | 32 | PACKAGECONFIG[lang-fa_FA] = "CONFIG+=lang-fa_FA" |
27 | PACKAGECONFIG[lang-fi_FI] = "CONFIG+=lang-fi_FI" | 33 | PACKAGECONFIG[lang-fi_FI] = "CONFIG+=lang-fi_FI" |
34 | PACKAGECONFIG[lang-fr_CA] = "CONFIG+=lang-fr_CA" | ||
28 | PACKAGECONFIG[lang-fr_FR] = "CONFIG+=lang-fr_FR" | 35 | PACKAGECONFIG[lang-fr_FR] = "CONFIG+=lang-fr_FR" |
36 | PACKAGECONFIG[lang-he_IL] = "CONFIG+=lang-he_IL" | ||
29 | PACKAGECONFIG[lang-hi_IN] = "CONFIG+=lang-hi_IN" | 37 | PACKAGECONFIG[lang-hi_IN] = "CONFIG+=lang-hi_IN" |
38 | PACKAGECONFIG[lang-hr_HR] = "CONFIG+=lang-hr_HR" | ||
39 | PACKAGECONFIG[lang-hu_HU] = "CONFIG+=lang-hu_HU" | ||
40 | PACKAGECONFIG[lang-id_ID] = "CONFIG+=lang-id_ID" | ||
30 | PACKAGECONFIG[lang-it_IT] = "CONFIG+=lang-it_IT" | 41 | PACKAGECONFIG[lang-it_IT] = "CONFIG+=lang-it_IT" |
31 | PACKAGECONFIG[lang-ja_JP] = "CONFIG+=lang-ja_JP" | 42 | PACKAGECONFIG[lang-ja_JP] = "CONFIG+=lang-ja_JP" |
32 | PACKAGECONFIG[lang-ko_KR] = "CONFIG+=lang-ko_KR" | 43 | PACKAGECONFIG[lang-ko_KR] = "CONFIG+=lang-ko_KR" |
44 | PACKAGECONFIG[lang-ms_MY] = "CONFIG+=lang-ms_MY" | ||
33 | PACKAGECONFIG[lang-nb_NO] = "CONFIG+=lang-nb_NO" | 45 | PACKAGECONFIG[lang-nb_NO] = "CONFIG+=lang-nb_NO" |
46 | PACKAGECONFIG[lang-nl_NL] = "CONFIG+=lang-nl_NL" | ||
34 | PACKAGECONFIG[lang-pl_PL] = "CONFIG+=lang-pl_PL" | 47 | PACKAGECONFIG[lang-pl_PL] = "CONFIG+=lang-pl_PL" |
48 | PACKAGECONFIG[lang-pt_BR] = "CONFIG+=lang-pt_BR" | ||
35 | PACKAGECONFIG[lang-pt_PT] = "CONFIG+=lang-pt_PT" | 49 | PACKAGECONFIG[lang-pt_PT] = "CONFIG+=lang-pt_PT" |
36 | PACKAGECONFIG[lang-ro_RO] = "CONFIG+=lang-ro_RO" | 50 | PACKAGECONFIG[lang-ro_RO] = "CONFIG+=lang-ro_RO" |
37 | PACKAGECONFIG[lang-ru_RU] = "CONFIG+=lang-ru_RU" | 51 | PACKAGECONFIG[lang-ru_RU] = "CONFIG+=lang-ru_RU" |
52 | PACKAGECONFIG[lang-sk_SK] = "CONFIG+=lang-sk_SK" | ||
53 | PACKAGECONFIG[lang-sl_SI] = "CONFIG+=lang-sl_SI" | ||
54 | PACKAGECONFIG[lang-sq_AL] = "CONFIG+=lang-sq_AL" | ||
55 | PACKAGECONFIG[lang-sr_SP] = "CONFIG+=lang-sr_SP" | ||
38 | PACKAGECONFIG[lang-sv_SE] = "CONFIG+=lang-sv_SE" | 56 | PACKAGECONFIG[lang-sv_SE] = "CONFIG+=lang-sv_SE" |
57 | PACKAGECONFIG[lang-th_TH] = "CONFIG+=lang-th_TH" | ||
58 | PACKAGECONFIG[lang-tr_TR] = "CONFIG+=lang-tr_TR" | ||
59 | PACKAGECONFIG[lang-uk_UA] = "CONFIG+=lang-uk_UA" | ||
60 | PACKAGECONFIG[lang-vi_VN] = "CONFIG+=lang-vi_VN" | ||
39 | PACKAGECONFIG[lang-zh_CN] = "CONFIG+=lang-zh_CN" | 61 | PACKAGECONFIG[lang-zh_CN] = "CONFIG+=lang-zh_CN" |
40 | PACKAGECONFIG[lang-zh_TW] = "CONFIG+=lang-zh_TW" | 62 | PACKAGECONFIG[lang-zh_TW] = "CONFIG+=lang-zh_TW" |
41 | 63 | ||