diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2015-07-13 00:51:16 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2015-07-13 00:51:16 +0000 |
| commit | f299bb144492935426362b86164531a13c2bda89 (patch) | |
| tree | 550fafc1cd3958f929bc0942a43b9bd96ce0a3f5 /eclass | |
| parent | Version bump. Remove old. (diff) | |
| download | gentoo-2-f299bb144492935426362b86164531a13c2bda89.tar.gz gentoo-2-f299bb144492935426362b86164531a13c2bda89.tar.bz2 gentoo-2-f299bb144492935426362b86164531a13c2bda89.zip | |
Initial support for Qt 5.5
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/qt5-build.eclass | 25 |
2 files changed, 22 insertions, 8 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 44a94ded7ce4..41b8f2e53722 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1707 2015/07/09 20:21:05 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1708 2015/07/13 00:51:16 pesa Exp $ + + 13 Jul 2015; Davide Pesavento <pesa@gentoo.org> qt5-build.eclass: + Initial support for Qt 5.5 09 Jul 2015; Michał Górny <mgorny@gentoo.org> git-r3.eclass: Do not attempt to use submodules for which the checkout path does not exist diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 73a409c491b6..2eafdcbc07f5 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -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/eclass/qt5-build.eclass,v 1.20 2015/06/17 15:48:58 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.21 2015/07/13 00:51:16 pesa Exp $ # @ECLASS: qt5-build.eclass # @MAINTAINER: @@ -535,9 +535,6 @@ qt5_base_configure() { -system-zlib -system-pcre - # don't specify -no-gif because there is no way to override it later - #-no-gif - # disable everything to prevent automagic deps (part 1) -no-mtdev -no-journald @@ -545,8 +542,12 @@ qt5_base_configure() { -no-freetype -no-harfbuzz -no-openssl $([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-libproxy) + $([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-xkbcommon-{x11,evdev}) -no-xinput2 -no-xcb-xlib + # don't specify -no-gif because there is no way to override it later + #-no-gif + # always enable glib event loop support -glib @@ -578,7 +579,10 @@ qt5_base_configure() { -iconv # disable everything to prevent automagic deps (part 3) - -no-cups -no-evdev -no-icu -no-fontconfig -no-dbus + -no-cups -no-evdev + $([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-tslib) + -no-icu -no-fontconfig + -no-dbus # don't strip -no-strip @@ -614,9 +618,16 @@ qt5_base_configure() { # typedef qreal to double (warning: changing this flag breaks the ABI) -qreal double - # disable opengl and egl by default, override in qtgui and qtopengl + # disable OpenGL and EGL support by default, override in qtgui, + # qtopengl, qtprintsupport and qtwidgets -no-opengl -no-egl + # disable libinput-based generic plugin by default, override in qtgui + $([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-libinput) + + # disable gstreamer by default, override in qtmultimedia + $([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-gstreamer) + # use upstream default #-no-system-proxies @@ -673,7 +684,7 @@ qt5_qmake() { QMAKE_LFLAGS_DEBUG= \ "${projectdir}" \ "$@" \ - || die "qmake failed (${projectdir})" + || die "qmake failed (${projectdir#${S}/})" } # @FUNCTION: qt5_install_module_qconfigs |