Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtdeclarative/
Date: Thu, 30 Jul 2020 10:11:28
Message-Id: 1596103857.bfdd93f95193a6677fe242c591fb0179a548d5a5.asturm@gentoo
1 commit: bfdd93f95193a6677fe242c591fb0179a548d5a5
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 25 18:55:32 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 30 10:10:57 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfdd93f9
7
8 dev-qt/qtdeclarative: Trigger rebuild on dev-qt/qtgui subslot update
9
10 Closes: https://bugs.gentoo.org/733674
11 Package-Manager: Portage-3.0.0, Repoman-2.3.23
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 .../qtdeclarative/qtdeclarative-5.14.2-r4.ebuild | 59 ++++++++++++++++++++++
15 .../qtdeclarative/qtdeclarative-5.15.0-r1.ebuild | 58 +++++++++++++++++++++
16 2 files changed, 117 insertions(+)
17
18 diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r4.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r4.ebuild
19 new file mode 100644
20 index 00000000000..ee5e2c5a785
21 --- /dev/null
22 +++ b/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r4.ebuild
23 @@ -0,0 +1,59 @@
24 +# Copyright 2009-2020 Gentoo Authors
25 +# Distributed under the terms of the GNU General Public License v2
26 +
27 +EAPI=7
28 +PYTHON_COMPAT=( python3_{6,7,8} )
29 +inherit python-any-r1 qt5-build
30 +
31 +DESCRIPTION="The QML and Quick modules for the Qt5 framework"
32 +
33 +if [[ ${QT5_BUILD_TYPE} == release ]]; then
34 + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
35 +fi
36 +
37 +IUSE="gles2-only +jit localstorage vulkan +widgets"
38 +
39 +BDEPEND="${PYTHON_DEPS}"
40 +# qtgui[gles2-only=] is needed because of bug 504322
41 +DEPEND="
42 + ~dev-qt/qtcore-${PV}
43 + ~dev-qt/qtgui-${PV}:5=[gles2-only=,vulkan=]
44 + ~dev-qt/qtnetwork-${PV}
45 + ~dev-qt/qttest-${PV}
46 + localstorage? ( ~dev-qt/qtsql-${PV} )
47 + widgets? ( ~dev-qt/qtwidgets-${PV}[gles2-only=] )
48 +"
49 +RDEPEND="${DEPEND}
50 + !<dev-qt/qtquickcontrols-5.7:5
51 +"
52 +
53 +PATCHES=(
54 + "${FILESDIR}/${P}-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
55 + "${FILESDIR}/${P}-fix-subpixel-positioned-text.patch" # QTBUG-49646
56 + "${FILESDIR}/${P}-QQuickMouseArea-stuck-in-pressed-state.patch" # QTBUG-74987
57 +)
58 +
59 +src_prepare() {
60 + use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
61 +
62 + qt_use_disable_mod localstorage sql \
63 + src/imports/imports.pro
64 +
65 + qt_use_disable_mod widgets widgets \
66 + src/src.pro \
67 + src/qmltest/qmltest.pro \
68 + tests/auto/auto.pro \
69 + tools/tools.pro \
70 + tools/qmlscene/qmlscene.pro \
71 + tools/qml/qml.pro
72 +
73 + qt5-build_src_prepare
74 +}
75 +
76 +src_configure() {
77 + local myqmakeargs=(
78 + --
79 + -qml-debug
80 + )
81 + qt5-build_src_configure
82 +}
83
84 diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.0-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.0-r1.ebuild
85 new file mode 100644
86 index 00000000000..0ee13270106
87 --- /dev/null
88 +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.0-r1.ebuild
89 @@ -0,0 +1,58 @@
90 +# Copyright 2009-2020 Gentoo Authors
91 +# Distributed under the terms of the GNU General Public License v2
92 +
93 +EAPI=7
94 +PYTHON_COMPAT=( python3_{6,7,8} )
95 +inherit python-any-r1 qt5-build
96 +
97 +DESCRIPTION="The QML and Quick modules for the Qt5 framework"
98 +
99 +if [[ ${QT5_BUILD_TYPE} == release ]]; then
100 + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
101 +fi
102 +
103 +IUSE="gles2-only +jit localstorage vulkan +widgets"
104 +
105 +BDEPEND="${PYTHON_DEPS}"
106 +# qtgui[gles2-only=] is needed because of bug 504322
107 +DEPEND="
108 + ~dev-qt/qtcore-${PV}
109 + ~dev-qt/qtgui-${PV}:5=[gles2-only=,vulkan=]
110 + ~dev-qt/qtnetwork-${PV}
111 + ~dev-qt/qttest-${PV}
112 + localstorage? ( ~dev-qt/qtsql-${PV} )
113 + widgets? ( ~dev-qt/qtwidgets-${PV}[gles2-only=] )
114 +"
115 +RDEPEND="${DEPEND}
116 + !<dev-qt/qtquickcontrols-5.7:5
117 +"
118 +
119 +PATCHES=(
120 + "${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
121 + "${FILESDIR}/${PN}-5.14.2-fix-subpixel-positioned-text.patch" # QTBUG-49646
122 +)
123 +
124 +src_prepare() {
125 + use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
126 +
127 + qt_use_disable_mod localstorage sql \
128 + src/imports/imports.pro
129 +
130 + qt_use_disable_mod widgets widgets \
131 + src/src.pro \
132 + src/qmltest/qmltest.pro \
133 + tests/auto/auto.pro \
134 + tools/tools.pro \
135 + tools/qmlscene/qmlscene.pro \
136 + tools/qml/qml.pro
137 +
138 + qt5-build_src_prepare
139 +}
140 +
141 +src_configure() {
142 + local myqmakeargs=(
143 + --
144 + -qml-debug
145 + )
146 + qt5-build_src_configure
147 +}