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/qtgui/
Date: Mon, 31 Aug 2020 19:59:13
Message-Id: 1598903924.b63131a033258484a470290415c50cde1e6c63d2.asturm@gentoo
1 commit: b63131a033258484a470290415c50cde1e6c63d2
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 31 19:58:21 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 31 19:58:44 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b63131a0
7
8 dev-qt/qtgui: Cleanup vulnerable 5.14.2 (r0)
9
10 Bug: https://bugs.gentoo.org/736924
11 Package-Manager: Portage-3.0.5, Repoman-3.0.1
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 dev-qt/qtgui/qtgui-5.14.2.ebuild | 184 ---------------------------------------
15 1 file changed, 184 deletions(-)
16
17 diff --git a/dev-qt/qtgui/qtgui-5.14.2.ebuild b/dev-qt/qtgui/qtgui-5.14.2.ebuild
18 deleted file mode 100644
19 index e2dab17a93b..00000000000
20 --- a/dev-qt/qtgui/qtgui-5.14.2.ebuild
21 +++ /dev/null
22 @@ -1,184 +0,0 @@
23 -# Copyright 1999-2020 Gentoo Authors
24 -# Distributed under the terms of the GNU General Public License v2
25 -
26 -EAPI=7
27 -
28 -QT5_MODULE="qtbase"
29 -inherit qt5-build
30 -
31 -DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
32 -SLOT=5/$(ver_cut 1-3) # bug 707658
33 -
34 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
35 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
36 -fi
37 -
38 -# TODO: linuxfb
39 -
40 -IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
41 - +libinput +png tslib tuio +udev vnc vulkan wayland +X"
42 -REQUIRED_USE="
43 - || ( eglfs X )
44 - accessibility? ( dbus X )
45 - eglfs? ( egl )
46 - ibus? ( dbus )
47 - libinput? ( udev )
48 - X? ( gles2-only? ( egl ) )
49 -"
50 -
51 -RDEPEND="
52 - dev-libs/glib:2
53 - ~dev-qt/qtcore-${PV}:5=
54 - dev-util/gtk-update-icon-cache
55 - media-libs/fontconfig
56 - >=media-libs/freetype-2.6.1:2
57 - >=media-libs/harfbuzz-1.6.0:=
58 - sys-libs/zlib:=
59 - virtual/opengl
60 - dbus? ( ~dev-qt/qtdbus-${PV} )
61 - egl? ( media-libs/mesa[egl] )
62 - eglfs? (
63 - media-libs/mesa[gbm]
64 - x11-libs/libdrm
65 - )
66 - evdev? ( sys-libs/mtdev )
67 - gles2-only? ( media-libs/mesa[gles2] )
68 - jpeg? ( virtual/jpeg:0 )
69 - libinput? (
70 - dev-libs/libinput:=
71 - >=x11-libs/libxkbcommon-0.5.0
72 - )
73 - png? ( media-libs/libpng:0= )
74 - tslib? ( >=x11-libs/tslib-1.21 )
75 - tuio? ( ~dev-qt/qtnetwork-${PV} )
76 - udev? ( virtual/libudev:= )
77 - vnc? ( ~dev-qt/qtnetwork-${PV} )
78 - vulkan? ( dev-util/vulkan-headers )
79 - X? (
80 - x11-libs/libICE
81 - x11-libs/libSM
82 - x11-libs/libX11
83 - >=x11-libs/libxcb-1.12:=[xkb]
84 - >=x11-libs/libxkbcommon-0.5.0[X]
85 - x11-libs/xcb-util-image
86 - x11-libs/xcb-util-keysyms
87 - x11-libs/xcb-util-renderutil
88 - x11-libs/xcb-util-wm
89 - )
90 -"
91 -DEPEND="${RDEPEND}
92 - evdev? ( sys-kernel/linux-headers )
93 - udev? ( sys-kernel/linux-headers )
94 -"
95 -PDEPEND="
96 - ibus? ( app-i18n/ibus )
97 - wayland? ( ~dev-qt/qtwayland-${PV} )
98 -"
99 -
100 -QT5_TARGET_SUBDIRS=(
101 - src/tools/qvkgen
102 - src/gui
103 - src/openglextensions
104 - src/platformheaders
105 - src/platformsupport
106 - src/plugins/generic
107 - src/plugins/imageformats
108 - src/plugins/platforms
109 - src/plugins/platforminputcontexts
110 -)
111 -
112 -QT5_GENTOO_CONFIG=(
113 - accessibility:accessibility-atspi-bridge
114 - egl:egl:
115 - eglfs:eglfs:
116 - eglfs:eglfs_egldevice:
117 - eglfs:eglfs_gbm:
118 - evdev:evdev:
119 - evdev:mtdev:
120 - :fontconfig:
121 - :system-freetype:FREETYPE
122 - !:no-freetype:
123 - !gif:no-gif:
124 - gles2-only::OPENGL_ES
125 - gles2-only:opengles2:OPENGL_ES_2
126 - !:no-gui:
127 - :system-harfbuzz:
128 - !:no-harfbuzz:
129 - jpeg:system-jpeg:IMAGEFORMAT_JPEG
130 - !jpeg:no-jpeg:
131 - libinput
132 - libinput:xkbcommon:
133 - :opengl
134 - png:png:
135 - png:system-png:IMAGEFORMAT_PNG
136 - !png:no-png:
137 - tslib:tslib:
138 - udev:libudev:
139 - vulkan:vulkan:
140 - X:xcb:
141 - X:xcb-glx:
142 - X:xcb-plugin:
143 - X:xcb-render:
144 - X:xcb-sm:
145 - X:xcb-xlib:
146 - X:xcb-xinput:
147 -)
148 -
149 -QT5_GENTOO_PRIVATE_CONFIG=(
150 - :gui
151 -)
152 -
153 -PATCHES=(
154 - "${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
155 - "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
156 -)
157 -
158 -src_prepare() {
159 - # don't add -O3 to CXXFLAGS, bug 549140
160 - sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
161 -
162 - # egl_x11 is activated when both egl and X are enabled
163 - use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
164 -
165 - qt_use_disable_config dbus dbus \
166 - src/platformsupport/themes/genericunix/genericunix.pri
167 -
168 - qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
169 -
170 - qt_use_disable_mod ibus dbus \
171 - src/plugins/platforminputcontexts/platforminputcontexts.pro
172 -
173 - use vnc || sed -i -e '/SUBDIRS += vnc/d' \
174 - src/plugins/platforms/platforms.pro || die
175 -
176 - qt5-build_src_prepare
177 -}
178 -
179 -src_configure() {
180 - local myconf=(
181 - $(usex dbus -dbus-linked '')
182 - $(qt_use egl)
183 - $(qt_use eglfs)
184 - $(usex eglfs '-gbm -kms' '')
185 - $(qt_use evdev)
186 - $(qt_use evdev mtdev)
187 - -fontconfig
188 - -system-freetype
189 - $(usex gif '' -no-gif)
190 - -gui
191 - -system-harfbuzz
192 - $(qt_use jpeg libjpeg system)
193 - $(qt_use libinput)
194 - -opengl $(usex gles2-only es2 desktop)
195 - $(qt_use png libpng system)
196 - $(qt_use tslib)
197 - $(qt_use udev libudev)
198 - $(qt_use vulkan)
199 - $(qt_use X xcb system)
200 - $(usex X '-xcb-xlib -xcb-xinput -xkb' '')
201 - )
202 - if use libinput || use X; then
203 - myconf+=( -xkbcommon )
204 - fi
205 - qt5-build_src_configure
206 -}