summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-05-09 10:18:51 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-05-09 10:18:51 +0200
commitafd35d48cef2832a1e5db5169d3d0d84d1345a62 (patch)
treee4e8b2bbc796f97a60c8a21b947c14dcc072755d /dev-qt/qtgui
parentnet-misc/httpie: x86 stable wrt bug #721524 (diff)
downloadgentoo-afd35d48cef2832a1e5db5169d3d0d84d1345a62.tar.gz
gentoo-afd35d48cef2832a1e5db5169d3d0d84d1345a62.tar.bz2
gentoo-afd35d48cef2832a1e5db5169d3d0d84d1345a62.zip
dev-qt: Drop Qt 5.13.2
Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-qt/qtgui')
-rw-r--r--dev-qt/qtgui/Manifest1
-rw-r--r--dev-qt/qtgui/files/qtgui-5.13.2-no-xcb-no-xkbcommon.patch34
-rw-r--r--dev-qt/qtgui/metadata.xml1
-rw-r--r--dev-qt/qtgui/qtgui-5.13.2-r1.ebuild179
4 files changed, 0 insertions, 215 deletions
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index a037cabd5640..62cc41e4432c 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,3 +1,2 @@
-DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
diff --git a/dev-qt/qtgui/files/qtgui-5.13.2-no-xcb-no-xkbcommon.patch b/dev-qt/qtgui/files/qtgui-5.13.2-no-xcb-no-xkbcommon.patch
deleted file mode 100644
index 6f63a6371ad7..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.13.2-no-xcb-no-xkbcommon.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2749833d844b20a9e642b2df2074dfafde8622d3 Mon Sep 17 00:00:00 2001
-From: Jimi Huotari <chiitoo@gentoo.org>
-Date: Wed, 6 Nov 2019 00:54:57 +0200
-Subject: [PATCH] Fix build with -xcb and -no-libinput
-
-Since a34e81ab [1], 'xkbcommon_support' is under
-'src/platformsupport/input', and will not be defined when building
-with -no-libinput, and as such, 'xkbcommon_support-private' added in
-'src/plugins/platforms/xcb/xcb_qpa_lib.pro' will be unknown.
-
-1. https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14&id=a34e81ab
-
-Change-Id: I79563b329623651b462b8fedcfb59ef5f2c2e52a
-Gentoo-bug: https://bugs.gentoo.org/699110
-Suggested-by: Petr Zima <zima@matfyz.cz>
----
- src/platformsupport/platformsupport.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro
-index 6d4f1b93bd1..877665ff06b 100644
---- a/src/platformsupport/platformsupport.pro
-+++ b/src/platformsupport/platformsupport.pro
-@@ -11,7 +11,7 @@ SUBDIRS = \
- qtConfig(freetype)|darwin|win32: \
- SUBDIRS += fontdatabases
-
--qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput)|qtConfig(integrityhid) {
-+qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput)|qtConfig(integrityhid)|qtConfig(xkbcommon) {
- SUBDIRS += input
- input.depends += devicediscovery
- }
---
-2.16.3
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index f785d85e8c4a..b10c1ae50253 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -15,7 +15,6 @@
<flag name="tuio">Build plugin to receive touch events over the TUIO protocol</flag>
<flag name="vulkan">Enable support for Vulkan</flag>
<flag name="wayland">Provide <pkg>dev-qt/qtwayland</pkg> to ensure Qt applications can be run as Wayland clients</flag>
- <flag name="xcb">Build the XCB platform plugin and enable X11 integration</flag>
</use>
<upstream>
<bugs-to>https://bugreports.qt.io/</bugs-to>
diff --git a/dev-qt/qtgui/qtgui-5.13.2-r1.ebuild b/dev-qt/qtgui/qtgui-5.13.2-r1.ebuild
deleted file mode 100644
index e296604eeff4..000000000000
--- a/dev-qt/qtgui/qtgui-5.13.2-r1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2020 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="arm"
-fi
-
-# TODO: linuxfb
-
-IUSE="accessibility dbus egl eglfs evdev +gif gles2-only 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-only? ( egl ) )
-"
-
-RDEPEND="
- 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-only? ( 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 )
- 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="${RDEPEND}
- evdev? ( sys-kernel/linux-headers )
- udev? ( sys-kernel/linux-headers )
-"
-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-only::OPENGL_ES
- gles2-only: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}/${P}-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-only 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
-}