diff options
Diffstat (limited to 'dev-qt/qtgui')
| -rw-r--r-- | dev-qt/qtgui/Manifest | 11 | ||||
| -rw-r--r-- | dev-qt/qtgui/files/qtgui-5.14.0-restore-scaling.patch | 34 | ||||
| -rw-r--r-- | dev-qt/qtgui/qtgui-5.12.3-r1.ebuild | 4 | ||||
| -rw-r--r-- | dev-qt/qtgui/qtgui-5.12.5.ebuild | 176 | ||||
| -rw-r--r-- | dev-qt/qtgui/qtgui-5.13.2.ebuild | 2 | ||||
| -rw-r--r-- | dev-qt/qtgui/qtgui-5.14.1.ebuild (renamed from dev-qt/qtgui/qtgui-5.14.0-r3.ebuild) | 6 |
6 files changed, 8 insertions, 225 deletions
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index fbe26f5c7a92..771be0632d48 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -1,12 +1,9 @@ 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 -DIST qtbase-everywhere-src-5.14.0.tar.xz 49713412 BLAKE2B b59a98b12ade13ef27a055010f45621606692e7c071039cedfa20a667fdbffc74e2ba7b412b93eebc7bc748a418750045810215335972190fc5ad69947d5494c SHA512 27e640643aa2a15fece96b1a83f8f6fbfbc8a83e224f6dea4d7e6a94c8069a2b18a55ddc76943b10b40ccc95168a48dcfdf46264fdfc24b3594d1c6ea160aff6 -EBUILD qtgui-5.12.3-r1.ebuild 3707 BLAKE2B b73f820eded407365f5cb7d3a0938dd938a8e5e0573ec7051bb8375424accb8c1d84d50e4673f7504ed76d53d9bc57f9b1ceb64da3f0e883a729d06ad082b9ac SHA512 8afedb468ff74a47d1974858a2d6e67a5a158bd1540195a7211f3109c48c7ce62a293eeb47215eddca0c4126c0729ae5282fb0b9ebd3482fc2262bc9521f2877 -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-r3.ebuild 4148 BLAKE2B 7f9caf89a08ffcd59d1997a266d29c80ec286823cf505c5c3ee9a32f077ed891d99055218e95ecca5ebb421f5d977347a92ab20613bbaa5657d3892b10ac9d33 SHA512 8c78b621af7156cc75f19514569fd3cf227938d2d46bf3ab43f353a9badfe0241f80f7c75bf0ca1c73cbba402bd3895cc8a9be209fd7a7d2eb2cbcaf5f22af3c +DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b +EBUILD qtgui-5.12.3-r1.ebuild 3672 BLAKE2B c519e5a1d3d6d1a29cdc704f7258ede855b250d48d4a28b875b193e2fbd818c2f1a70c3d6202c83521e05549ec2d84d95eccdc8fc6425ce52c738d6ead0cfaf4 SHA512 e5fc2889ae9588e92c33b1ff5f79bfe2864bbd1e9d0cb1fae183c315b762d9972c9026901476c27e152d612ddfb5402e755514a94efb8c6c689c822ad98cc3e4 +EBUILD qtgui-5.13.2.ebuild 3850 BLAKE2B 68a765fa93aafb2db53761863001b0033698b9cb2aab6a8a2b558aa2900460f877629c9a737d886ade16d7b24a170f9b6304c9c441f3e4d85abc03c278b15342 SHA512 4ac90834407dde1d9b95893b8cfec007a876945cf9dc195400fae14dbf7a6d499480857b1705c2a2f71c8f2603454e017ce897ca45b8c94ab1b8d63de57fe0cf +EBUILD qtgui-5.14.1.ebuild 4010 BLAKE2B 5f090ca04e825f277635510d925f17a49a57db7c43cef41b9959895eba878550fa929d0c17be588471e4b419d2622e77a1e447b6e79ef69574c2c8b85e134bba SHA512 56fff2ddb753d34fe70cde4eac94329818808efe62748431a06931cfbdbe90b05df2ed34e711784162c1a5f469b1072b77d45f73e901b5080470e709e5865d30 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 deleted file mode 100644 index 5fc047aa7ec0..000000000000 --- a/dev-qt/qtgui/files/qtgui-5.14.0-restore-scaling.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b31852c4caa36cc564e25adbdacfa534e1dfe7c0 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig@qt.io> -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 <Friedemann.Kleint@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 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.12.3-r1.ebuild b/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild index 1487a3600a91..9da6bd76cb93 100644 --- a/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild +++ b/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -8,7 +8,7 @@ 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" + KEYWORDS="arm x86" fi # TODO: linuxfb diff --git a/dev-qt/qtgui/qtgui-5.12.5.ebuild b/dev-qt/qtgui/qtgui-5.12.5.ebuild deleted file mode 100644 index 7ea14cf923d7..000000000000 --- a/dev-qt/qtgui/qtgui-5.12.5.ebuild +++ /dev/null @@ -1,176 +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" -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 - -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 -} diff --git a/dev-qt/qtgui/qtgui-5.13.2.ebuild b/dev-qt/qtgui/qtgui-5.13.2.ebuild index a444969036ed..291c505bf4c8 100644 --- a/dev-qt/qtgui/qtgui-5.13.2.ebuild +++ b/dev-qt/qtgui/qtgui-5.13.2.ebuild @@ -8,7 +8,7 @@ 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" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86" fi # TODO: linuxfb diff --git a/dev-qt/qtgui/qtgui-5.14.0-r3.ebuild b/dev-qt/qtgui/qtgui-5.14.1.ebuild index 8ab48c846dd5..ab7524bb0d79 100644 --- a/dev-qt/qtgui/qtgui-5.14.0-r3.ebuild +++ b/dev-qt/qtgui/qtgui-5.14.1.ebuild @@ -132,11 +132,7 @@ QT5_GENTOO_PRIVATE_CONFIG=( :gui ) -PATCHES=( - "${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946 - "${FILESDIR}/${PN}-5.13.2-no-xcb-no-xkbcommon.patch" # bug 699110 - "${FILESDIR}/${P}-restore-scaling.patch" # QTBUG-80967, in Qt 5.14.1 -) +PATCHES=( "${FILESDIR}/qt-5.12-gcc-avx2.patch" ) # bug 672946 src_prepare() { # don't add -O3 to CXXFLAGS, bug 549140 |