summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb1
-rwxr-xr-xrecipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb1
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb7
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb9
-rw-r--r--recipes-qt/qt5/qtbase/0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch41
-rw-r--r--recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch (renamed from recipes-qt/qt5/qtbase/0014-Always-build-uic-and-qvkgen.patch)2
-rw-r--r--recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch (renamed from recipes-qt/qt5/qtbase/0015-Bootstrap-without-linkat-feature.patch)4
-rw-r--r--recipes-qt/qt5/qtbase_git.bb10
-rw-r--r--recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch50
-rw-r--r--recipes-qt/qt5/qtscript/0001-javascriptcore-Use-64-bit-ints.patch58
-rw-r--r--recipes-qt/qt5/qtscript_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb9
-rw-r--r--recipes-qt/qt5/qtwebkit_git.bb2
-rw-r--r--recipes-qt/qtchooser/qtchooser/0001-Makefile-install-the-man-dir.patch35
-rw-r--r--recipes-qt/qtchooser/qtchooser_git.bb5
15 files changed, 122 insertions, 114 deletions
diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb
index 71746f03..4b46e676 100644
--- a/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb
+++ b/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb
@@ -11,4 +11,5 @@ RDEPENDS_${PN} += " \
11 nativesdk-packagegroup-sdk-host \ 11 nativesdk-packagegroup-sdk-host \
12 nativesdk-qttools-tools \ 12 nativesdk-qttools-tools \
13 nativesdk-qtbase-tools \ 13 nativesdk-qtbase-tools \
14 nativesdk-perl-modules \
14" 15"
diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
index 8219aeb2..d020cc35 100755
--- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
@@ -36,7 +36,6 @@ RDEPENDS_${PN} += " \
36 qtbase-mkspecs \ 36 qtbase-mkspecs \
37 qtbase-plugins \ 37 qtbase-plugins \
38 qtbase-staticdev \ 38 qtbase-staticdev \
39 qttranslations-qt \
40 qttranslations-qtbase \ 39 qttranslations-qtbase \
41 qttranslations-qthelp \ 40 qttranslations-qthelp \
42 qtcharts-dev \ 41 qtcharts-dev \
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 184d3730..b9732f79 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.11-shared 25# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared
26# 5.11.meta-qt5-shared.6 26# 5.11.meta-qt5-shared.7
27SRC_URI += "\ 27SRC_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 \
@@ -37,13 +37,14 @@ SRC_URI += "\
37 file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ 37 file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \
38 file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ 38 file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \
39 file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ 39 file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \
40 file://0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \
40" 41"
41 42
42# common for qtbase-native and nativesdk-qtbase 43# common for qtbase-native and nativesdk-qtbase
43# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native 44# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native
44# 5.11.meta-qt5-native.6 45# 5.11.meta-qt5-native.7
45SRC_URI += " \ 46SRC_URI += " \
46 file://0014-Always-build-uic-and-qvkgen.patch \ 47 file://0016-Always-build-uic-and-qvkgen.patch \
47" 48"
48 49
49# CMake's toolchain configuration of nativesdk-qtbase 50# CMake's toolchain configuration of nativesdk-qtbase
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index be86a93b..1ea5fda1 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.11-shared 20# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared
21# 5.11.meta-qt5-shared.6 21# 5.11.meta-qt5-shared.7
22SRC_URI += "\ 22SRC_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 \
@@ -32,18 +32,19 @@ SRC_URI += "\
32 file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ 32 file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \
33 file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ 33 file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \
34 file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ 34 file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \
35 file://0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \
35" 36"
36 37
37# common for qtbase-native and nativesdk-qtbase 38# common for qtbase-native and nativesdk-qtbase
38# Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-native 39# Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-native
39# 5.11.meta-qt5-native.6 40# 5.11.meta-qt5-native.7
40SRC_URI += " \ 41SRC_URI += " \
41 file://0014-Always-build-uic-and-qvkgen.patch \ 42 file://0016-Always-build-uic-and-qvkgen.patch \
42" 43"
43 44
44# only for qtbase-native 45# only for qtbase-native
45SRC_URI += " \ 46SRC_URI += " \
46 file://0015-Bootstrap-without-linkat-feature.patch \ 47 file://0017-Bootstrap-without-linkat-feature.patch \
47" 48"
48 49
49CLEANBROKEN = "1" 50CLEANBROKEN = "1"
diff --git a/recipes-qt/qt5/qtbase/0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch b/recipes-qt/qt5/qtbase/0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch
new file mode 100644
index 00000000..e1e1087c
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch
@@ -0,0 +1,41 @@
1From 7e287f4793f75a7291386a904d3361460748b15b Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Tue, 21 Aug 2018 00:29:06 +0200
4Subject: [PATCH] Check glibc version for renameat2/statx on non bootstrapped
5 build
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10Upstream-Status: Pending
11
12Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
13---
14 src/corelib/io/qfilesystemengine_unix.cpp | 11 ++++++++++++
15 1 file changed, 11 insertions(+)
16
17diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
18index be6ce48d0cb..1bf1bebc7f1 100644
19--- a/src/corelib/io/qfilesystemengine_unix.cpp
20+++ b/src/corelib/io/qfilesystemengine_unix.cpp
21@@ -98,6 +98,17 @@ extern "C" NSString *NSTemporaryDirectory();
22 # define FICLONE _IOW(0x94, 9, int)
23 #endif
24
25+// renameat2/statx features for non bootstrapped build
26+#ifndef QT_BOOTSTRAPPED
27+#ifdef __GLIBC_PREREQ
28+# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1)
29+# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1)
30+#else
31+# define QT_FEATURE_renameat2 -1
32+# define QT_FEATURE_statx -1
33+#endif
34+#endif
35+
36 # if defined(Q_OS_ANDROID)
37 // renameat2() and statx() are disabled on Android because quite a few systems
38 // come with sandboxes that kill applications that make system calls outside a
39--
402.14.4
41
diff --git a/recipes-qt/qt5/qtbase/0014-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch
index 060e8fbf..0a32e881 100644
--- a/recipes-qt/qt5/qtbase/0014-Always-build-uic-and-qvkgen.patch
+++ b/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch
@@ -1,4 +1,4 @@
1From 7b0de75cc3d85b44f96f1c6869c65399351a1398 Mon Sep 17 00:00:00 2001 1From 7ad41f69af974ec924eb27c86fb15d5da9384d6c 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] Always build uic and qvkgen 4Subject: [PATCH] Always build uic and qvkgen
diff --git a/recipes-qt/qt5/qtbase/0015-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch
index 8863ddd8..4f5fdc95 100644
--- a/recipes-qt/qt5/qtbase/0015-Bootstrap-without-linkat-feature.patch
+++ b/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch
@@ -1,4 +1,4 @@
1From 6ff049f08cbe80b00b34859acdc5ccf7b9c9ae18 Mon Sep 17 00:00:00 2001 1From 05bbd2dce8c7f4a40d86841671763b9d8b51c886 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Fri, 24 Nov 2017 15:16:31 +0200 3Date: Fri, 24 Nov 2017 15:16:31 +0200
4Subject: [PATCH] Bootstrap without linkat feature 4Subject: [PATCH] Bootstrap without linkat feature
@@ -13,7 +13,7 @@ Upstream-Status: Inappropriate [OE specific]
13 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
14 14
15diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h 15diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h
16index 3469ebe5e6..cb889f27c2 100644 16index c5585ea32a..de895e7bf4 100644
17--- a/src/corelib/global/qconfig-bootstrapped.h 17--- a/src/corelib/global/qconfig-bootstrapped.h
18+++ b/src/corelib/global/qconfig-bootstrapped.h 18+++ b/src/corelib/global/qconfig-bootstrapped.h
19@@ -90,7 +90,7 @@ 19@@ -90,7 +90,7 @@
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 6ef23107..0138c13b 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.11-shared 16# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared
17# 5.11.meta-qt5-shared.6 17# 5.11.meta-qt5-shared.7
18SRC_URI += "\ 18SRC_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 \
@@ -28,8 +28,10 @@ SRC_URI += "\
28 file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ 28 file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \
29 file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ 29 file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \
30 file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ 30 file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \
31 file://0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \
31" 32"
32 33
34
33# for syncqt 35# for syncqt
34RDEPENDS_${PN}-tools += "perl" 36RDEPENDS_${PN}-tools += "perl"
35 37
@@ -59,6 +61,7 @@ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -f
59PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" 61PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}"
60PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" 62PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
61PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xcb-xinput glib xkb xkbcommon-evdev', '', d)}" 63PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xcb-xinput glib xkb xkbcommon-evdev', '', d)}"
64PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm cups fontconfig kms gbm libinput', '', d)}"
62PACKAGECONFIG_FONTS ?= "" 65PACKAGECONFIG_FONTS ?= ""
63PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" 66PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib"
64PACKAGECONFIG_DISTRO ?= "" 67PACKAGECONFIG_DISTRO ?= ""
@@ -78,6 +81,7 @@ PACKAGECONFIG ?= " \
78 ${PACKAGECONFIG_GL} \ 81 ${PACKAGECONFIG_GL} \
79 ${PACKAGECONFIG_FB} \ 82 ${PACKAGECONFIG_FB} \
80 ${PACKAGECONFIG_X11} \ 83 ${PACKAGECONFIG_X11} \
84 ${PACKAGECONFIG_KDE} \
81 ${PACKAGECONFIG_FONTS} \ 85 ${PACKAGECONFIG_FONTS} \
82 ${PACKAGECONFIG_SYSTEM} \ 86 ${PACKAGECONFIG_SYSTEM} \
83 ${PACKAGECONFIG_DISTRO} \ 87 ${PACKAGECONFIG_DISTRO} \
@@ -138,7 +142,7 @@ PACKAGECONFIG[gtk] = "-gtk,-no-gtk,gtk+3"
138PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb" 142PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb"
139PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb" 143PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb"
140PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" 144PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl"
141PACKAGECONFIG[gbm] = "-gbm,-no-gbm,virtual/mesa" 145PACKAGECONFIG[gbm] = "-gbm,-no-gbm,virtual/libgbm"
142PACKAGECONFIG[icu] = "-icu,-no-icu,icu" 146PACKAGECONFIG[icu] = "-icu,-no-icu,icu"
143PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" 147PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev"
144PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" 148PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl"
@@ -146,8 +150,6 @@ PACKAGECONFIG[widgets] = "-widgets,-no-widgets"
146PACKAGECONFIG[libproxy] = "-libproxy,-no-libproxy,libproxy" 150PACKAGECONFIG[libproxy] = "-libproxy,-no-libproxy,libproxy"
147PACKAGECONFIG[libinput] = "-libinput,-no-libinput,libinput" 151PACKAGECONFIG[libinput] = "-libinput,-no-libinput,libinput"
148PACKAGECONFIG[journald] = "-journald,-no-journald,systemd" 152PACKAGECONFIG[journald] = "-journald,-no-journald,systemd"
149# needs kernel 3.16+
150PACKAGECONFIG[renameat2] = "-feature-renameat2,-no-feature-renameat2,"
151# needs kernel 3.17+ 153# needs kernel 3.17+
152PACKAGECONFIG[getentropy] = "-feature-getentropy,-no-feature-getentropy," 154PACKAGECONFIG[getentropy] = "-feature-getentropy,-no-feature-getentropy,"
153 155
diff --git a/recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch b/recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch
new file mode 100644
index 00000000..878a8ab9
--- /dev/null
+++ b/recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch
@@ -0,0 +1,50 @@
1From 21781f11a71d4e6449d89372aa9cc5b95ce8a67c Mon Sep 17 00:00:00 2001
2From: Alistair Francis <alistair.francis@wdc.com>
3Date: Wed, 18 Jul 2018 14:26:21 -0700
4Subject: [PATCH] 3rdparty/javascriptcore: Add RISC-V support
5
6Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
7Change-Id: I81f15084ef6b5b8d855c1f568cacca176af51b57
8Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
9
10Upstream-Status: Backport
11---
12 .../javascriptcore/JavaScriptCore/wtf/Platform.h | 14 ++++++++++++--
13 1 file changed, 12 insertions(+), 2 deletions(-)
14
15diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
16index 00caa6d..96942c7 100644
17--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
18+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
19@@ -397,6 +397,16 @@
20 #endif
21 #endif /* __mips__ */
22
23+/* CPU(RISCV64) - RISC-V 64-bit */
24+#if defined(__riscv) && __riscv_xlen == 64
25+#define WTF_CPU_RISCV64 1
26+#endif
27+
28+/* CPU(RISCV32) - RISC-V 32-bit */
29+#if defined(__riscv) && __riscv_xlen == 32
30+#define WTF_CPU_RISCV32 1
31+#endif
32+
33 /* ==== OS() - underlying operating system; only to be used for mandated low-level services like
34 virtual memory, not to choose a GUI toolkit ==== */
35
36@@ -948,9 +958,9 @@
37 #endif
38
39 #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
40-#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64)
41+#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) || CPU(RISCV64)
42 #define WTF_USE_JSVALUE64 1
43-#elif CPU(ARM) || CPU(PPC64)
44+#elif CPU(ARM) || CPU(PPC64) || CPU(RISCV32)
45 #define WTF_USE_JSVALUE32 1
46 #elif OS(WINDOWS) && COMPILER(MINGW)
47 /* Using JSVALUE32_64 causes padding/alignement issues for JITStubArg
48--
492.17.1
50
diff --git a/recipes-qt/qt5/qtscript/0001-javascriptcore-Use-64-bit-ints.patch b/recipes-qt/qt5/qtscript/0001-javascriptcore-Use-64-bit-ints.patch
deleted file mode 100644
index a083decf..00000000
--- a/recipes-qt/qt5/qtscript/0001-javascriptcore-Use-64-bit-ints.patch
+++ /dev/null
@@ -1,58 +0,0 @@
1From 8fd53951d53ef8c5b62fe985665dad0545bb3161 Mon Sep 17 00:00:00 2001
2From: Alistair Francis <alistair.francis@wdc.com>
3Date: Mon, 4 Jun 2018 14:24:59 -0700
4Subject: [PATCH] javascriptcore: Use 64-bit ints
5
6Where required use 64-bit integers for casts.
7
8Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
9Upstream-Status: Pending
10---
11 .../JavaScriptCore/assembler/X86Assembler.h | 2 +-
12 .../javascriptcore/JavaScriptCore/runtime/JSValue.h | 8 ++++++++
13 2 files changed, 9 insertions(+), 1 deletion(-)
14
15diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/X86Assembler.h b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/X86Assembler.h
16index ab3d05f..ed5965f 100644
17--- a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/X86Assembler.h
18+++ b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/X86Assembler.h
19@@ -2033,7 +2033,7 @@ private:
20 }
21 }
22
23-#if !CPU(X86_64)
24+#if CPU(X86)
25 void memoryModRM(int reg, void* address)
26 {
27 // noBase + ModRmMemoryNoDisp means noBase + ModRmMemoryDisp32!
28diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h
29index 7584c52..958ac89 100644
30--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h
31+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h
32@@ -490,7 +490,11 @@ namespace JSC {
33 u.asBits.tag = CellTag;
34 else
35 u.asBits.tag = EmptyValueTag;
36+#if CPU(X86)
37 u.asBits.payload = reinterpret_cast<int32_t>(ptr);
38+#else
39+ u.asBits.payload = reinterpret_cast<int64_t>(ptr);
40+#endif
41 #if ENABLE(JSC_ZOMBIES)
42 ASSERT(!isZombie());
43 #endif
44@@ -502,7 +506,11 @@ namespace JSC {
45 u.asBits.tag = CellTag;
46 else
47 u.asBits.tag = EmptyValueTag;
48+#if CPU(X86)
49 u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr));
50+#else
51+ u.asBits.payload = reinterpret_cast<int64_t>(const_cast<JSCell*>(ptr));
52+#endif
53 #if ENABLE(JSC_ZOMBIES)
54 ASSERT(!isZombie());
55 #endif
56--
572.17.1
58
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 03711a65..63f62a43 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = " \
11 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ 11 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
12" 12"
13 13
14SRC_URI += "file://0001-javascriptcore-Use-64-bit-ints.patch" 14SRC_URI += "file://0001-3rdparty-javascriptcore-Add-RISC-V-support.patch"
15 15
16# qemuarm build fails with: 16# qemuarm build fails with:
17# /OE/build/oe-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/qtscript/5.4.1+gitAUTOINC+822df36f25-r0/git/src/3rdparty/javascriptcore/JavaScriptCore/assembler/AssemblerBuffer.h: In member function 'void QTJSC::AssemblerBuffer::putInt64Unchecked(int64_t)': 17# /OE/build/oe-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/qtscript/5.4.1+gitAUTOINC+822df36f25-r0/git/src/3rdparty/javascriptcore/JavaScriptCore/assembler/AssemblerBuffer.h: In member function 'void QTJSC::AssemblerBuffer::putInt64Unchecked(int64_t)':
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index b01c2ca9..9bd83612 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -53,12 +53,16 @@ PACKAGECONFIG[libvpx] = "-feature-webengine-system-libvpx,-no-feature-webengine-
53PACKAGECONFIG[libevent] = "-feature-webengine-system-libevent,-no-feature-webengine-system-libevent,libevent" 53PACKAGECONFIG[libevent] = "-feature-webengine-system-libevent,-no-feature-webengine-system-libevent,libevent"
54PACKAGECONFIG[libpng] = "-feature-webengine-system-png,-no-feature-webengine-system-png,libpng" 54PACKAGECONFIG[libpng] = "-feature-webengine-system-png,-no-feature-webengine-system-png,libpng"
55PACKAGECONFIG[harfbuzz] = "-feature-webengine-system-harfbuzz,-no-feature-webengine-system-harfbuzz,harfbuzz" 55PACKAGECONFIG[harfbuzz] = "-feature-webengine-system-harfbuzz,-no-feature-webengine-system-harfbuzz,harfbuzz"
56PACKAGECONFIG[glib] = "-feature-webengine-system-glib,-no-feature-webengine-system-glib,glib" 56PACKAGECONFIG[glib] = "-feature-webengine-system-glib,-no-feature-webengine-system-glib,glib-2.0"
57PACKAGECONFIG[zlib] = "-feature-webengine-system-zlib,-no-feature-webengine-system-zlib,zlib" 57PACKAGECONFIG[zlib] = "-feature-webengine-system-zlib,-no-feature-webengine-system-zlib,zlib"
58PACKAGECONFIG[protobuf] = "-feature-webengine-system-protobuf,-no-feature-webengine-system-protobuf,protobuf" 58PACKAGECONFIG[protobuf] = "-feature-webengine-system-protobuf,-no-feature-webengine-system-protobuf,protobuf"
59PACKAGECONFIG[jasoncpp] = "-feature-webengine-system-jsoncpp,-no-feature-webengine-system-jsoncpp,jasoncpp" 59PACKAGECONFIG[jasoncpp] = "-feature-webengine-system-jsoncpp,-no-feature-webengine-system-jsoncpp,jasoncpp"
60PACKAGECONFIG[libxml2] = "-feature-webengine-system-libxml2,-no-feature-webengine-system-libxml2,libxml2" 60PACKAGECONFIG[libxml2] = "-feature-webengine-system-libxml2,-no-feature-webengine-system-libxml2,libxml2"
61PACKAGECONFIG[minizip] = "-feature-webengine-system-minizip,-no-feature-webengine-system-minizip,minizip" 61PACKAGECONFIG[minizip] = "-feature-webengine-system-minizip,-no-feature-webengine-system-minizip,minizip"
62PACKAGECONFIG[proprietary-codecs] = "-feature-webengine-proprietary-codecs,-no-feature-webengine-proprietary-codecs"
63PACKAGECONFIG[pepper-plugins] = "-feature-webengine-pepper-plugins,-no-feature-webengine-pepper-plugins"
64PACKAGECONFIG[printing-and-pdf] = "-feature-webengine-printing-and-pdf,-no-feature-webengine-printing-and-pdf"
65PACKAGECONFIG[spellchecker] = "-feature-webengine-spellchecker,-no-feature-webengine-spellchecker"
62 66
63EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 67EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
64 68
@@ -120,6 +124,9 @@ PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
120# for /usr/share/qt5/qtwebengine_resources.pak 124# for /usr/share/qt5/qtwebengine_resources.pak
121FILES_${PN} += "${OE_QMAKE_PATH_QT_TRANSLATIONS} ${OE_QMAKE_PATH_QT_DATA}" 125FILES_${PN} += "${OE_QMAKE_PATH_QT_TRANSLATIONS} ${OE_QMAKE_PATH_QT_DATA}"
122 126
127# Chromium uses libpci to determine which optimizations/workarounds to apply
128RDEPENDS_${PN}_append_x86 = " libpci"
129
123RDEPENDS_${PN}-examples += " \ 130RDEPENDS_${PN}-examples += " \
124 ${PN}-qmlplugins \ 131 ${PN}-qmlplugins \
125 qtquickcontrols-qmlplugins \ 132 qtquickcontrols-qmlplugins \
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 9e4617a0..a7dad987 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \
9 file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee \ 9 file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee \
10" 10"
11 11
12DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf-native" 12DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf-native bison-native"
13 13
14inherit cmake_qt5 perlnative pythonnative 14inherit cmake_qt5 perlnative pythonnative
15 15
diff --git a/recipes-qt/qtchooser/qtchooser/0001-Makefile-install-the-man-dir.patch b/recipes-qt/qtchooser/qtchooser/0001-Makefile-install-the-man-dir.patch
deleted file mode 100644
index 8e8e1c69..00000000
--- a/recipes-qt/qtchooser/qtchooser/0001-Makefile-install-the-man-dir.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 3f142e100cc3dd69b816ce79152760c823cb86e9 Mon Sep 17 00:00:00 2001
2From: Li Xin <lixin.fnst@cn.fujitsu.com>
3Date: Fri, 29 Apr 2016 12:41:34 +0900
4Subject: [PATCH] Makefile: install the man dir
5
6upstream-status: backported
7
8Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
9---
10 Makefile | 3 +++
11 1 file changed, 3 insertions(+)
12
13diff --git a/Makefile b/Makefile
14index 20b9100..1fd8cd3 100644
15--- a/Makefile
16+++ b/Makefile
17@@ -1,5 +1,6 @@
18 prefix = /usr
19 bindir = $(prefix)/bin
20+MKDIR = mkdir -p
21 TOOLS = assistant \
22 designer \
23 lconvert \
24@@ -56,6 +57,8 @@ install:
25 case `uname -s` in Darwin) \
26 for tool in $(MACTOOLS); do ln -sf qtchooser "$(INSTALL_ROOT)$(bindir)/$$tool"; done \
27 ;; esac
28+ $(MKDIR) $(INSTALL_ROOT)$(prefix)/share/man/man1
29+ install -m 644 -p doc/qtchooser.1 $(INSTALL_ROOT)$(prefix)/share/man/man1
30
31 uninstall:
32 cd src/qtchooser && $(MAKE) uninstall
33--
341.8.4.2
35
diff --git a/recipes-qt/qtchooser/qtchooser_git.bb b/recipes-qt/qtchooser/qtchooser_git.bb
index e745e8ad..06b1ae91 100644
--- a/recipes-qt/qtchooser/qtchooser_git.bb
+++ b/recipes-qt/qtchooser/qtchooser_git.bb
@@ -1,8 +1,7 @@
1DESCRIPTION = "Wrapper to select between Qt development binary versions" 1DESCRIPTION = "Wrapper to select between Qt development binary versions"
2HOMEPAGE = "http://macieira.org/qtchooser" 2HOMEPAGE = "http://macieira.org/qtchooser"
3LICENSE = "LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | GPL-3.0" 3LICENSE = "LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | GPL-3.0"
4SRC_URI = "git://code.qt.io/cgit/qtsdk/qtchooser.git;branch=master \ 4SRC_URI = "git://code.qt.io/cgit/qtsdk/qtchooser.git"
5 file://0001-Makefile-install-the-man-dir.patch"
6 5
7LIC_FILES_CHKSUM = " \ 6LIC_FILES_CHKSUM = " \
8 file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ 7 file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
@@ -11,7 +10,7 @@ LIC_FILES_CHKSUM = " \
11" 10"
12S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
13SRCREV = "a1b6736e4f2daf86cd1626004d40ef57db85fbb5" 12SRCREV = "a1b6736e4f2daf86cd1626004d40ef57db85fbb5"
14#PV = "39+git${SRCREV}" 13PV = "39+git${SRCPV}"
15 14
16inherit pkgconfig 15inherit pkgconfig
17 16
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-07-18 13:08:00 +0000