diff options
Diffstat (limited to 'dev-qt/qtgui')
| -rw-r--r-- | dev-qt/qtgui/Manifest | 3 | ||||
| -rw-r--r-- | dev-qt/qtgui/qtgui-5.14.0-r1.ebuild | 186 | ||||
| -rw-r--r-- | dev-qt/qtgui/qtgui-5.14.0-r3.ebuild (renamed from dev-qt/qtgui/qtgui-5.14.0-r2.ebuild) | 35 |
3 files changed, 19 insertions, 205 deletions
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index 47271bcfc4d0..fbe26f5c7a92 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -8,6 +8,5 @@ DIST qtbase-everywhere-src-5.14.0.tar.xz 49713412 BLAKE2B b59a98b12ade13ef27a055 EBUILD qtgui-5.12.3-r1.ebuild 3707 BLAKE2B b73f820eded407365f5cb7d3a0938dd938a8e5e0573ec7051bb8375424accb8c1d84d50e4673f7504ed76d53d9bc57f9b1ceb64da3f0e883a729d06ad082b9ac SHA512 8afedb468ff74a47d1974858a2d6e67a5a158bd1540195a7211f3109c48c7ce62a293eeb47215eddca0c4126c0729ae5282fb0b9ebd3482fc2262bc9521f2877 EBUILD qtgui-5.12.5.ebuild 3792 BLAKE2B 865e36e7dc7c5686bdcea6005063b83d8489291e5541b93d53b2ce8b66f2120f5c6e7c9b773c6edfbdcf7759bf11071252ee0a889eae7eae05f88a6a3f971c85 SHA512 279f7cbd934cea6fa8e6230a6407eb264212178c43617536f720074e02cf2a55aeab533544e2649ae067147074a28775707efba8e268a0f6bb0ff6a13b02e719 EBUILD qtgui-5.13.2.ebuild 3851 BLAKE2B ed81578d7ec0459dd2d55d7b9236a14ade1cac2ceee5b046d7010327fbb09437dad1f2603bbccd8fee0bf42f51e6d0e0e40f05c73b9558e20cfbb8a25f7b96ac SHA512 2d66bc1a4f942d8d425cbb90937d081aa58cd704075ddcd220cec91933e1942e2cd6bdc688bee82d284bb3b672e6668b18c40daaa334d29e93fa242e1a79d749 -EBUILD qtgui-5.14.0-r1.ebuild 4111 BLAKE2B 978a7d785a9e7ca67782b5e22bc892e56ef5b8f888d2c014d37770c88582cace01128d65917958633e329f6ab04e97f0b049385a8d8cf47fa1ab73e4422e2b7d SHA512 de76c010cf14b1663283c6242ae750bbd6b0492176f7f651d6fa1bfb185ba0518b032b303c6aa6c1602e4cb98819186c6fd489321c7b1924893c7bced57ef7a5 -EBUILD qtgui-5.14.0-r2.ebuild 4181 BLAKE2B ffac194264e284458686143ad8ec8136b52bf39033815343650d84d2b7b855ac1b3519e216f78f45bdab39f39fc9b3592293091ce11fdd67e5f8856bd66b4d54 SHA512 5ef16ffece81c1a6a70bcc11ea12316373be9c0023e34500bf9454439f0b40c5d8502a337fc706216f774f7026f67c4cff6dc37b19eed55569890f7211a3386d +EBUILD qtgui-5.14.0-r3.ebuild 4148 BLAKE2B 7f9caf89a08ffcd59d1997a266d29c80ec286823cf505c5c3ee9a32f077ed891d99055218e95ecca5ebb421f5d977347a92ab20613bbaa5657d3892b10ac9d33 SHA512 8c78b621af7156cc75f19514569fd3cf227938d2d46bf3ab43f353a9badfe0241f80f7c75bf0ca1c73cbba402bd3895cc8a9be209fd7a7d2eb2cbcaf5f22af3c MISC metadata.xml 1322 BLAKE2B b6161b568e3a4c34a8fce62a8cce9e1bd7cabbc0d2d2baa0e5e41295974b877d59adff4983b731bb359040f3662999a7915a1527bedeca9de09eb702541d1ae7 SHA512 dcfcdc8f5622e5d6b8488f07b6de62aae829b564ecdb9fb8b9f273bc2593c312f5265849bb3d2175d0ab468977ac2afb8099519cfb66224d8e5df0efec01ae4a diff --git a/dev-qt/qtgui/qtgui-5.14.0-r1.ebuild b/dev-qt/qtgui/qtgui-5.14.0-r1.ebuild deleted file mode 100644 index 592b885552ca..000000000000 --- a/dev-qt/qtgui/qtgui-5.14.0-r1.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="The GUI module and platform plugins for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -fi - -# TODO: linuxfb - -IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus - jpeg +libinput +png tslib tuio +udev vnc wayland +xcb" -REQUIRED_USE=" - || ( eglfs xcb ) - accessibility? ( dbus xcb ) - eglfs? ( egl ) - ibus? ( dbus ) - libinput? ( udev ) - xcb? ( gles2? ( egl ) ) -" - -COMMON_DEPEND=" - dev-libs/glib:2 - ~dev-qt/qtcore-${PV} - dev-util/gtk-update-icon-cache - media-libs/fontconfig - >=media-libs/freetype-2.6.1:2 - >=media-libs/harfbuzz-1.6.0:= - sys-libs/zlib:= - virtual/opengl - dbus? ( ~dev-qt/qtdbus-${PV} ) - egl? ( media-libs/mesa[egl] ) - eglfs? ( - media-libs/mesa[gbm] - x11-libs/libdrm - ) - evdev? ( sys-libs/mtdev ) - gles2? ( media-libs/mesa[gles2] ) - jpeg? ( virtual/jpeg:0 ) - libinput? ( - dev-libs/libinput:= - >=x11-libs/libxkbcommon-0.5.0 - ) - png? ( media-libs/libpng:0= ) - tslib? ( >=x11-libs/tslib-1.21 ) - tuio? ( ~dev-qt/qtnetwork-${PV} ) - udev? ( virtual/libudev:= ) - vnc? ( ~dev-qt/qtnetwork-${PV} ) - xcb? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - >=x11-libs/libxcb-1.12:=[xkb] - >=x11-libs/libxkbcommon-0.5.0[X] - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm - ) -" -DEPEND="${COMMON_DEPEND} - evdev? ( sys-kernel/linux-headers ) - udev? ( sys-kernel/linux-headers ) -" -# bug 703306, _populate_Gui_plugin_properties breaks installed cmake modules -RDEPEND="${COMMON_DEPEND} - !<dev-qt/qtimageformats-5.14.0:5 - !<dev-qt/qtsvg-5.14.0:5 - !<dev-qt/qtvirtualkeyboard-5.14.0:5 - !<dev-qt/qtwayland-5.14.0:5 -" -PDEPEND=" - ibus? ( app-i18n/ibus ) - wayland? ( ~dev-qt/qtwayland-${PV} ) -" - -QT5_TARGET_SUBDIRS=( - src/tools/qvkgen - src/gui - src/openglextensions - src/platformheaders - src/platformsupport - src/plugins/generic - src/plugins/imageformats - src/plugins/platforms - src/plugins/platforminputcontexts -) - -QT5_GENTOO_CONFIG=( - accessibility:accessibility-atspi-bridge - egl:egl: - eglfs:eglfs: - eglfs:eglfs_egldevice: - eglfs:eglfs_gbm: - evdev:evdev: - evdev:mtdev: - :fontconfig: - :system-freetype:FREETYPE - !:no-freetype: - !gif:no-gif: - gles2::OPENGL_ES - gles2:opengles2:OPENGL_ES_2 - !:no-gui: - :system-harfbuzz: - !:no-harfbuzz: - jpeg:system-jpeg:IMAGEFORMAT_JPEG - !jpeg:no-jpeg: - libinput - libinput:xkbcommon: - :opengl - png:png: - png:system-png:IMAGEFORMAT_PNG - !png:no-png: - tslib:tslib: - udev:libudev: - xcb:xcb: - xcb:xcb-glx: - xcb:xcb-plugin: - xcb:xcb-render: - xcb:xcb-sm: - xcb:xcb-xlib: - xcb:xcb-xinput: -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :gui -) - -PATCHES=( - "${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946 - "${FILESDIR}/${PN}-5.13.2-no-xcb-no-xkbcommon.patch" # bug 699110 -) - -src_prepare() { - # don't add -O3 to CXXFLAGS, bug 549140 - sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die - - # 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:) - - qt_use_disable_config dbus dbus \ - src/platformsupport/themes/genericunix/genericunix.pri - - qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro - - qt_use_disable_mod ibus dbus \ - src/plugins/platforminputcontexts/platforminputcontexts.pro - - use vnc || sed -i -e '/SUBDIRS += vnc/d' \ - src/plugins/platforms/platforms.pro || die - - qt5-build_src_prepare -} - -src_configure() { - local myconf=( - $(usex dbus -dbus-linked '') - $(qt_use egl) - $(qt_use eglfs) - $(usex eglfs '-gbm -kms' '') - $(qt_use evdev) - $(qt_use evdev mtdev) - -fontconfig - -system-freetype - $(usex gif '' -no-gif) - -gui - -system-harfbuzz - $(qt_use jpeg libjpeg system) - $(qt_use libinput) - -opengl $(usex gles2 es2 desktop) - $(qt_use png libpng system) - $(qt_use tslib) - $(qt_use udev libudev) - $(qt_use xcb xcb system) - $(usex xcb '-xcb-xlib -xcb-xinput -xkb' '') - ) - if use libinput || use xcb; then - myconf+=( -xkbcommon ) - fi - qt5-build_src_configure -} diff --git a/dev-qt/qtgui/qtgui-5.14.0-r2.ebuild b/dev-qt/qtgui/qtgui-5.14.0-r3.ebuild index 1f814dd0fe50..8ab48c846dd5 100644 --- a/dev-qt/qtgui/qtgui-5.14.0-r2.ebuild +++ b/dev-qt/qtgui/qtgui-5.14.0-r3.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + QT5_MODULE="qtbase" inherit qt5-build @@ -14,14 +15,14 @@ fi # TODO: linuxfb IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus - jpeg +libinput +png tslib tuio +udev vnc wayland +xcb" + jpeg +libinput +png tslib tuio +udev vnc wayland +X" REQUIRED_USE=" - || ( eglfs xcb ) - accessibility? ( dbus xcb ) + || ( eglfs X ) + accessibility? ( dbus X ) eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) - xcb? ( gles2? ( egl ) ) + X? ( gles2? ( egl ) ) " COMMON_DEPEND=" @@ -51,7 +52,7 @@ COMMON_DEPEND=" tuio? ( ~dev-qt/qtnetwork-${PV} ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-${PV} ) - xcb? ( + X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 @@ -118,13 +119,13 @@ QT5_GENTOO_CONFIG=( !png:no-png: tslib:tslib: udev:libudev: - xcb:xcb: - xcb:xcb-glx: - xcb:xcb-plugin: - xcb:xcb-render: - xcb:xcb-sm: - xcb:xcb-xlib: - xcb:xcb-xinput: + X:xcb: + X:xcb-glx: + X:xcb-plugin: + X:xcb-render: + X:xcb-sm: + X:xcb-xlib: + X:xcb-xinput: ) QT5_GENTOO_PRIVATE_CONFIG=( @@ -141,8 +142,8 @@ src_prepare() { # don't add -O3 to CXXFLAGS, bug 549140 sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die - # 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:) + # egl_x11 is activated when both egl and X are enabled + use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:) qt_use_disable_config dbus dbus \ src/platformsupport/themes/genericunix/genericunix.pri @@ -177,10 +178,10 @@ src_configure() { $(qt_use png libpng system) $(qt_use tslib) $(qt_use udev libudev) - $(qt_use xcb xcb system) - $(usex xcb '-xcb-xlib -xcb-xinput -xkb' '') + $(qt_use X xcb system) + $(usex X '-xcb-xlib -xcb-xinput -xkb' '') ) - if use libinput || use xcb; then + if use libinput || use X; then myconf+=( -xkbcommon ) fi qt5-build_src_configure |