diff options
Diffstat (limited to 'dev-qt/qtgui')
-rw-r--r-- | dev-qt/qtgui/Manifest | 6 | ||||
-rw-r--r-- | dev-qt/qtgui/files/qtgui-5.14.2-CVE-2020-17507.patch | 39 | ||||
-rw-r--r-- | dev-qt/qtgui/files/qtgui-5.15.1-emit-qscreen-geometrychanged-when-dpi-changes.patch | 86 | ||||
-rw-r--r-- | dev-qt/qtgui/qtgui-5.14.2-r1.ebuild | 185 | ||||
-rw-r--r-- | dev-qt/qtgui/qtgui-5.15.1-r1.ebuild (renamed from dev-qt/qtgui/qtgui-5.15.1.ebuild) | 3 |
5 files changed, 90 insertions, 229 deletions
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index 167c7fe3a89d..70fa66439c04 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -1,8 +1,6 @@ AUX qt-5.12-gcc-avx2.patch 1038 BLAKE2B cb54308c8ef4df9efaa8727ba292b7e959ae069237f8dbc6c7432556c4697f0263dca098f348b0afe94cc93359f929c564c8201a60d585b5907b6bd497369e24 SHA512 0eb51d41996bf42bc896eef53d2e335777c6c6f56fe027581f8b636a57759c98b3f08a5330c9fdeb0054aaa1955024140b161fd19c6457cc66fe68414b1cd8ff AUX qtgui-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b70232722416cb85ecce8a0742b57503c520482aa0386042f43d4cf20926a874b9a92f90c656cfe0bf93883c286b6b08c0ad2568f3a6746c776dcf208995 SHA512 c7ba0bfa6d462504ba9421abfb7f502265fd8c6bd7469326612925cd7b7667daba3350f714aa5a516aa83e5352ec6d18fc02af9ebf5494af10a4b6f8f7c47d5b -AUX qtgui-5.14.2-CVE-2020-17507.patch 1582 BLAKE2B 6fde9d057c96e65159ba1c07a7fa2df6d9ed5577810eb149667168b0a7c2fd754ae49c153a2c5486ad04768338edd791803d0ebc92955e8db5015d7cc9f72a7c SHA512 159eb0eebd650bc5fe33e3e7555ce7a1d39d3294aaf5d47c2db4f437fb9c15b7ceed1566b4354b26f19b6c5ab10f5c748407c5a31077326018aafb238b167a43 -DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9 +AUX qtgui-5.15.1-emit-qscreen-geometrychanged-when-dpi-changes.patch 3517 BLAKE2B 5f65f37420688f9c467ae9a1190cd8774edce8aaa4a4272c173d11bd801f698a667459dae8289f36529e414d36013d40b1e82752a09ee2ad8d28bf0a648bec68 SHA512 46acde292a9654f92ad603d0d0083517c8187708131166292c950f8acc73702762e0dc8a037937c6f902598636cdf320f645f2c0ebc546d095df7bd89419f9be DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4 -EBUILD qtgui-5.14.2-r1.ebuild 4047 BLAKE2B 56a431c5987ecae329508484bab74f2dbaaff31eeb81ea0d33abc49364854244d2dd084d53c89503b54b6960b09a3b398a5908dbff34c1154e848fa9980dc65e SHA512 bce682f3763eedad5f22ffbb894887f70a53b76f25286eb1fb9053ad18a5efe96da98a10c54a80312d2f0516149455fa09db8ec1e4cf5cadb98f59b5ccad8b06 -EBUILD qtgui-5.15.1.ebuild 3984 BLAKE2B f72109d2fcb1a813afb4214cdbfe19c927d877fdc9c4d0dbda4e9865d66f54c2e6fac942bfddf3687d329198b5376e3d1ceb5d10150bec707630e93c5e2eff45 SHA512 39881a7ba7fcbcb8578c36d1bce81a6e25f2d99d2f2609ae8f5e20a429e9a74d5b47d5a84db7c062b0c83125d9b72de553d8c9b9d05e562c7b77920c16bc728f +EBUILD qtgui-5.15.1-r1.ebuild 4064 BLAKE2B 0d3a6a6be5b202b2005e15d24073d848d4c9754870dbf5e64bc691ab1b8a36b0151f2247a861be53379b9e1483b727d60a75eac7bd953fc486445044655eb777 SHA512 91455d767974c80878e34d2f53a2a45d88499dabbb69bf2365da8d31b963991bba5c32db96c11b357ecf6ec1a1115f1c109a4d08530941b43a4325e03aaa72e4 MISC metadata.xml 1302 BLAKE2B 898227fe66d379fb08154a190b9eec68d98e452cf412ee56ccb9a879511d27ab44cdac45174c5fd674e080a7cf782ee64ea0eeb515d5bcee52491b685c01fd98 SHA512 5d0bd8b7c3cefa4d01005473022fee1ee49e845f56c003480edd09bf68ed07ff406160e26232d7febe21cdd5b10de0ec480d1d89d977d546756e437185204e2c diff --git a/dev-qt/qtgui/files/qtgui-5.14.2-CVE-2020-17507.patch b/dev-qt/qtgui/files/qtgui-5.14.2-CVE-2020-17507.patch deleted file mode 100644 index cad9aa4b682c..000000000000 --- a/dev-qt/qtgui/files/qtgui-5.14.2-CVE-2020-17507.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1616c71921b73b227f56ccb3f2c49a994ec23440 Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen <allan.jensen@qt.io> -Date: Thu, 23 Jul 2020 11:48:48 +0200 -Subject: Fix buffer overflow in XBM parser - -Avoid parsing over the buffer limit, or interpreting non-hex -as hex. - -This still leaves parsing of lines longer than 300 chars -unreliable - -Change-Id: I1c57a7e530c4380f6f9040b2ec729ccd7dc7a5fb -Reviewed-by: Robert Loehning <robert.loehning@qt.io> -Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> -(cherry picked from commit c562c1fc19629fb505acd0f6380604840b634211) -Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> ---- - src/gui/image/qxbmhandler.cpp | 4 ++- - .../gui/image/qimagereader/tst_qimagereader.cpp | 38 ++++++++++++++++++++++ - 2 files changed, 41 insertions(+), 1 deletion(-) - -diff --git a/src/gui/image/qxbmhandler.cpp b/src/gui/image/qxbmhandler.cpp -index f06561690c..72ce7f7ecd 100644 ---- a/src/gui/image/qxbmhandler.cpp -+++ b/src/gui/image/qxbmhandler.cpp -@@ -159,7 +159,9 @@ static bool read_xbm_body(QIODevice *device, int w, int h, QImage *outImage) - w = (w+7)/8; // byte width - - while (y < h) { // for all encoded bytes... -- if (p) { // p = "0x.." -+ if (p && p < (buf + readBytes - 3)) { // p = "0x.." -+ if (!isxdigit(p[2]) || !isxdigit(p[3])) -+ return false; - *b++ = hex2byte(p+2); - p += 2; - if (++x == w && ++y < h) { --- -cgit v1.2.1 - diff --git a/dev-qt/qtgui/files/qtgui-5.15.1-emit-qscreen-geometrychanged-when-dpi-changes.patch b/dev-qt/qtgui/files/qtgui-5.15.1-emit-qscreen-geometrychanged-when-dpi-changes.patch new file mode 100644 index 000000000000..3e4187b22a06 --- /dev/null +++ b/dev-qt/qtgui/files/qtgui-5.15.1-emit-qscreen-geometrychanged-when-dpi-changes.patch @@ -0,0 +1,86 @@ +From 65243ad7aef48af4689ea4454916b504025b5051 Mon Sep 17 00:00:00 2001 +From: Friedemann Kleint <Friedemann.Kleint@qt.io> +Date: Fri, 25 Sep 2020 14:10:58 +0200 +Subject: [PATCH] Emit QScreen::geometryChanged when the logical DPI changes + +Add the missing call to QScreenPrivate::emitGeometryChangeSignals() +along with an emission of physicalDotsPerInchChanged() +since that is calculated from geometry and physical size. + +Rearrange the code in +QGuiApplicationPrivate::processScreenGeometryChange() +to prevent duplicate emissions of geometryChanged(), +physicalDotsPerInchChanged() which this change would introduce. + +Amends 5290027e3bab75f14fc0a2b7c206594d9cb91e76. + +Task-number: QTBUG-76902 +Task-number: QTBUG-79248 +Fixes: QTBUG-86604 +Change-Id: I3dc2ec5ccd9c6413e92f9246242f323e8afc5e57 +Reviewed-by: David Edmundson <davidedmundson@kde.org> +(cherry picked from commit 5c7307775d32ae0a54acad8ae7a1c9d3cff7d45e) +Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> +--- + src/gui/kernel/qguiapplication.cpp | 11 +++++------ + src/gui/kernel/qscreen.cpp | 6 ++++++ + 2 files changed, 11 insertions(+), 6 deletions(-) + +diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp +index 239a78313c5..ef090605819 100644 +--- a/src/gui/kernel/qguiapplication.cpp ++++ b/src/gui/kernel/qguiapplication.cpp +@@ -3162,13 +3162,14 @@ void QGuiApplicationPrivate::processScreenGeometryChange(QWindowSystemInterfaceP + bool availableGeometryChanged = e->availableGeometry != s->d_func()->availableGeometry; + s->d_func()->availableGeometry = e->availableGeometry; + +- if (geometryChanged) { +- Qt::ScreenOrientation primaryOrientation = s->primaryOrientation(); ++ const Qt::ScreenOrientation primaryOrientation = s->primaryOrientation(); ++ if (geometryChanged) + s->d_func()->updatePrimaryOrientation(); + +- emit s->geometryChanged(s->geometry()); ++ s->d_func()->emitGeometryChangeSignals(geometryChanged, availableGeometryChanged); ++ ++ if (geometryChanged) { + emit s->physicalSizeChanged(s->physicalSize()); +- emit s->physicalDotsPerInchChanged(s->physicalDotsPerInch()); + emit s->logicalDotsPerInchChanged(s->logicalDotsPerInch()); + + if (s->primaryOrientation() != primaryOrientation) +@@ -3178,8 +3179,6 @@ void QGuiApplicationPrivate::processScreenGeometryChange(QWindowSystemInterfaceP + updateFilteredScreenOrientation(s); + } + +- s->d_func()->emitGeometryChangeSignals(geometryChanged, availableGeometryChanged); +- + resetCachedDevicePixelRatio(); + } + +diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp +index df628fcc73a..a1afc1ba143 100644 +--- a/src/gui/kernel/qscreen.cpp ++++ b/src/gui/kernel/qscreen.cpp +@@ -88,6 +88,9 @@ void QScreenPrivate::updateGeometriesWithSignals() + void QScreenPrivate::emitGeometryChangeSignals(bool geometryChanged, bool availableGeometryChanged) + { + Q_Q(QScreen); ++ if (geometryChanged) ++ emit q->geometryChanged(geometry); ++ + if (availableGeometryChanged) + emit q->availableGeometryChanged(availableGeometry); + +@@ -96,6 +99,9 @@ void QScreenPrivate::emitGeometryChangeSignals(bool geometryChanged, bool availa + for (QScreen* sibling : siblings) + emit sibling->virtualGeometryChanged(sibling->virtualGeometry()); + } ++ ++ if (geometryChanged) ++ emit q->physicalDotsPerInchChanged(q->physicalDotsPerInch()); + } + + void QScreenPrivate::setPlatformScreen(QPlatformScreen *screen) +-- +2.16.3 diff --git a/dev-qt/qtgui/qtgui-5.14.2-r1.ebuild b/dev-qt/qtgui/qtgui-5.14.2-r1.ebuild deleted file mode 100644 index 1f42c15329e9..000000000000 --- a/dev-qt/qtgui/qtgui-5.14.2-r1.ebuild +++ /dev/null @@ -1,185 +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" -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 ) ) -" - -RDEPEND=" - 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:= - 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-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="${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: - 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}/${PN}-5.14.2-CVE-2020-17507.patch" # bug 736924 -) - -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 system) - $(usex X '-xcb-xlib -xcb-xinput -xkb' '') - ) - if use libinput || use X; then - myconf+=( -xkbcommon ) - fi - qt5-build_src_configure -} diff --git a/dev-qt/qtgui/qtgui-5.15.1.ebuild b/dev-qt/qtgui/qtgui-5.15.1-r1.ebuild index e6fed6656239..3e1ba3f077d6 100644 --- a/dev-qt/qtgui/qtgui-5.15.1.ebuild +++ b/dev-qt/qtgui/qtgui-5.15.1-r1.ebuild @@ -10,7 +10,7 @@ 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" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" fi # TODO: linuxfb @@ -131,6 +131,7 @@ QT5_GENTOO_PRIVATE_CONFIG=( PATCHES=( "${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946 "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306 + "${FILESDIR}/${P}-emit-qscreen-geometrychanged-when-dpi-changes.patch" # QTBUG-86604 ) src_prepare() { |