From 12bbed75c42932674004c24c08b2585f3cf72387 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Sat, 24 Feb 2018 01:54:47 +0300 Subject: =?UTF-8?q?=09=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=BE:=20?= =?UTF-8?q?=20=20=20=20=20dev-qt/qtcore/qtcore-5.10.9999-r1.ebuild=20=09?= =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=BE:=20=20=20=20?= =?UTF-8?q?=20=20dev-qt/qtgui/qtgui-5.10.9999-r1.ebuild=20=09=D0=B8=D0=B7?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=BE:=20=20=20=20=20=20dev-qt/q?= =?UTF-8?q?tnetwork/qtnetwork-5.10.9999-r1.ebuild=20=09=D1=83=D0=B4=D0=B0?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE:=20=20=20=20=20=20=20dev-qt/qtwebengin?= =?UTF-8?q?e/files/qtwebengine-5.9.0-paxmark-mksnapshot.patch=20=09=D0=B8?= =?UTF-8?q?=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=BE:=20=20=20=20=20=20de?= =?UTF-8?q?v-qt/qtwebengine/qtwebengine-5.10.9999-r1.ebuild?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dev-qt/qtgui/qtgui-5.10.9999-r1.ebuild | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'dev-qt/qtgui') diff --git a/dev-qt/qtgui/qtgui-5.10.9999-r1.ebuild b/dev-qt/qtgui/qtgui-5.10.9999-r1.ebuild index 94cbb20..3ab13c6 100644 --- a/dev-qt/qtgui/qtgui-5.10.9999-r1.ebuild +++ b/dev-qt/qtgui/qtgui-5.10.9999-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -26,7 +26,7 @@ REQUIRED_USE=" RDEPEND=" dev-libs/glib:2 - ~dev-qt/qtcore-${PV}[qvkgen] + ~dev-qt/qtcore-${PV} media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.0.6:= @@ -54,7 +54,7 @@ RDEPEND=" x11-libs/libICE x11-libs/libSM x11-libs/libX11 - >=x11-libs/libXi-1.7.4 + >=x11-libs/libXi-1.7.5 >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image @@ -71,7 +71,10 @@ PDEPEND=" ibus? ( app-i18n/ibus ) " +PATCHES=( "${FILESDIR}/${PN}-5.9.4-opengl.patch" ) # QTBUG-66420 + QT5_TARGET_SUBDIRS=( + src/tools/qvkgen src/gui src/openglextensions src/platformheaders @@ -119,6 +122,10 @@ QT5_GENTOO_CONFIG=( xcb::XKB ) +QT5_GENTOO_PRIVATE_CONFIG=( + :gui +) + src_prepare() { # egl_x11 is activated when both egl and xcb are enabled use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11) @@ -148,6 +155,7 @@ src_configure() { -fontconfig -system-freetype $(usex gif '' -no-gif) + -gui -system-harfbuzz $(qt_use jpeg libjpeg system) $(qt_use libinput) -- cgit v1.2.3