commit: c1656b6dcec27a716caf2b516e03c9d3fc2558c6 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Jan 1 16:56:05 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Jan 2 01:22:31 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1656b6d
dev-qt/qtgui: Drop bogus xcb-util build dep See also: https://bugreports.qt.io/browse/QTBUG-88688 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/qtgui-5.15.2-bogus-xcb-util-dep.patch | 72 ++++++++ dev-qt/qtgui/qtgui-5.15.2-r1.ebuild | 188 +++++++++++++++++++++ 2 files changed, 260 insertions(+) diff --git a/dev-qt/qtgui/files/qtgui-5.15.2-bogus-xcb-util-dep.patch b/dev-qt/qtgui/files/qtgui-5.15.2-bogus-xcb-util-dep.patch new file mode 100644 index 00000000000..b7f65483fb1 --- /dev/null +++ b/dev-qt/qtgui/files/qtgui-5.15.2-bogus-xcb-util-dep.patch @@ -0,0 +1,72 @@ +From 61b07d75f96d4dfb07b485b2a9bd7aed099df987 Mon Sep 17 00:00:00 2001 +From: Liang Qi <[email protected]> +Date: Tue, 1 Dec 2020 08:43:28 +0100 +Subject: [PATCH] Revert "xcb: add xcb-util dependency for xcb-image" +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +This reverts commit adc42bebcac764ca8de78578e3a4ac39b621bd09. + +adc42beb is wrong, the bug is for static build of qt with static +xcb. It adds the explicit dependency of xcb-util 0.3.9, which is +not available on Debian yet. + +Task-number: QTBUG-86287 +Fixes: QTBUG-88688 +Change-Id: Iffc821f49bdfcad3f2556951d3677c35a7682266 +Reviewed-by: Thiago Macieira <[email protected]> +Reviewed-by: Tor Arne Vestbø <[email protected]> +(adapted from commit 92a57e0b016f811876ec1d62328ca8edfe452a3a) +--- + src/gui/configure.json | 14 ++------------ + 1 file changed, 2 insertions(+), 12 deletions(-) + +diff --git a/src/gui/configure.json b/src/gui/configure.json +index c8c4864eca6..1f08795c57b 100644 +--- a/src/gui/configure.json ++++ b/src/gui/configure.json +@@ -601,15 +601,6 @@ + ], + "use": "xcb" + }, +- "xcb_util": { +- "label": "XCB Util >= 0.3.9", +- "headers": "xcb/xcb_util.h", +- "sources": [ +- { "type": "pkgConfig", "args": "xcb-util >= 0.3.9" }, +- "-lxcb-util" +- ], +- "use": "xcb" +- }, + "xcb_image": { + "label": "XCB Image >= 0.3.9", + "headers": "xcb/xcb_image.h", +@@ -617,7 +608,7 @@ + { "type": "pkgConfig", "args": "xcb-image >= 0.3.9" }, + "-lxcb-image" + ], +- "use": "xcb_shm xcb_util xcb" ++ "use": "xcb_shm xcb" + }, + "xcb_keysyms": { + "label": "XCB Keysyms >= 0.3.9", +@@ -1065,7 +1056,6 @@ + "tail": "#undef explicit", + "include": [ + "xcb/xcb.h", +- "xcb/xcb_util.h", + "xcb/xcb_image.h", + "xcb/xcb_keysyms.h", + "xcb/randr.h", +@@ -1097,7 +1087,7 @@ + "xcb_xkb_get_kbd_by_name_replies_key_names_value_list_sizeof(nullptr, 0, 0, 0, 0, 0, 0, 0, 0);" + ] + }, +- "use": "xcb_icccm xcb_util xcb_image xcb_keysyms xcb_randr xcb_render xcb_renderutil xcb_shape xcb_shm xcb_sync xcb_xfixes xcb_xinerama xcb_xkb xcb" ++ "use": "xcb_icccm xcb_image xcb_keysyms xcb_randr xcb_render xcb_renderutil xcb_shape xcb_shm xcb_sync xcb_xfixes xcb_xinerama xcb_xkb xcb" + }, + "x11prefix": { + "label": "X11 prefix", +-- +2.16.3 diff --git a/dev-qt/qtgui/qtgui-5.15.2-r1.ebuild b/dev-qt/qtgui/qtgui-5.15.2-r1.ebuild new file mode 100644 index 00000000000..13063686d1c --- /dev/null +++ b/dev-qt/qtgui/qtgui-5.15.2-r1.ebuild @@ -0,0 +1,188 @@ +# Copyright 1999-2021 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" +SLOT=5/$(ver_cut 1-3) # bug 707658 + +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-only ibus jpeg + +libinput +png tslib tuio +udev vnc vulkan wayland +X" +REQUIRED_USE=" + || ( eglfs X ) + accessibility? ( dbus X ) + eglfs? ( egl ) + ibus? ( dbus ) + libinput? ( udev ) + X? ( gles2-only? ( egl ) ) +" + +COMMON_DEPEND=" + dev-libs/glib:2 + ~dev-qt/qtcore-${PV}:5= + 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:= + 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] ) + !gles2-only? ( virtual/opengl ) + 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} ) + vulkan? ( dev-util/vulkan-headers ) + X? ( + 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 ) +" +RDEPEND="${COMMON_DEPEND} + dev-qt/qtchooser +" +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: + vulkan:vulkan: + X:xcb: + X:xcb-glx: + X:xcb-plugin: + X:xcb-render: + X:xcb-sm: + X:xcb-xlib: + X:xcb-xinput: +) + +QT5_GENTOO_PRIVATE_CONFIG=( + :gui +) + +PATCHES=( + "${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946 + "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306 + "${FILESDIR}/${P}-bogus-xcb-util-dep.patch" # QTBUG-86287, QTBUG-88688 +) + +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 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 + + 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 vulkan) + $(qt_use X xcb) + $(usex X '-xcb-xlib' '') + ) + if use libinput || use X; then + myconf+=( -xkbcommon ) + fi + qt5-build_src_configure +}
