diff --git a/.gitignore b/.gitignore index 01e17b3..00107c8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /qtbase-opensource-src-5.3.2.tar.xz -/qtbase-opensource-src-5.4.0-beta.tar.xz +/qtbase-opensource-src-5.4.0-rc.tar.xz diff --git a/0351-Do-not-apply-subpixel-gamma-correction-on-XCB.patch b/0351-Do-not-apply-subpixel-gamma-correction-on-XCB.patch deleted file mode 100644 index 24207a8..0000000 --- a/0351-Do-not-apply-subpixel-gamma-correction-on-XCB.patch +++ /dev/null @@ -1,45 +0,0 @@ -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/qt5-qtbase.spec b/qt5-qtbase.spec index 21af5e7..4a36676 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -25,14 +25,14 @@ %define examples 1 %endif -%define pre beta +%define pre rc #define snap 2014-10-07_40 #define snap_tag 20141007_40 Summary: Qt5 - QtBase components Name: qt5-qtbase Version: 5.4.0 -Release: 0.6.%{pre}%{?dist} +Release: 0.7.%{pre}%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -79,11 +79,6 @@ 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 -Patch351: 0351-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} @@ -314,7 +309,6 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags %patch12 -p1 -b .enable_ft_lcdfilter #patch50 -p1 -b .poll -%patch351 -p1 -b .0351 # drop -fexceptions from $RPM_OPT_FLAGS RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` @@ -801,6 +795,9 @@ fi %changelog +* Thu Nov 27 2014 Rex Dieter 5.4.0-0.7.rc +- 5.4.0-rc + * Wed Nov 12 2014 Rex Dieter 5.4.0-0.6.beta - add versioned Requires: libxkbcommon dep diff --git a/sources b/sources index eb1682a..3567a65 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bfe2c1d250e4771a55b37eb64edb832a qtbase-opensource-src-5.4.0-beta.tar.xz +5b7461c9cbc8784b3d166f7e631e48f2 qtbase-opensource-src-5.4.0-rc.tar.xz