From 4a377f02eb781de0358796b14fe286f78dd07893 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 11 Nov 2014 12:11:20 -0600 Subject: [PATCH] pull in slightly different upstreamed font rendering fix (#1052389,QTBUG-41590) --- ...ply-subpixel-gamma-correction-on-XCB.patch | 45 +++++++++++++++++++ qt-5.3.2-xcb-gamma-tweaks.patch | 10 ----- qt5-qtbase.spec | 14 +++--- 3 files changed, 54 insertions(+), 15 deletions(-) create mode 100644 0351-Do-not-apply-subpixel-gamma-correction-on-XCB.patch delete mode 100644 qt-5.3.2-xcb-gamma-tweaks.patch diff --git a/0351-Do-not-apply-subpixel-gamma-correction-on-XCB.patch b/0351-Do-not-apply-subpixel-gamma-correction-on-XCB.patch new file mode 100644 index 0000000..24207a8 --- /dev/null +++ b/0351-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 351/351] 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. +-- +2.1.0 + diff --git a/qt-5.3.2-xcb-gamma-tweaks.patch b/qt-5.3.2-xcb-gamma-tweaks.patch deleted file mode 100644 index 19c4d26..0000000 --- a/qt-5.3.2-xcb-gamma-tweaks.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- qtbase-opensource-src-5.3.2-ori/src/plugins/platforms/xcb/qxcbintegration.cpp 2014-09-11 12:48:06.000000000 +0200 -+++ qtbase-opensource-src-5.3.2/src/plugins/platforms/xcb/qxcbintegration.cpp 2014-10-19 01:21:48.115307241 +0200 -@@ -404,6 +404,7 @@ QVariant QXcbIntegration::styleHint(QPla - case QPlatformIntegration::KeyboardAutoRepeatRate: - case QPlatformIntegration::PasswordMaskDelay: - case QPlatformIntegration::FontSmoothingGamma: -+ return qreal(1.4); - case QPlatformIntegration::StartDragVelocity: - case QPlatformIntegration::UseRtlExtensions: - case QPlatformIntegration::PasswordMaskCharacter: diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index d52d7dd..352c420 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.4.%{pre}%{?dist} +Release: 0.5.%{pre}%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -76,12 +76,13 @@ Patch12: qtbase-opensource-src-5.2.0-enable_ft_lcdfilter.patch # https://bugreports.qt-project.org/browse/QTBUG-27195 # NEEDS REBASE 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 -Patch51: https://bugreports.qt-project.org/secure/attachment/43824/qt-5.3.2-xcb-gamma-tweaks.patch - -##upstream patches +Patch351: 0351-Do-not-apply-subpixel-gamma-correction-on-XCB.patch # macros, be mindful to keep sync'd with macros.qt5 Source1: macros.qt5 @@ -311,7 +312,7 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags %patch12 -p1 -b .enable_ft_lcdfilter #patch50 -p1 -b .poll -%patch51 -p1 -b .xcb-gamma-tweaks +%patch351 -p1 -b .0351 # drop -fexceptions from $RPM_OPT_FLAGS RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` @@ -798,6 +799,9 @@ fi %changelog +* Tue Nov 11 2014 Rex Dieter 5.4.0-0.5.beta +- pull in slightly different upstreamed font rendering fix (#1052389,QTBUG-41590) + * Mon Nov 10 2014 Rex Dieter 5.4.0-0.4.beta - Bad font rendering (#1052389,QTBUG-41590)