1 |
commit: 9bd1288eba96a6da4d15988bcf86a3fe4ed65cc0 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 16 16:36:49 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 7 23:40:45 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bd1288e |
7 |
|
8 |
dev-qt/qtgui: 5.15.2-r12 version bump at KDE c9fde86b |
9 |
|
10 |
Enforce media-libs/libglvnd[X] USE-dep for !gles2-only |
11 |
|
12 |
Upstream fixes: |
13 |
|
14 |
"PDF generation: disentangle native pen from transforms" |
15 |
"Avoid generating large pdf files when using dashed cosmetic pens" |
16 |
QTBUG: https://bugreports.qt.io/browse/QTBUG-86094 |
17 |
|
18 |
"Fix QPainterPath with QFont::SmallCaps" |
19 |
QTBUG: https://bugreports.qt.io/browse/QTBUG-13965 |
20 |
|
21 |
"Respect font stretch if set together with font style" |
22 |
QTBUG: https://bugreports.qt.io/browse/QTBUG-77854 |
23 |
|
24 |
"Support transformations in pattern/texture brushes in pdf" |
25 |
QTBUG: https://bugreports.qt.io/browse/QTBUG-96978 |
26 |
|
27 |
Revert "Fix invalid text layout data when a full layout run is interrupted" |
28 |
See also: |
29 |
"Performance regression in QTextDocument in 5.15" |
30 |
QTBUG: https://bugreports.qt.io/browse/QTBUG-89599 |
31 |
QTBUG: https://bugreports.qt.io/browse/QTBUG-20354 |
32 |
|
33 |
Thanks-to: Davide Pesavento <pesa <AT> gentoo.org> |
34 |
Bug: https://bugs.gentoo.org/816492 |
35 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
36 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
37 |
|
38 |
dev-qt/qtgui/Manifest | 1 + |
39 |
dev-qt/qtgui/qtgui-5.15.2-r14.ebuild | 184 +++++++++++++++++++++++++++++++++++ |
40 |
2 files changed, 185 insertions(+) |
41 |
|
42 |
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest |
43 |
index 4b8920365b9..2487ae322ae 100644 |
44 |
--- a/dev-qt/qtgui/Manifest |
45 |
+++ b/dev-qt/qtgui/Manifest |
46 |
@@ -1 +1,2 @@ |
47 |
DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388 |
48 |
+DIST qtbase-5.15.2-c9fde86b.tar.gz 67960262 BLAKE2B d1a6a7dac78abce189a753c0a00185fbe03f9de97b226790535af73a9bc009b353fe1edeb754d2098a7beeb7cd1c6e7efb949797658269ef0d0f200f11909820 SHA512 99026537dd4da678bcb04214ebb717907422e373b44fd3b3716798565c330f8d492ec1fc67d936c5125292b30e44f23abe4bf6434b58b9fa76bada3680dfc9f8 |
49 |
|
50 |
diff --git a/dev-qt/qtgui/qtgui-5.15.2-r14.ebuild b/dev-qt/qtgui/qtgui-5.15.2-r14.ebuild |
51 |
new file mode 100644 |
52 |
index 00000000000..08a64432311 |
53 |
--- /dev/null |
54 |
+++ b/dev-qt/qtgui/qtgui-5.15.2-r14.ebuild |
55 |
@@ -0,0 +1,184 @@ |
56 |
+# Copyright 1999-2021 Gentoo Authors |
57 |
+# Distributed under the terms of the GNU General Public License v2 |
58 |
+ |
59 |
+EAPI=8 |
60 |
+ |
61 |
+KDE_ORG_COMMIT=c9fde86b0a2440133bc08f4811b6ca793be47f0a |
62 |
+QT5_MODULE="qtbase" |
63 |
+inherit qt5-build |
64 |
+ |
65 |
+DESCRIPTION="The GUI module and platform plugins for the Qt5 framework" |
66 |
+SLOT=5/${QT5_PV} # bug 707658 |
67 |
+ |
68 |
+if [[ ${QT5_BUILD_TYPE} == release ]]; then |
69 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" |
70 |
+fi |
71 |
+ |
72 |
+IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg |
73 |
+ +libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X" |
74 |
+REQUIRED_USE=" |
75 |
+ || ( eglfs linuxfb vnc X ) |
76 |
+ accessibility? ( dbus X ) |
77 |
+ eglfs? ( egl ) |
78 |
+ ibus? ( dbus ) |
79 |
+ libinput? ( udev ) |
80 |
+ X? ( gles2-only? ( egl ) ) |
81 |
+" |
82 |
+ |
83 |
+RDEPEND=" |
84 |
+ dev-libs/glib:2 |
85 |
+ =dev-qt/qtcore-${QT5_PV}*:5= |
86 |
+ dev-util/gtk-update-icon-cache |
87 |
+ media-libs/fontconfig |
88 |
+ media-libs/freetype:2 |
89 |
+ media-libs/harfbuzz:= |
90 |
+ sys-libs/zlib:= |
91 |
+ dbus? ( =dev-qt/qtdbus-${QT5_PV}* ) |
92 |
+ eglfs? ( |
93 |
+ media-libs/mesa[gbm(+)] |
94 |
+ x11-libs/libdrm |
95 |
+ ) |
96 |
+ evdev? ( sys-libs/mtdev ) |
97 |
+ jpeg? ( virtual/jpeg ) |
98 |
+ gles2-only? ( media-libs/libglvnd ) |
99 |
+ !gles2-only? ( media-libs/libglvnd[X] ) |
100 |
+ libinput? ( |
101 |
+ dev-libs/libinput:= |
102 |
+ x11-libs/libxkbcommon |
103 |
+ ) |
104 |
+ png? ( media-libs/libpng:= ) |
105 |
+ tslib? ( >=x11-libs/tslib-1.21 ) |
106 |
+ tuio? ( =dev-qt/qtnetwork-${QT5_PV}* ) |
107 |
+ udev? ( virtual/libudev:= ) |
108 |
+ vnc? ( =dev-qt/qtnetwork-${QT5_PV}* ) |
109 |
+ vulkan? ( dev-util/vulkan-headers ) |
110 |
+ X? ( |
111 |
+ x11-libs/libICE |
112 |
+ x11-libs/libSM |
113 |
+ x11-libs/libX11 |
114 |
+ x11-libs/libxcb:=[xkb] |
115 |
+ x11-libs/libxkbcommon[X] |
116 |
+ x11-libs/xcb-util-image |
117 |
+ x11-libs/xcb-util-keysyms |
118 |
+ x11-libs/xcb-util-renderutil |
119 |
+ x11-libs/xcb-util-wm |
120 |
+ ) |
121 |
+" |
122 |
+DEPEND="${RDEPEND} |
123 |
+ evdev? ( sys-kernel/linux-headers ) |
124 |
+ linuxfb? ( sys-kernel/linux-headers ) |
125 |
+ udev? ( sys-kernel/linux-headers ) |
126 |
+" |
127 |
+PDEPEND=" |
128 |
+ ibus? ( app-i18n/ibus ) |
129 |
+ wayland? ( =dev-qt/qtwayland-${QT5_PV}* ) |
130 |
+" |
131 |
+ |
132 |
+QT5_TARGET_SUBDIRS=( |
133 |
+ src/tools/qvkgen |
134 |
+ src/gui |
135 |
+ src/openglextensions |
136 |
+ src/platformheaders |
137 |
+ src/platformsupport |
138 |
+ src/plugins/generic |
139 |
+ src/plugins/imageformats |
140 |
+ src/plugins/platforms |
141 |
+ src/plugins/platforminputcontexts |
142 |
+) |
143 |
+ |
144 |
+QT5_GENTOO_CONFIG=( |
145 |
+ accessibility:accessibility-atspi-bridge |
146 |
+ egl:egl: |
147 |
+ eglfs:eglfs: |
148 |
+ eglfs:eglfs_egldevice: |
149 |
+ eglfs:eglfs_gbm: |
150 |
+ evdev:evdev: |
151 |
+ evdev:mtdev: |
152 |
+ :fontconfig: |
153 |
+ :system-freetype:FREETYPE |
154 |
+ !:no-freetype: |
155 |
+ !gif:no-gif: |
156 |
+ gles2-only::OPENGL_ES |
157 |
+ gles2-only:opengles2:OPENGL_ES_2 |
158 |
+ !:no-gui: |
159 |
+ :system-harfbuzz: |
160 |
+ !:no-harfbuzz: |
161 |
+ jpeg:system-jpeg:IMAGEFORMAT_JPEG |
162 |
+ !jpeg:no-jpeg: |
163 |
+ libinput |
164 |
+ libinput:xkbcommon: |
165 |
+ :opengl |
166 |
+ png:png: |
167 |
+ png:system-png:IMAGEFORMAT_PNG |
168 |
+ !png:no-png: |
169 |
+ tslib:tslib: |
170 |
+ udev:libudev: |
171 |
+ vulkan:vulkan: |
172 |
+ X:xcb: |
173 |
+ X:xcb-glx: |
174 |
+ X:xcb-plugin: |
175 |
+ X:xcb-render: |
176 |
+ X:xcb-sm: |
177 |
+ X:xcb-xlib: |
178 |
+ X:xcb-xinput: |
179 |
+) |
180 |
+ |
181 |
+QT5_GENTOO_PRIVATE_CONFIG=( |
182 |
+ :gui |
183 |
+) |
184 |
+ |
185 |
+PATCHES=( |
186 |
+ "${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946 |
187 |
+ "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306 |
188 |
+) |
189 |
+ |
190 |
+src_prepare() { |
191 |
+ # don't add -O3 to CXXFLAGS, bug 549140 |
192 |
+ sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die |
193 |
+ |
194 |
+ # egl_x11 is activated when both egl and X are enabled |
195 |
+ use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:) |
196 |
+ |
197 |
+ qt_use_disable_config dbus dbus \ |
198 |
+ src/platformsupport/themes/genericunix/genericunix.pri |
199 |
+ |
200 |
+ qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro |
201 |
+ |
202 |
+ qt_use_disable_mod ibus dbus \ |
203 |
+ src/plugins/platforminputcontexts/platforminputcontexts.pro |
204 |
+ |
205 |
+ use vnc || sed -i -e '/SUBDIRS += vnc/d' \ |
206 |
+ src/plugins/platforms/platforms.pro || die |
207 |
+ |
208 |
+ qt5-build_src_prepare |
209 |
+} |
210 |
+ |
211 |
+src_configure() { |
212 |
+ local myconf=( |
213 |
+ $(usev dbus -dbus-linked) |
214 |
+ $(qt_use egl) |
215 |
+ $(qt_use eglfs) |
216 |
+ $(usev eglfs '-gbm -kms') |
217 |
+ $(qt_use evdev) |
218 |
+ $(qt_use evdev mtdev) |
219 |
+ -fontconfig |
220 |
+ -system-freetype |
221 |
+ $(usev !gif -no-gif) |
222 |
+ -gui |
223 |
+ -system-harfbuzz |
224 |
+ $(qt_use jpeg libjpeg system) |
225 |
+ $(qt_use libinput) |
226 |
+ $(qt_use linuxfb) |
227 |
+ -opengl $(usex gles2-only es2 desktop) |
228 |
+ $(qt_use png libpng system) |
229 |
+ $(qt_use tslib) |
230 |
+ $(qt_use udev libudev) |
231 |
+ $(qt_use vulkan) |
232 |
+ $(qt_use X xcb) |
233 |
+ $(usev X '-xcb-xlib') |
234 |
+ ) |
235 |
+ if use libinput || use X; then |
236 |
+ myconf+=( -xkbcommon ) |
237 |
+ fi |
238 |
+ qt5-build_src_configure |
239 |
+} |