diff options
Diffstat (limited to 'dev-qt/qtgui')
4 files changed, 235 insertions, 39 deletions
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index 87a361cfcb97..f4fc214df886 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -1,8 +1,9 @@ -AUX qtgui-5.15.5-xcb-update-_NET_SUPPORTED-when-WM-changes-it.patch 1642 BLAKE2B 83aae5cf9944de269aaa8131d57a7237c911dfeb80f50f8512fc6c803a91ba9ad62d02c537e7c7f40004d1ca408cabe9f3d1b8e3f5a62a51103cb74bd2198839 SHA512 7683f6a073a38adfce406d3d763f0de18dfdd4f368a5dade27cb555e04bf975213cbd9b01ad71293e8f0a5075de96f6d1b8695fe4d16902a81827f5570852f8a AUX qtgui-5.15.7-fix-no-dbus.patch 3559 BLAKE2B 96c96aa3aee90d2569d86d136646f2929f639d8702ebb5a2faafaaa2a69942d3cb1272044efb4b0b0d8925e8e4867570580b8ff184d03c8b5c19c49e962ecb65 SHA512 6fdef29afc2638d18363c5ae5c403eea65f09e5dfe3a622d5961626221400f0f034086748b72a6b2b84350349d94aae1cb3c7bffb66adf5f70490e440b9be154 +AUX qtgui-5.15.7-fix-wrong-to-linear-conversion.patch 1801 BLAKE2B 14e9fc93edd5cc02a978962e9b35847f5af7a26b2bc27bd9bf67f71b9db7ec01d172660de0817ca44f1936055a1a2385c7395c85a4a70b06da9fc063119d9917 SHA512 9ec38861a924e6170829d0aa4e886bf6be4ded8454d97a52923f2d78a5ee38121ebe29c043bf020f86de62b3eb74a92f3f31fb8698e93d1e7dc7b95a7d7dd6a3 AUX qtgui-5.15.7-xcb-correctly-disconnect-xsettings-callbacks.patch 2463 BLAKE2B d6216187d8416d3e4515470a899093cf36df4f89ba69bb13340d68cec990b018923fbe8813b2d215638a6ad62f515c0b8a383a76b8072916c0b687208e8af005 SHA512 8131948123f95c01ebe524d518addcb62385ba0a65cd308559dc9ac6e971db45b966dd9ca7fe3861c2d3d23ab1ff815ef6365eaaf9262da5b3c03406a1845c40 DIST qtbase-5.15-gentoo-patchset-2.tar.xz 3844 BLAKE2B 6dcb69398cf8a6b1be737e8c7bf1041529c4e704ca892cef10ba3bc5ce435c903607b64e981cf8aa12c785b3e423aa1d52bce1f67ec1bd8dbb1421dfb6f62700 SHA512 b7fd7e17bcab2f9803c7bfc0473082ee4640299c23ce8da943ef80ed181e880ebc9157bcebde28077e80e6f907aa14a59c42416b3e32f49baebd54fbe5a37497 DIST qtbase-5.15.7-gentoo-kde-1.tar.xz 798056 BLAKE2B 3c7fefa65ab6de25c2c82261ad0f1371e32acd4bd4b3303f20a5ebf36d19690df94290d102c65e4941a6c51a5d5f2db0253bafca5ac85cf480f7434405cb2671 SHA512 20ab17220489009c98d7f783a02614507e157974c7cb16f47d50d3954ccd1cd065562effc393df6e07c9ba6ad8ccd4e6b3f0bf5b5b890183b8631b8b570bf064 DIST qtbase-everywhere-opensource-src-5.15.7.tar.xz 50260196 BLAKE2B 69029a910af0e3bfe742b5870334406e03274b0677ef47f9c7c10f730ff031bae49bd21a686497215505b19a183ca395c275d8afefaaa903125297f8e693bb4d SHA512 316de71fba1d5dd91354155dcd0f77e1ce2a798f8296a8699a795ea5e86ad10b6e233299775a92e23328290f3e041240585947e89ee7bd39eb464c5f0ffec343 +EBUILD qtgui-5.15.7-r1.ebuild 4201 BLAKE2B 755f2eabe8e26b6df401f0606600275082af68ee546c730805ac953de7bc0ac982d6413eca144574f8fccb526ef84f44b3fcd13144548e99f60cc6939618e377 SHA512 f2c80c7d048bc404f584e554c4425e861cc14bc25d4b04f6a64911746dcf3ad89fbd26bdd6a09b1320ad64c2543371b6249ca52706234b774ad67d7851941116 EBUILD qtgui-5.15.7.ebuild 4127 BLAKE2B a2c2ef7b2974ca40d3488f66431e0d71492528fc0cf11bc72b8f454e6a9e6d27ed63511e8ab080376e06833611a0a76779fc82dd1446f6c390dbdf93cb162272 SHA512 cdf03610b8ef78a8d57d8352399aab0d1f5567cd76c742c1fc4a84e7642fa2d3256e1337696a328dc76c5f25670b8366a299e2577b7bf12bf80a2cbe738d6623 MISC metadata.xml 1387 BLAKE2B a370bc2dc77b3efcca29b46e9690b1b5e5c08c5fbfcf06211c1a384c9b998517b4da4357b1cc33998d4f480f9c5481e41b42f3b20f8f72d2635b317ed1d5b412 SHA512 ffa4622291427193109a83d422ff53f373fc3eb7449855849f0f39091383abc30fbfcb88a7d53e29bf2d39e1ec1c40f7aac7433b4d7c0aeefd48983047e912d5 diff --git a/dev-qt/qtgui/files/qtgui-5.15.5-xcb-update-_NET_SUPPORTED-when-WM-changes-it.patch b/dev-qt/qtgui/files/qtgui-5.15.5-xcb-update-_NET_SUPPORTED-when-WM-changes-it.patch deleted file mode 100644 index 0d0acdf63a99..000000000000 --- a/dev-qt/qtgui/files/qtgui-5.15.5-xcb-update-_NET_SUPPORTED-when-WM-changes-it.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 97acde2828c8814671f4938e0c4805d945a4d110 Mon Sep 17 00:00:00 2001 -From: Tang Haixiang <tanghaixiang@uniontech.com> -Date: Thu, 25 Feb 2021 18:05:17 +0800 -Subject: [PATCH] xcb: Update _NET_SUPPORTED when the window manager changes it -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In some cases, the application may start before the window manager, and in some window managers -_NET_SUPPORTED may be changed. These situations will cause the _NET_SUPPORTED value obtained by Qt -to be inconsistent with the window manager. - -Fixes: QTBUG-91396 -Change-Id: I63c6934ad2538cdb9f05926b3748216bd0dcf04e -Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> - - -(cherry picked from commit acb0065cc7e4ee849cc87ce72e46b05a61370c43) ---- - src/plugins/platforms/xcb/qxcbconnection.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp -index 8477e28df1..6aa61e0d34 100644 ---- a/src/plugins/platforms/xcb/qxcbconnection.cpp -+++ b/src/plugins/platforms/xcb/qxcbconnection.cpp -@@ -659,6 +659,8 @@ void QXcbConnection::handleXcbEvent(xcb_generic_event_t *event) - QXcbVirtualDesktop *virtualDesktop = virtualDesktopForRootWindow(propertyNotify->window); - if (virtualDesktop) - virtualDesktop->updateWorkArea(); -+ } else if (propertyNotify->atom == atom(QXcbAtom::_NET_SUPPORTED)) { -+ m_wmSupport->updateNetWMAtoms(); - } else { - HANDLE_PLATFORM_WINDOW_EVENT(xcb_property_notify_event_t, window, handlePropertyNotifyEvent); - } --- -GitLab - diff --git a/dev-qt/qtgui/files/qtgui-5.15.7-fix-wrong-to-linear-conversion.patch b/dev-qt/qtgui/files/qtgui-5.15.7-fix-wrong-to-linear-conversion.patch new file mode 100644 index 000000000000..e0ae71f90f3c --- /dev/null +++ b/dev-qt/qtgui/files/qtgui-5.15.7-fix-wrong-to-linear-conversion.patch @@ -0,0 +1,47 @@ +From a9e67318e6a8924c4b5461656bcc6a80720ae899 Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen <allan.jensen@qt.io> +Date: Tue, 6 Dec 2022 10:42:59 +0100 +Subject: [PATCH] Fix wrong to linear conversion + +Causing bad rendering of gamma corrected text on non-standard image +format paint devices. + +Pick-to: 6.4 6.2 5.15 +Fixes: QTBUG-109169 +Change-Id: I6d95e9a42b9ccac609071123dd4535d25e225a29 +Reviewed-by: Fabian Vogt <fabian@ritter-vogt.de> +Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> +(cherry picked from commit a09c33e1f7b5999a16bce9dd23ef8ca33d519210) +--- + src/gui/painting/qcolortrclut_p.h | 1 + + src/gui/painting/qdrawhelper.cpp | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/gui/painting/qcolortrclut_p.h b/src/gui/painting/qcolortrclut_p.h +index 76a6a60803..24fd522e6c 100644 +--- a/src/gui/painting/qcolortrclut_p.h ++++ b/src/gui/painting/qcolortrclut_p.h +@@ -118,6 +118,7 @@ public: + return QRgba64::fromRgba64(r, g, b, qAlpha(rgb32) * 257); + #endif + } ++ QRgba64 toLinear64(QRgba64) const = delete; + + QRgb toLinear(QRgb rgb32) const + { +diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp +index a61793508a..5ba2d277b7 100644 +--- a/src/gui/painting/qdrawhelper.cpp ++++ b/src/gui/painting/qdrawhelper.cpp +@@ -6091,7 +6091,7 @@ static inline void alphargbblend_argb32(quint32 *dst, uint coverage, const QRgba + static inline void rgbBlendPixel(QRgba64 &dst, int coverage, QRgba64 slinear, const QColorTrcLut *colorProfile) + { + // Do a gammacorrected RGB alphablend... +- const QRgba64 dlinear = colorProfile ? colorProfile->toLinear64(dst) : dst; ++ const QRgba64 dlinear = colorProfile ? colorProfile->toLinear(dst) : dst; + + QRgba64 blend = rgbBlend(dlinear, slinear, coverage); + +-- +2.38.1 + diff --git a/dev-qt/qtgui/qtgui-5.15.7-r1.ebuild b/dev-qt/qtgui/qtgui-5.15.7-r1.ebuild new file mode 100644 index 000000000000..8c0d97088139 --- /dev/null +++ b/dev-qt/qtgui/qtgui-5.15.7-r1.ebuild @@ -0,0 +1,186 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="The GUI module and platform plugins for the Qt5 framework" + +SLOT=5/${QT5_PV} # bug 707658 +IUSE="accessibility dbus egl eglfs evdev gles2-only ibus jpeg +libinput + linuxfb +png tslib tuio +udev vnc vulkan wayland +X" +REQUIRED_USE=" + || ( eglfs linuxfb vnc X ) + accessibility? ( dbus X ) + eglfs? ( egl ) + ibus? ( dbus ) + libinput? ( udev ) + X? ( gles2-only? ( egl ) ) +" + +RDEPEND=" + dev-libs/glib:2 + =dev-qt/qtcore-${QT5_PV}*:5= + dev-util/gtk-update-icon-cache + media-libs/fontconfig + media-libs/freetype:2 + media-libs/harfbuzz:= + sys-libs/zlib:= + dbus? ( =dev-qt/qtdbus-${QT5_PV}* ) + eglfs? ( + media-libs/mesa[gbm(+)] + x11-libs/libdrm + ) + evdev? ( sys-libs/mtdev ) + jpeg? ( media-libs/libjpeg-turbo:= ) + gles2-only? ( media-libs/libglvnd ) + !gles2-only? ( media-libs/libglvnd[X] ) + libinput? ( + dev-libs/libinput:= + x11-libs/libxkbcommon + ) + png? ( media-libs/libpng:= ) + tslib? ( >=x11-libs/tslib-1.21 ) + tuio? ( =dev-qt/qtnetwork-${QT5_PV}* ) + udev? ( virtual/libudev:= ) + vnc? ( =dev-qt/qtnetwork-${QT5_PV}* ) + vulkan? ( dev-util/vulkan-headers ) + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libxcb:= + x11-libs/libxkbcommon[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 ) + linuxfb? ( sys-kernel/linux-headers ) + udev? ( sys-kernel/linux-headers ) +" +PDEPEND=" + ibus? ( app-i18n/ibus ) + wayland? ( =dev-qt/qtwayland-${QT5_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: + 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}/${P}-fix-wrong-to-linear-conversion.patch" # kde/5.15 + # Approved but pending rebase: + # https://invent.kde.org/qt/qt/qtbase/-/merge_requests/211 + "${FILESDIR}/${P}-xcb-correctly-disconnect-xsettings-callbacks.patch" + # Downstream workaround the fact that QT_CONFIG(dbus) does not work for us: + "${FILESDIR}/${P}-fix-no-dbus.patch" +) + +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=( + $(usev dbus -dbus-linked) + $(qt_use egl) + $(qt_use eglfs) + $(usev eglfs '-gbm -kms') + $(qt_use evdev) + $(qt_use evdev mtdev) + -fontconfig + -system-freetype + -gui + -system-harfbuzz + $(qt_use jpeg libjpeg system) + $(qt_use libinput) + $(qt_use linuxfb) + -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) + $(usev X '-xcb-xlib') + ) + if use libinput || use X; then + myconf+=( -xkbcommon ) + fi + qt5-build_src_configure +} |