From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0EFC0138CAE for ; Sun, 19 Apr 2015 16:55:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0AB65E0854; Sun, 19 Apr 2015 16:55:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8E154E0854 for ; Sun, 19 Apr 2015 16:55:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A1D21340BCF for ; Sun, 19 Apr 2015 16:55:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4249B16462 for ; Sun, 19 Apr 2015 16:55:21 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1429462316.eb9152725baf126b185df14a43035149bf9504ac.kensington@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtgui/qtgui-5.4.9999.ebuild dev-qt/qtgui/qtgui-5.5.9999.ebuild dev-qt/qtgui/qtgui-5.9999.ebuild X-VCS-Directories: dev-qt/qtgui/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: eb9152725baf126b185df14a43035149bf9504ac X-VCS-Branch: master Date: Sun, 19 Apr 2015 16:55:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 23e38e19-af46-420f-ac6b-f28b26123daf X-Archives-Hash: 9fbb46c2055c181891b043041b60f534 commit: eb9152725baf126b185df14a43035149bf9504ac Author: Michael Palimaka gentoo org> AuthorDate: Sun Apr 19 16:47:24 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sun Apr 19 16:51:56 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=eb915272 [dev-qt/qtgui] Add gtkstyle USE flag by Harvey Mittens riseup.net> wrt bug #526866. Package-Manager: portage-2.2.18 dev-qt/qtgui/qtgui-5.4.9999.ebuild | 17 +++++++++++++---- dev-qt/qtgui/qtgui-5.5.9999.ebuild | 17 +++++++++++++---- dev-qt/qtgui/qtgui-5.9999.ebuild | 17 +++++++++++++---- 3 files changed, 39 insertions(+), 12 deletions(-) diff --git a/dev-qt/qtgui/qtgui-5.4.9999.ebuild b/dev-qt/qtgui/qtgui-5.4.9999.ebuild index 3b2ba21..0ceb3e2 100644 --- a/dev-qt/qtgui/qtgui-5.4.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.4.9999.ebuild @@ -18,7 +18,7 @@ fi # 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 @@ RDEPEND=" >=sys-libs/zlib-1.2.5 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=] ) @@ -90,6 +95,8 @@ QT5_GENTOO_CONFIG=( !gif:no-gif: gles2::OPENGL_ES gles2:opengles2:OPENGL_ES_2 + gtkstyle + gtkstyle:gtk2 !:no-gui: harfbuzz:system-harfbuzz:HARFBUZZ !harfbuzz:no-harfbuzz: @@ -112,9 +119,10 @@ QT5_GENTOO_CONFIG=( ) 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 gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2) + 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) # 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) @@ -139,6 +147,7 @@ src_configure() { -system-freetype $(use gif || echo -no-gif) ${gl} + $(qt_use gtkstyle) $(qt_use harfbuzz harfbuzz system) $(qt_use jpeg libjpeg system) $(qt_use kms) diff --git a/dev-qt/qtgui/qtgui-5.5.9999.ebuild b/dev-qt/qtgui/qtgui-5.5.9999.ebuild index 67f3639..349f7ae 100644 --- a/dev-qt/qtgui/qtgui-5.5.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.5.9999.ebuild @@ -18,7 +18,7 @@ fi # 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 @@ RDEPEND=" >=sys-libs/zlib-1.2.5 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.38:= ) ibus? ( ~dev-qt/qtdbus-${PV}[debug=] ) @@ -90,6 +95,8 @@ QT5_GENTOO_CONFIG=( !gif:no-gif: gles2::OPENGL_ES gles2:opengles2:OPENGL_ES_2 + gtkstyle + gtkstyle:gtk2 !:no-gui: harfbuzz:system-harfbuzz:HARFBUZZ !harfbuzz:no-harfbuzz: @@ -112,9 +119,10 @@ QT5_GENTOO_CONFIG=( ) 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 gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2) + 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) # 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) @@ -139,6 +147,7 @@ src_configure() { -system-freetype $(use gif || echo -no-gif) ${gl} + $(qt_use gtkstyle) $(qt_use harfbuzz harfbuzz system) $(qt_use jpeg libjpeg system) $(qt_use kms) diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild index 67f3639..349f7ae 100644 --- a/dev-qt/qtgui/qtgui-5.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.9999.ebuild @@ -18,7 +18,7 @@ fi # 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 @@ RDEPEND=" >=sys-libs/zlib-1.2.5 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.38:= ) ibus? ( ~dev-qt/qtdbus-${PV}[debug=] ) @@ -90,6 +95,8 @@ QT5_GENTOO_CONFIG=( !gif:no-gif: gles2::OPENGL_ES gles2:opengles2:OPENGL_ES_2 + gtkstyle + gtkstyle:gtk2 !:no-gui: harfbuzz:system-harfbuzz:HARFBUZZ !harfbuzz:no-harfbuzz: @@ -112,9 +119,10 @@ QT5_GENTOO_CONFIG=( ) 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 gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2) + 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) # 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) @@ -139,6 +147,7 @@ src_configure() { -system-freetype $(use gif || echo -no-gif) ${gl} + $(qt_use gtkstyle) $(qt_use harfbuzz harfbuzz system) $(qt_use jpeg libjpeg system) $(qt_use kms)