kensington 15/04/19 18:49:57 Modified: qtgui-5.4.1-r1.ebuild ChangeLog Log: Add gtkstyle USE flag by Harvey Mittens <[email protected]> and Davide Pesavento <[email protected]> wrt bug #526866. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)
Revision Changes Path 1.2 dev-qt/qtgui/qtgui-5.4.1-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtgui/qtgui-5.4.1-r1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtgui/qtgui-5.4.1-r1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtgui/qtgui-5.4.1-r1.ebuild?r1=1.1&r2=1.2 Index: qtgui-5.4.1-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-5.4.1-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qtgui-5.4.1-r1.ebuild 17 Mar 2015 14:24:12 -0000 1.1 +++ qtgui-5.4.1-r1.ebuild 19 Apr 2015 18:49:57 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-5.4.1-r1.ebuild,v 1.1 2015/03/17 14:24:12 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-5.4.1-r1.ebuild,v 1.2 2015/04/19 18:49:57 kensington Exp $ EAPI=5 @@ -18,7 +18,7 @@ # TODO: directfb, linuxfb, offscreen (auto-depends on X11) -IUSE="accessibility egl eglfs evdev +gif gles2 +harfbuzz ibus jpeg kms +opengl +png udev +xcb" +IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +opengl +png udev +xcb" REQUIRED_USE=" egl? ( evdev opengl ) eglfs? ( egl ) @@ -34,6 +34,11 @@ sys-libs/zlib egl? ( media-libs/mesa[egl] ) evdev? ( sys-libs/mtdev ) + gtkstyle? ( + x11-libs/gtk+:2 + x11-libs/pango + !!x11-libs/cairo[qt4] + ) gles2? ( media-libs/mesa[gles2] ) harfbuzz? ( >=media-libs/harfbuzz-0.9.32:= ) ibus? ( ~dev-qt/qtdbus-${PV}[debug=] ) @@ -92,6 +97,8 @@ !gif:no-gif: gles2::OPENGL_ES gles2:opengles2:OPENGL_ES_2 + gtkstyle:gtkstyle: + gtkstyle:gtk2:STYLE_GTK !:no-gui: harfbuzz:system-harfbuzz:HARFBUZZ !harfbuzz:no-harfbuzz: @@ -114,9 +121,10 @@ ) pkg_setup() { - use opengl && QT5_TARGET_SUBDIRS+=(src/openglextensions) - use ibus && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus) - use xcb && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose) + use opengl && QT5_TARGET_SUBDIRS+=(src/openglextensions) + use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2) + use ibus && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus) + use xcb && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose) # 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) @@ -141,6 +149,7 @@ -system-freetype $(use gif || echo -no-gif) ${gl} + $(qt_use gtkstyle) $(qt_use harfbuzz harfbuzz system) $(qt_use jpeg libjpeg system) $(qt_use kms) 1.77 dev-qt/qtgui/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtgui/ChangeLog?rev=1.77&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtgui/ChangeLog?rev=1.77&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtgui/ChangeLog?r1=1.76&r2=1.77 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- ChangeLog 15 Apr 2015 03:47:56 -0000 1.76 +++ ChangeLog 19 Apr 2015 18:49:57 -0000 1.77 @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qtgui # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.76 2015/04/15 03:47:56 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.77 2015/04/19 18:49:57 kensington Exp $ + + 19 Apr 2015; Michael Palimaka <[email protected]> qtgui-5.4.1-r1.ebuild: + Add gtkstyle USE flag by Harvey Mittens <[email protected]> and + Davide Pesavento <[email protected]> wrt bug #526866. 15 Apr 2015; Yixun Lan <[email protected]> qtgui-4.8.6-r2.ebuild: keyword arm64, tested on cortex-a53 hardware
