Accepting request 1043280 from KDE:Qt:5.15

Qt 5.15.7 + accessibility requested by sitter (forwarded request 1043149 from Vogtinator)

OBS-URL: https://build.opensuse.org/request/show/1043280
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=136
This commit is contained in:
Dominique Leuenberger 2022-12-17 19:36:11 +00:00 committed by Git OBS Bridge
commit 1f2977b300
7 changed files with 25 additions and 54 deletions

View File

@ -1,44 +0,0 @@
From e97a4f42b78259da9422b12d1a601d6c8dd93f68 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
---
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

View File

@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://invent.kde.org/qt/qt/qtbase.git</param>
<param name="changesrevision">4abf3579e1d3834600da81b103d403df575b1b4f</param></service></servicedata>
<param name="changesrevision">a9e67318e6a8924c4b5461656bcc6a80720ae899</param></service></servicedata>

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Thu Dec 15 12:06:32 UTC 2022 - Fabian Vogt <fvogt@ritter-vogt.de>
- Update to version 5.15.7+kde177:
* Fix wrong to linear conversion
* QKeySequence: Add missing modifier names
* Scale BMP color samples with periodic bit expansion
* Send accessible focus event after list view has focus
* update function argument of SSL_CTX_set_options
* Openssl backend: reinsert a missing C in qCDebug
* Annotate QMutex with TSAN annotations
* Handle allocation failure in QImage rotate 90/180/270 functions
* xcb: Replace qCWarning by qCDebug in QXcbConnection::printXcbError()
* a11y: support GetAccessibleId for at-spi
- Drop patches, now upstream:
* 0001-Fix-wrong-to-linear-conversion.patch
-------------------------------------------------------------------
Tue Dec 6 10:37:08 UTC 2022 - Fabian Vogt <fvogt@suse.com>

View File

@ -29,7 +29,7 @@
%bcond_without harfbuzz
Name: libqt5-qtbase
Version: 5.15.7+kde167
Version: 5.15.7+kde177
Release: 0
Summary: C++ Program Library, Core Components
License: LGPL-3.0-only or GPL-3.0-with-Qt-Company-Qt-exception-1.1
@ -61,8 +61,6 @@ Patch12: 0001-Add-remote-print-queue-support.patch
Patch21: 0001-Don-t-white-list-recent-Mesa-versions-for-multithrea.patch
Patch24: fix-fixqt4headers.patch
# patches 1000-2000 and above from upstream 5.15 branch #
# Not accepted yet, https://codereview.qt-project.org/c/qt/qtbase/+/447019
Patch1001: 0001-Fix-wrong-to-linear-conversion.patch
# patches 2000-3000 and above from upstream qt6/dev branch #
# Not accepted yet, https://codereview.qt-project.org/c/qt/qtbase/+/255384
Patch2001: 0002-Synthesize-Enter-LeaveEvent-for-accepted-QTabletEven.patch

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4f89ed1be986dfe2064676ca3b261d3d2c8e40938ac7d0e691005dd4448fc32f
size 293177358

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c16af7109f5bb02bb492925d4d6d2ad0db781abed7e0fb780a22437cb45d1b41
size 293184526

View File

@ -1,4 +1,4 @@
name: qtbase-everywhere-src
version: 5.15.7+kde167
mtime: 1666981798
commit: 98c727f273fc83c24550274bd2728e1aafbd213a
version: 5.15.7+kde177
mtime: 1670583536
commit: a9e67318e6a8924c4b5461656bcc6a80720ae899