commit: 56cf1c25f6c7c35a06adb2751cd8427640143d4e Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Mar 22 13:16:21 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Mar 24 09:31:04 2022 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=56cf1c25
dev-qt/qtdeclarative: Fix IUSE=jit by using qml-jit feature switch Closes: https://bugs.gentoo.org/551318 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/qtdeclarative-5.4.2-disable-jit.patch | 18 ------------------ dev-qt/qtdeclarative/qtdeclarative-5.15.3.9999.ebuild | 3 +-- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch deleted file mode 100644 index 7799ef71..00000000 --- a/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h -index 4b08194..224ddb1 100644 ---- a/src/qml/jsruntime/qv4global_p.h -+++ b/src/qml/jsruntime/qv4global_p.h -@@ -96,8 +96,13 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); } - # undef V4_ENABLE_JIT - #endif - #endif - -+// Gentoo note: disable the JIT due to USE="-jit" -+#ifdef V4_ENABLE_JIT -+#undef V4_ENABLE_JIT -+#endif -+ - // Do certain things depending on whether the JIT is enabled or disabled - - #ifdef V4_ENABLE_JIT - #define ENABLE_YARR_JIT 1 diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.3.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.3.9999.ebuild index 31bdbbb8..de20d2dc 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15.3.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.3.9999.ebuild @@ -33,8 +33,6 @@ PATCHES=( ) src_prepare() { - use jit || PATCHES+=( "${FILESDIR}/${PN}-5.4.2-disable-jit.patch" ) - qt_use_disable_mod localstorage sql \ src/imports/imports.pro @@ -53,6 +51,7 @@ src_configure() { local myqmakeargs=( -- -qml-debug + $(qt_use jit feature-qml-jit) ) qt5-build_src_configure }
