From 52f895faaaf01579a8d9528cafec20bf2c873f5c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 17 Jan 2020 22:43:15 +0000 Subject: gentoo resync : 17.01.2010 --- dev-qt/qtgui/Manifest | 2 + .../qtgui/files/qtgui-5.14.0-restore-scaling.patch | 34 ++++ dev-qt/qtgui/qtgui-5.14.0-r2.ebuild | 187 +++++++++++++++++++++ 3 files changed, 223 insertions(+) create mode 100644 dev-qt/qtgui/files/qtgui-5.14.0-restore-scaling.patch create mode 100644 dev-qt/qtgui/qtgui-5.14.0-r2.ebuild (limited to 'dev-qt/qtgui') diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index 8942c20c3f55..47271bcfc4d0 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -1,5 +1,6 @@ AUX qt-5.12-gcc-avx2.patch 1038 BLAKE2B cb54308c8ef4df9efaa8727ba292b7e959ae069237f8dbc6c7432556c4697f0263dca098f348b0afe94cc93359f929c564c8201a60d585b5907b6bd497369e24 SHA512 0eb51d41996bf42bc896eef53d2e335777c6c6f56fe027581f8b636a57759c98b3f08a5330c9fdeb0054aaa1955024140b161fd19c6457cc66fe68414b1cd8ff AUX qtgui-5.13.2-no-xcb-no-xkbcommon.patch 1327 BLAKE2B d51ed6761d300aec44fc9f1ac86c6f26649fd28f9dfafa0aeb8de4d5b8bb64c46697cfa2089f2a97a22e5cad311c7b372aac12be16c83b3932f2686a240d25c9 SHA512 71433f589554e2fef82d73cf112d7b5d2e2454ec5e3560878d0af05e6721ce4919623175c9355be7c54568da26c68e8c9dfe6cc956465e005b01e3ab974cb310 +AUX qtgui-5.14.0-restore-scaling.patch 1210 BLAKE2B 31bf77f244427b0d77ed6cb0044c72ea6a79162e42bb08a2481b0b38c351b9c595e8f213737553698b09db231e0b5c885e87787bd2530fc4fce23654dcb76223 SHA512 51874cb63f0693df9526dae36aa97abd81c0a349b1e32364251252db93b5c973ee148fcd5bb0b0666cd6a91ba12f5265ec21360c9a7fd2272c44e37d5c8b98df DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2 DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660 DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204 @@ -8,4 +9,5 @@ EBUILD qtgui-5.12.3-r1.ebuild 3707 BLAKE2B b73f820eded407365f5cb7d3a0938dd938a8e EBUILD qtgui-5.12.5.ebuild 3792 BLAKE2B 865e36e7dc7c5686bdcea6005063b83d8489291e5541b93d53b2ce8b66f2120f5c6e7c9b773c6edfbdcf7759bf11071252ee0a889eae7eae05f88a6a3f971c85 SHA512 279f7cbd934cea6fa8e6230a6407eb264212178c43617536f720074e02cf2a55aeab533544e2649ae067147074a28775707efba8e268a0f6bb0ff6a13b02e719 EBUILD qtgui-5.13.2.ebuild 3851 BLAKE2B ed81578d7ec0459dd2d55d7b9236a14ade1cac2ceee5b046d7010327fbb09437dad1f2603bbccd8fee0bf42f51e6d0e0e40f05c73b9558e20cfbb8a25f7b96ac SHA512 2d66bc1a4f942d8d425cbb90937d081aa58cd704075ddcd220cec91933e1942e2cd6bdc688bee82d284bb3b672e6668b18c40daaa334d29e93fa242e1a79d749 EBUILD qtgui-5.14.0-r1.ebuild 4111 BLAKE2B 978a7d785a9e7ca67782b5e22bc892e56ef5b8f888d2c014d37770c88582cace01128d65917958633e329f6ab04e97f0b049385a8d8cf47fa1ab73e4422e2b7d SHA512 de76c010cf14b1663283c6242ae750bbd6b0492176f7f651d6fa1bfb185ba0518b032b303c6aa6c1602e4cb98819186c6fd489321c7b1924893c7bced57ef7a5 +EBUILD qtgui-5.14.0-r2.ebuild 4181 BLAKE2B ffac194264e284458686143ad8ec8136b52bf39033815343650d84d2b7b855ac1b3519e216f78f45bdab39f39fc9b3592293091ce11fdd67e5f8856bd66b4d54 SHA512 5ef16ffece81c1a6a70bcc11ea12316373be9c0023e34500bf9454439f0b40c5d8502a337fc706216f774f7026f67c4cff6dc37b19eed55569890f7211a3386d MISC metadata.xml 1322 BLAKE2B b6161b568e3a4c34a8fce62a8cce9e1bd7cabbc0d2d2baa0e5e41295974b877d59adff4983b731bb359040f3662999a7915a1527bedeca9de09eb702541d1ae7 SHA512 dcfcdc8f5622e5d6b8488f07b6de62aae829b564ecdb9fb8b9f273bc2593c312f5265849bb3d2175d0ab468977ac2afb8099519cfb66224d8e5df0efec01ae4a diff --git a/dev-qt/qtgui/files/qtgui-5.14.0-restore-scaling.patch b/dev-qt/qtgui/files/qtgui-5.14.0-restore-scaling.patch new file mode 100644 index 000000000000..5fc047aa7ec0 --- /dev/null +++ b/dev-qt/qtgui/files/qtgui-5.14.0-restore-scaling.patch @@ -0,0 +1,34 @@ +From b31852c4caa36cc564e25adbdacfa534e1dfe7c0 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Morten=20Johan=20S=C3=B8rvig?= +Date: Mon, 13 Jan 2020 14:48:32 +0100 +Subject: [PATCH] Restore QHighDPIScaling::isActive() 5.13 behavior + +In 5.13, isActive() would become true only if there +was a scale factor >1 present. This was accidentally +changed in 5.14, where isActive() becomes true whenever +e.g. AA_EneableHighDpiScaling is set, no matter the actual +scale factor values. + +Change-Id: Iacbe2010cddbc3b9015ac24004ae2fe417d4f434 +Fixes: QTBUG-80967 +Reviewed-by: Friedemann Kleint +--- + 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 fde6bb0180b..671c2d93ef6 100644 +--- a/src/gui/kernel/qhighdpiscaling.cpp ++++ b/src/gui/kernel/qhighdpiscaling.cpp +@@ -535,7 +535,7 @@ void QHighDpiScaling::updateHighDpiScaling() + ++i; + } + } +- m_active = m_globalScalingActive || m_screenFactorSet || m_usePixelDensity; ++ m_active = m_globalScalingActive || m_screenFactorSet || m_pixelDensityScalingActive; + } + + /* +-- +2.16.3 + diff --git a/dev-qt/qtgui/qtgui-5.14.0-r2.ebuild b/dev-qt/qtgui/qtgui-5.14.0-r2.ebuild new file mode 100644 index 000000000000..1f814dd0fe50 --- /dev/null +++ b/dev-qt/qtgui/qtgui-5.14.0-r2.ebuild @@ -0,0 +1,187 @@ +# 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="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +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 ) ) +" + +COMMON_DEPEND=" + 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-1.21 ) + 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="${COMMON_DEPEND} + evdev? ( sys-kernel/linux-headers ) + udev? ( sys-kernel/linux-headers ) +" +# bug 703306, _populate_Gui_plugin_properties breaks installed cmake modules +RDEPEND="${COMMON_DEPEND} + !