diff options
author | 2019-09-25 22:08:11 +0200 | |
---|---|---|
committer | 2019-09-25 23:33:56 +0200 | |
commit | 59925e0907212348a775b3436b92ea56904fc835 (patch) | |
tree | f05028aba66a4376f32aaf259bee9803e34bbd9a /dev-qt/qtgui | |
parent | dev-qt/qtwidgets: Drop 5.12.5 (r0) (diff) | |
download | gentoo-59925e0907212348a775b3436b92ea56904fc835.tar.gz gentoo-59925e0907212348a775b3436b92ea56904fc835.tar.bz2 gentoo-59925e0907212348a775b3436b92ea56904fc835.zip |
dev-qt: Drop Qt 5.12.4
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-qt/qtgui')
-rw-r--r-- | dev-qt/qtgui/Manifest | 1 | ||||
-rw-r--r-- | dev-qt/qtgui/files/qtgui-5.12.4-fix-highdpi-crash.patch | 32 | ||||
-rw-r--r-- | dev-qt/qtgui/qtgui-5.12.4.ebuild | 179 |
3 files changed, 0 insertions, 212 deletions
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index a1c8a32a3a46..1e1de0c37b5b 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -1,3 +1,2 @@ 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 DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660 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 deleted file mode 100644 index 57a8b1985a71..000000000000 --- a/dev-qt/qtgui/files/qtgui-5.12.4-fix-highdpi-crash.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6d61b10f65cd276e009a02cec563cc469245e1f2 Mon Sep 17 00:00:00 2001 -From: Friedemann Kleint <Friedemann.Kleint@qt.io> -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 <allan.jensen@qt.io> ---- - 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 deleted file mode 100644 index 81db316f4805..000000000000 --- a/dev-qt/qtgui/qtgui-5.12.4.ebuild +++ /dev/null @@ -1,179 +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 ~amd64-fbsd" -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 ) ) -" - -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 ) - 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}/${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 -} |