From 51af5f0eb4cddbe6aa7953717873691d77aae9ff Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 10 Jul 2019 23:40:16 +0100 Subject: gentoo resync : 11.07.2019 --- dev-qt/qtgui/Manifest | 3 + .../files/qtgui-5.12.4-fix-highdpi-crash.patch | 32 ++++ dev-qt/qtgui/qtgui-5.12.4.ebuild | 178 +++++++++++++++++++++ 3 files changed, 213 insertions(+) create mode 100644 dev-qt/qtgui/files/qtgui-5.12.4-fix-highdpi-crash.patch create mode 100644 dev-qt/qtgui/qtgui-5.12.4.ebuild (limited to 'dev-qt/qtgui') diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index 08f9c48a0237..89c6a57bef5a 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -1,4 +1,7 @@ AUX qt-5.12-gcc-avx2.patch 1038 BLAKE2B cb54308c8ef4df9efaa8727ba292b7e959ae069237f8dbc6c7432556c4697f0263dca098f348b0afe94cc93359f929c564c8201a60d585b5907b6bd497369e24 SHA512 0eb51d41996bf42bc896eef53d2e335777c6c6f56fe027581f8b636a57759c98b3f08a5330c9fdeb0054aaa1955024140b161fd19c6457cc66fe68414b1cd8ff +AUX qtgui-5.12.4-fix-highdpi-crash.patch 1401 BLAKE2B 7782acee3e85669d4bc5c7deef63a55a26feb8d60622e3e3ae25d27cc6fce2c929aca04163a081008c6c3b26669093967ed60360b96748188afcde87c865a4a3 SHA512 f6d748b2af399b097f6a29d686517f24a70d4f89115ed8e8bb416e5b51d4a956350437eed5e4360f7a17f1d6b32b2e1c2d6b638d3f526c18a969c4178a9085b8 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2 +DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946 EBUILD qtgui-5.12.3-r1.ebuild 3719 BLAKE2B 6d8b24192afbda0c9f4955ef6127fa1b334cdfde00a8e78c9eeffc52496d0a8801642c21bc8dd730ed67373c32f738d4f804e6cc3a5901b38360eb39d15caf27 SHA512 5ad5f7b427fb989f0f3bbed475932808d7b598b53d9e16bd25bbb57ec75127c6ccc42295e26446be29516a881bd42989936c665ef48af2ff2c984d617aeb4a16 +EBUILD qtgui-5.12.4.ebuild 3820 BLAKE2B f6584987f2e6744c4f950436c6a63a1d5496025c75ca3062a9e826aea0d1b6e7da6af1afec62cc2f60b282eb2b1455cfc8fc68cd73b1e49d91faf9a81889c22b SHA512 d72c3ab474e749fdf17c711d6e79cea19f55cb88ed22938dfa11eb1ab4bb15d987e856a1c39790eaef955536e2d776eb99b8270a582e6d8b0e3cbf883d5d4874 MISC metadata.xml 1200 BLAKE2B 272e152cc1a9d596407c3d687fbb7b9f7b1b553cbf07e78e649031a427782f3377d3ee71d40e472b6f5978a8c1e9c2bfb9c0669edebcfcd1605d27973ba0ba1b SHA512 5ed40f7fdc6e289bd23bc5d4ce54794e58acf8c14863c45fe228d29c555e3afff84ee5b73f6f9e6be8b43e2ca28a96e4a73c22129ed2099262b5f682bf8b3aa6 diff --git a/dev-qt/qtgui/files/qtgui-5.12.4-fix-highdpi-crash.patch b/dev-qt/qtgui/files/qtgui-5.12.4-fix-highdpi-crash.patch new file mode 100644 index 000000000000..57a8b1985a71 --- /dev/null +++ b/dev-qt/qtgui/files/qtgui-5.12.4-fix-highdpi-crash.patch @@ -0,0 +1,32 @@ +From 6d61b10f65cd276e009a02cec563cc469245e1f2 Mon Sep 17 00:00:00 2001 +From: Friedemann Kleint +Date: Wed, 19 Jun 2019 08:28:14 +0200 +Subject: [PATCH] High DPI: Fix crash in QWindow::mapFromGlobal() + +With Web Engine, QQuickWidget or similar, the code can hit on the offscreen +window, when its handle is null. Add a check. + +Amends 3af7b279177f7fb092f0e0fb9ffc8e8d846ed774. + +Fixes: QTBUG-76440 +Change-Id: I123633d18386efd3dbfb22aad6072e4f0877a62e +Reviewed-by: Allan Sandfeld Jensen +--- + src/gui/kernel/qhighdpiscaling.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gui/kernel/qhighdpiscaling.cpp b/src/gui/kernel/qhighdpiscaling.cpp +index 4f8e9a38176..93fcb1a2160 100644 +--- a/src/gui/kernel/qhighdpiscaling.cpp ++++ b/src/gui/kernel/qhighdpiscaling.cpp +@@ -400,7 +400,7 @@ QPoint QHighDpiScaling::mapPositionToGlobal(const QPoint &pos, const QPoint &win + QPoint QHighDpiScaling::mapPositionFromGlobal(const QPoint &pos, const QPoint &windowGlobalPosition, const QWindow *window) + { + QPoint windowPosCandidate = pos - windowGlobalPosition; +- if (QGuiApplicationPrivate::screen_list.size() <= 1) ++ if (QGuiApplicationPrivate::screen_list.size() <= 1 || window->handle() == nullptr) + return windowPosCandidate; + + // Device independent global (screen) space may discontiguous when high-dpi scaling +-- +2.16.3 diff --git a/dev-qt/qtgui/qtgui-5.12.4.ebuild b/dev-qt/qtgui/qtgui-5.12.4.ebuild new file mode 100644 index 000000000000..31b4a4ca658f --- /dev/null +++ b/dev-qt/qtgui/qtgui-5.12.4.ebuild @@ -0,0 +1,178 @@ +# 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 ~amd64-fbsd" +fi + +# TODO: linuxfb + +IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus + jpeg +libinput +png tslib tuio +udev vnc +xcb" +REQUIRED_USE=" + || ( eglfs xcb ) + accessibility? ( dbus xcb ) + eglfs? ( egl ) + ibus? ( dbus ) + libinput? ( udev ) + xcb? ( gles2? ( 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? ( 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 ) +" + +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}/${P}-fix-highdpi-crash.patch" # QTBUG-76440 +) + +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 +} -- cgit v1.2.3