From 6280befe6c4dbbc5ac8f384cda4480a1b896b1dd Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 1 Mar 2019 12:12:11 +0000 Subject: qtscript: add fix for build with gcc 8.3 * fixes issue introduced with gcc upgrade to 8.3: | /OE/build/luneos-master/webos-ports/tmp-glibc/work/i586-webos-linux/qtscript/5.12.0+gitAUTOINC+0be84da600-r0/git/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp:157:5: error: expected '(' before 'volatile' | asm volatile ( | ^~~~~~~~ | ( | /OE/build/luneos-master/webos-ports/tmp-glibc/work/i586-webos-linux/qtscript/5.12.0+gitAUTOINC+0be84da600-r0/git/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp:158:1: error: expected unqualified-id before string constant | ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" | ^~~~~~~~~ Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtscript_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'recipes-qt/qt5/qtscript_git.bb') diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index ed2f82ec..a6b6429c 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -12,9 +12,10 @@ LIC_FILES_CHKSUM = " \ " # Patches from https://github.com/meta-qt5/qtscript/commits/b5.12 -# 5.12.meta-qt5.1 +# 5.12.meta-qt5.2 SRC_URI += " \ file://0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch \ + file://0002-Fix-build-with-GCC-8.3.patch \ " # qemuarm build fails with: -- cgit v1.2.3 From d4f557ae7c0e82b589ee5282d37360911efd2593 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 25 Mar 2019 09:26:22 +0200 Subject: qt5: update submodules Update to latest content in Qt 5.12(.3) branch Task-number: QTBUG-74623 Change-Id: I58e0d192658129922a463ccbf9e3c0f247c973a0 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qtscript_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt/qt5/qtscript_git.bb') diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 67d17b28..550d03a3 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -36,4 +36,4 @@ DEPENDS += "qtbase" # http://errors.yoctoproject.org/Errors/Build/44915/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "6c0edaf30c5bdfc2739ca646da73dcb697ab1361" +SRCREV = "6522303cb94a9ba5583d68f8c68e4fadf3fb6d7b" -- cgit v1.2.3 From f2b9b3047d2684a52d525618ef0a326f97e3e37b Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 1 Apr 2019 12:30:54 +0300 Subject: qt5: update submodules Update to latest content in Qt 5.12.3 branch Task-number: QTBUG-74623 Change-Id: I38f29200c051da3d34c768043a1f4d5bd4e5dd6e Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qtscript_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt/qt5/qtscript_git.bb') diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 550d03a3..a458cce9 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -36,4 +36,4 @@ DEPENDS += "qtbase" # http://errors.yoctoproject.org/Errors/Build/44915/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "6522303cb94a9ba5583d68f8c68e4fadf3fb6d7b" +SRCREV = "2379c9b93792feb97d6cb871082aed0f7cbcbad8" -- cgit v1.2.3 From 28d4bfdf74ba9d66ad749fc7208ca8dc147a3927 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 18 Mar 2019 15:02:05 +0200 Subject: Upgrade to 5.12.2 Signed-off-by: Mikko Gronoff --- recipes-qt/qt5/qtscript_git.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'recipes-qt/qt5/qtscript_git.bb') diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index a6b6429c..67d17b28 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -15,7 +15,6 @@ LIC_FILES_CHKSUM = " \ # 5.12.meta-qt5.2 SRC_URI += " \ file://0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch \ - file://0002-Fix-build-with-GCC-8.3.patch \ " # qemuarm build fails with: @@ -37,4 +36,4 @@ DEPENDS += "qtbase" # http://errors.yoctoproject.org/Errors/Build/44915/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "0be84da60090e9d20ec0066bcd3900ca5572df95" +SRCREV = "6c0edaf30c5bdfc2739ca646da73dcb697ab1361" -- cgit v1.2.3 From 3c86e3c28f00129fd408f9ad8daddd034bb19161 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Tue, 9 Apr 2019 23:12:00 +0300 Subject: qt5; update submodules Update to latest content in Qt 5.12.3 branch Task-number: QTBUG-74623 Change-Id: I2868f80fa7b734729aaeb362e982818dbe760884 Reviewed-by: Kari Oikarinen --- recipes-qt/qt5/qtscript_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt/qt5/qtscript_git.bb') diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index a458cce9..ac5d5694 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -36,4 +36,4 @@ DEPENDS += "qtbase" # http://errors.yoctoproject.org/Errors/Build/44915/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "2379c9b93792feb97d6cb871082aed0f7cbcbad8" +SRCREV = "038f6305610a80f39d3416b95b5df96fab0c801d" -- cgit v1.2.3 From e2707a016c3475c167a421c9c73d88f81cc61bd1 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Apr 2019 23:32:56 +0000 Subject: qt5: upgrade to 5.12.3 * be aware that in 3 qt* project the v5.12.3 tag wasn't created yet: qtknx_git.bb:# v5.12.3 tag wasn't created yet qtmqtt_git.bb:# v5.12.3 tag wasn't created yet qtopcua_git.bb:# v5.12.3 tag wasn't created yet * and qttools, qt3d, qtremoteobjects v5.12.3 tag isn't in 5.12 branch Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtscript_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes-qt/qt5/qtscript_git.bb') diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 67d17b28..cebd863d 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = " \ " # Patches from https://github.com/meta-qt5/qtscript/commits/b5.12 -# 5.12.meta-qt5.2 +# 5.12.meta-qt5.3 SRC_URI += " \ file://0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch \ " @@ -36,4 +36,4 @@ DEPENDS += "qtbase" # http://errors.yoctoproject.org/Errors/Build/44915/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "6c0edaf30c5bdfc2739ca646da73dcb697ab1361" +SRCREV = "2f6a1056f10dbe634c58725ad2893c6cee58bf1c" -- cgit v1.2.3 From 5bbb8d27ca10c38300bfc0c31c68470eb32b7711 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Sun, 5 May 2019 20:34:26 +0300 Subject: qt5: update submodules Update to Qt 5.13.0 beta4 Task-number: QTBUG-72311 Change-Id: Ia25415c4fb796bbc7335ae468030be4634ca4085 Reviewed-by: Jani Heikkinen --- recipes-qt/qt5/qtscript_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt/qt5/qtscript_git.bb') diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 9235f78d..4789cade 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -36,4 +36,4 @@ DEPENDS += "qtbase" # http://errors.yoctoproject.org/Errors/Build/44915/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "8d2c11ac2352556167dc4a86172cd9bc3a979ed8" +SRCREV = "9401306e2db3a1756aab958d0939d12c8d5f46e0" -- cgit v1.2.3