rpms/qt5-qtbase
7
0
Fork 0
Code Issues Pull Requests Releases Activity

5.2.0-7

Browse Source 
- unconditionally enable freetype lcd_filter
- (temp) disable docs (libxcb bootstrap)
This commit is contained in:
Rex Dieter 2014-01-27 13:15:09 -06:00
parent dc97989214
commit b4670ded86
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qt5-qtbase.spec
View File

@ -16,7 +16,7 @@
# where qt5-qttools builds are not yet available # where qt5-qttools builds are not yet available
# only primary archs (for now), allow secondary to bootstrap # only primary archs (for now), allow secondary to bootstrap
%ifarch %{arm} %{ix86} x86_64 %ifarch %{arm} %{ix86} x86_64
%define docs 1 #define docs 1
%endif %endif
#define pre rc1 #define pre rc1
@ -26,7 +26,7 @@
Summary: Qt5 - QtBase components Summary: Qt5 - QtBase components
Name: qt5-qtbase Name: qt5-qtbase
Version: 5.2.0 Version: 5.2.0
Release: 6%{?dist} Release: 7%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -60,6 +60,9 @@ Patch4: qt-everywhere-opensource-src-4.8.5-QTBUG-35459.patch
# fix QTBUG-35460 (error message for CVE-2013-4549 is misspelled) # fix QTBUG-35460 (error message for CVE-2013-4549 is misspelled)
Patch5: qt-everywhere-opensource-src-4.8.5-QTBUG-35460.patch Patch5: qt-everywhere-opensource-src-4.8.5-QTBUG-35460.patch
# unconditionally enable freetype lcdfilter support
Patch12: qtbase-opensource-src-5.2.0-enable_ft_lcdfilter.patch
# upstreamable patches # upstreamable patches
# support poll # support poll
# https://bugreports.qt-project.org/browse/QTBUG-27195 # https://bugreports.qt-project.org/browse/QTBUG-27195
@ -248,6 +251,7 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
%patch3 -p1 -b .qatomic-ppc %patch3 -p1 -b .qatomic-ppc
%patch4 -p1 -b .QTBUG-35459 %patch4 -p1 -b .QTBUG-35459
%patch5 -p1 -b .QTBUG-35460 %patch5 -p1 -b .QTBUG-35460
%patch12 -p1 -b .enable_ft_lcdfilter
#patch50 -p1 -b .poll #patch50 -p1 -b .poll
%patch51 -p1 -b .bigendian %patch51 -p1 -b .bigendian
@ -665,6 +669,10 @@ popd
%changelog %changelog
* Mon Jan 27 2014 Rex Dieter <rdieter@fedoraproject.org> - 5.2.0-7
- unconditionally enable freetype lcd_filter
- (temp) disable docs (libxcb bootstrap)
* Sun Jan 26 2014 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-6 * Sun Jan 26 2014 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-6
- fix %%_qt5_examplesdir macro - fix %%_qt5_examplesdir macro

12
qtbase-opensource-src-5.2.0-enable_ft_lcdfilter.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up qtbase-opensource-src-5.2.0/src/gui/text/qfontengine_ft.cpp.lcdfilter qtbase-opensource-src-5.2.0/src/gui/text/qfontengine_ft.cpp
--- qtbase-opensource-src-5.2.0/src/gui/text/qfontengine_ft.cpp.lcdfilter 2013-12-08 11:09:51.000000000 -0600
+++ qtbase-opensource-src-5.2.0/src/gui/text/qfontengine_ft.cpp 2014-01-27 13:09:28.426065603 -0600
@@ -69,7 +69,7 @@
#include FT_CONFIG_OPTIONS_H
#endif
-#if defined(FT_LCD_FILTER_H) && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING)
+#if defined(FT_LCD_FILTER_H)
#define QT_USE_FREETYPE_LCDFILTER
#endif