1 |
commit: 8a3d629983330ad7148cbfc5b7b79083362124f4 |
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: Wed Mar 30 18:56:24 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a3d6299 |
7 |
|
8 |
dev-qt/qtdeclarative: Fix patchset, drop riscv patch |
9 |
|
10 |
Previous patchset mistakenly did not contain full Qt5PatchCollection already |
11 |
on top of 5.15.2-r15. |
12 |
|
13 |
A proper riscv patch is now part of qtcore-5.15.3. |
14 |
|
15 |
Closes: https://bugs.gentoo.org/790689 |
16 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
17 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
18 |
|
19 |
dev-qt/qtdeclarative/Manifest | 1 + |
20 |
.../qtdeclarative/qtdeclarative-5.15.3-r1.ebuild | 66 ++++++++++++++++++++++ |
21 |
2 files changed, 67 insertions(+) |
22 |
|
23 |
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest |
24 |
index 756b849a281e..cbaabc484516 100644 |
25 |
--- a/dev-qt/qtdeclarative/Manifest |
26 |
+++ b/dev-qt/qtdeclarative/Manifest |
27 |
@@ -1,3 +1,4 @@ |
28 |
DIST qtdeclarative-5.15.2-29ee9a0e.tar.gz 24346706 BLAKE2B 5bd518a61aaa24672164fad41599ca6cc4ed7e8ab3eac56d8a38d9b0d892f92ddc3e4f7a6a66c16043d1eb29578602a91824413283fdcf971bbfaf95e0a59af0 SHA512 7964cf301f8cceb01cc4eaa7b3a5bc1e882633f61abcd250fee6dc27110baa4e32622d0b24e2cdc3874b0518c79f6f42fa1ac434535270af3b35081e663d8cd4 |
29 |
DIST qtdeclarative-5.15.3-gentoo-kde-1.tar.xz 7612 BLAKE2B e4385c43a05a152e5d4071ee72142bec617b9707ffd4e60afd66b124bf0c272a236eaf9bb984e49769687ac680550c9aeb61a773a0b820fc00500f0faec85d09 SHA512 9e25e42c5616f4e3487f6c012e63c245e68a807407dd9c54d6b8d4efc23ba98a6f7fe67cf87017161676a0335cf4d12e494d1956dbf8efeedaa9504dff3ade4a |
30 |
+DIST qtdeclarative-5.15.3-gentoo-kde-2.tar.xz 17340 BLAKE2B 5f5efae23cf6c1c3abf8d0d0594ac66ae3bf116e744626f7218d0a66e5f5598861a25e8b2d8aaec7c3dd444fa4e91de313b67b53ec624965f08472587fee460d SHA512 76d5bd8aa9f2b2e766ad4dd63a3c03b2e52da90b91cf11c777f3efd6fb3110100b358f05562639b60031bb49622fd1f4b135b6903a53493664bcbf1a0b6d69d7 |
31 |
DIST qtdeclarative-everywhere-opensource-src-5.15.3.tar.xz 21567896 BLAKE2B 897aa6959f34bc6e5a3be04d9f56d13315e6681daadb935f0e2422f551865c8c6d49b0c15c5358439155d3215c1c139fe60acf0b4a7e766e8e1ff4ce85a0449e SHA512 c0f8dba5ba9e211071d64ec9de7395925d97424be899292a83fe961091c6695bfe68395fed4b34a746a69293765122a5ee53c119053f01b5fc511f0dbf577597 |
32 |
|
33 |
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.3-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.3-r1.ebuild |
34 |
new file mode 100644 |
35 |
index 000000000000..4820d17976ce |
36 |
--- /dev/null |
37 |
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.3-r1.ebuild |
38 |
@@ -0,0 +1,66 @@ |
39 |
+# Copyright 2009-2022 Gentoo Authors |
40 |
+# Distributed under the terms of the GNU General Public License v2 |
41 |
+ |
42 |
+EAPI=8 |
43 |
+ |
44 |
+QT5_KDEPATCHSET_REV=2 |
45 |
+PYTHON_COMPAT=( python3_{8..10} ) |
46 |
+inherit python-any-r1 qt5-build |
47 |
+ |
48 |
+DESCRIPTION="The QML and Quick modules for the Qt5 framework" |
49 |
+ |
50 |
+if [[ ${QT5_BUILD_TYPE} == release ]]; then |
51 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" |
52 |
+fi |
53 |
+ |
54 |
+IUSE="gles2-only +jit localstorage vulkan +widgets" |
55 |
+ |
56 |
+# qtgui[gles2-only=] is needed because of bug 504322 |
57 |
+DEPEND=" |
58 |
+ =dev-qt/qtcore-${QT5_PV}* |
59 |
+ =dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,vulkan=] |
60 |
+ =dev-qt/qtnetwork-${QT5_PV}* |
61 |
+ =dev-qt/qttest-${QT5_PV}* |
62 |
+ media-libs/libglvnd |
63 |
+ localstorage? ( =dev-qt/qtsql-${QT5_PV}* ) |
64 |
+ widgets? ( =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=] ) |
65 |
+" |
66 |
+RDEPEND="${DEPEND}" |
67 |
+BDEPEND="${PYTHON_DEPS}" |
68 |
+ |
69 |
+PATCHES=( |
70 |
+ "${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890 |
71 |
+) |
72 |
+ |
73 |
+src_prepare() { |
74 |
+ qt_use_disable_mod localstorage sql \ |
75 |
+ src/imports/imports.pro |
76 |
+ |
77 |
+ qt_use_disable_mod widgets widgets \ |
78 |
+ src/src.pro \ |
79 |
+ src/qmltest/qmltest.pro \ |
80 |
+ tests/auto/auto.pro \ |
81 |
+ tools/tools.pro \ |
82 |
+ tools/qmlscene/qmlscene.pro \ |
83 |
+ tools/qml/qml.pro |
84 |
+ |
85 |
+ qt5-build_src_prepare |
86 |
+} |
87 |
+ |
88 |
+src_configure() { |
89 |
+ local myqmakeargs=( |
90 |
+ -- |
91 |
+ -qml-debug |
92 |
+ $(qt_use jit feature-qml-jit) |
93 |
+ ) |
94 |
+ qt5-build_src_configure |
95 |
+} |
96 |
+ |
97 |
+src_install() { |
98 |
+ qt5-build_src_install |
99 |
+ qt5_symlink_binary_to_path qml 5 |
100 |
+ qt5_symlink_binary_to_path qmleasing 5 |
101 |
+ qt5_symlink_binary_to_path qmljs 5 |
102 |
+ qt5_symlink_binary_to_path qmlpreview 5 |
103 |
+ qt5_symlink_binary_to_path qmlscene 5 |
104 |
+} |