Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/files/, dev-qt/qtdeclarative/
Date: Fri, 01 Apr 2022 18:23:53
Message-Id: 1648836505.5fd72895b4a0c9c4bf1a143c3fa8d9b8745f4e89.asturm@gentoo
1 commit: 5fd72895b4a0c9c4bf1a143c3fa8d9b8745f4e89
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 30 18:13:29 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 1 18:08:25 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=5fd72895
7
8 dev-qt/qtdeclarative: Drop riscv patch
9
10 A proper riscv patch is now part of qtcore-5.15.3.
11
12 Closes: https://bugs.gentoo.org/790689
13 Package-Manager: Portage-3.0.30, Repoman-3.0.3
14 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
15
16 .../files/qtdeclarative-5.15.2-riscv-atomic.patch | 12 ------------
17 dev-qt/qtdeclarative/qtdeclarative-5.15.3.9999.ebuild | 1 -
18 2 files changed, 13 deletions(-)
19
20 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
21 deleted file mode 100644
22 index a619f3db..00000000
23 --- a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch
24 +++ /dev/null
25 @@ -1,12 +0,0 @@
26 -diff --git a/src/qml/qml.pro b/src/qml/qml.pro
27 -index 7d5a92a..01f3b79 100644
28 ---- a/src/qml/qml.pro
29 -+++ b/src/qml/qml.pro
30 -@@ -19,6 +19,7 @@ solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
31 -
32 - # Ensure this gcc optimization is switched off for mips platforms to avoid trouble with JIT.
33 - gcc:isEqual(QT_ARCH, "mips"): QMAKE_CXXFLAGS += -fno-reorder-blocks
34 -+gcc:isEqual(QT_ARCH, "riscv64"): LIBS += -latomic
35 -
36 - DEFINES += QT_NO_FOREACH
37 -
38
39 diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.3.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.3.9999.ebuild
40 index de20d2dc..c236a22f 100644
41 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15.3.9999.ebuild
42 +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.3.9999.ebuild
43 @@ -29,7 +29,6 @@ BDEPEND="${PYTHON_DEPS}"
44
45 PATCHES=(
46 "${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
47 - "${FILESDIR}/${PN}-5.15.2-riscv-atomic.patch" # bug 790689
48 )
49
50 src_prepare() {