From 92f366366b2df9ee7f57dd5db15e9cb75961ceed Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 28 Nov 2014 15:32:30 -0600 Subject: [PATCH] restore font rendering patch (#1052389,QTBUG-41590) --- ...ply-subpixel-gamma-correction-on-XCB.patch | 45 +++++++++++++++++++ qt5-qtbase.spec | 12 ++++- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 0009-Do-not-apply-subpixel-gamma-correction-on-XCB.patch diff --git a/0009-Do-not-apply-subpixel-gamma-correction-on-XCB.patch b/0009-Do-not-apply-subpixel-gamma-correction-on-XCB.patch new file mode 100644 index 0000000..f167026 --- /dev/null +++ b/0009-Do-not-apply-subpixel-gamma-correction-on-XCB.patch @@ -0,0 +1,45 @@ +From 501c510cc3cb6215aed27af7599395480a049667 Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen +Date: Tue, 11 Nov 2014 13:48:27 +0100 +Subject: [PATCH 009/131] Do not apply subpixel gamma-correction on XCB +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +To match rendering of subpixel antialiased text in Qt 4.8 and other +toolkits on X11, we should not apply gamma-correction. This also +makes the rendering of subpixel antialiased text closer to normal +antialiased text. + +Task-number: QTBUG-41590 +Change-Id: I45ad3448334951353657b878d002eea429858f2d +Reviewed-by: Samuel Rødal +Reviewed-by: Sérgio Martins +Reviewed-by: Eskil Abrahamsen Blomfeldt +--- + src/plugins/platforms/xcb/qxcbintegration.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp +index cace087..3818494 100644 +--- a/src/plugins/platforms/xcb/qxcbintegration.cpp ++++ b/src/plugins/platforms/xcb/qxcbintegration.cpp +@@ -427,12 +427,14 @@ QVariant QXcbIntegration::styleHint(QPlatformIntegration::StyleHint hint) const + case QPlatformIntegration::StartDragTime: + case QPlatformIntegration::KeyboardAutoRepeatRate: + case QPlatformIntegration::PasswordMaskDelay: +- case QPlatformIntegration::FontSmoothingGamma: + case QPlatformIntegration::StartDragVelocity: + case QPlatformIntegration::UseRtlExtensions: + case QPlatformIntegration::PasswordMaskCharacter: + // TODO using various xcb, gnome or KDE settings + break; // Not implemented, use defaults ++ case QPlatformIntegration::FontSmoothingGamma: ++ // Match Qt 4.8 text rendering, and rendering of other X11 toolkits. ++ return qreal(1.0); + case QPlatformIntegration::StartDragDistance: { + // The default (in QPlatformTheme::defaultThemeHint) is 10 pixels, but + // on a high-resolution screen it makes sense to increase it. +-- +1.9.3 + diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 4a36676..0542c48 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -32,7 +32,7 @@ Summary: Qt5 - QtBase components Name: qt5-qtbase Version: 5.4.0 -Release: 0.7.%{pre}%{?dist} +Release: 0.8.%{pre}%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -79,6 +79,11 @@ Patch50: qt5-poll.patch ## upstream patches +# Bad font rendering, http://bugzilla.redhat.com/1052389 +# tweak font gamma correction, from: +# https://bugreports.qt-project.org/browse/QTBUG-41590 +Patch109: 0009-Do-not-apply-subpixel-gamma-correction-on-XCB.patch + # macros, be mindful to keep sync'd with macros.qt5 Source1: macros.qt5 %define _qt5 %{name} @@ -310,6 +315,8 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags #patch50 -p1 -b .poll +%patch109 -p1 -b .0009 + # drop -fexceptions from $RPM_OPT_FLAGS RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` @@ -795,6 +802,9 @@ fi %changelog +* Fri Nov 28 2014 Rex Dieter 5.4.0-0.8.rc +- restore font rendering patch (#1052389,QTBUG-41590) + * Thu Nov 27 2014 Rex Dieter 5.4.0-0.7.rc - 5.4.0-rc