[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtdeclarative/files/

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtdeclarative/files/

[Sam James]

commit:     b212a7f9c6b6ce1288dcf220e72b4a2debf18e52
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Apr 18 07:00:52 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 07:15:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b212a7f9

dev-qt/qtdeclarative: remove unused patches

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/qtdeclarative-5.15.2-riscv-atomic.patch      | 12 ------------
 .../files/qtdeclarative-5.4.2-disable-jit.patch        | 18 ------------------
 2 files changed, 30 deletions(-)

diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch
deleted file mode 100644
index a619f3db833c..000000000000
--- a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/qml/qml.pro b/src/qml/qml.pro
-index 7d5a92a..01f3b79 100644
---- a/src/qml/qml.pro
-+++ b/src/qml/qml.pro
-@@ -19,6 +19,7 @@ solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
- 
- # Ensure this gcc optimization is switched off for mips platforms to avoid trouble with JIT.
- gcc:isEqual(QT_ARCH, "mips"): QMAKE_CXXFLAGS += -fno-reorder-blocks
-+gcc:isEqual(QT_ARCH, "riscv64"): LIBS += -latomic
- 
- DEFINES += QT_NO_FOREACH
-

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 7799ef71b7e4..000000000000
--- 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