rpms/qt/devel qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch, NONE, 1.1 .cvsignore, 1.54, 1.55 qt.spec, 1.262, 1.263 sources, 1.55, 1.56 qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25040

Modified Files:
	.cvsignore qt.spec sources 
Added Files:
	qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch 
Removed Files:
	qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch 
Log Message:
* Fri Apr 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-3
- enable FT_LCD_FILTER


qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch:

--- NEW FILE qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch ---
diff -up qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp.enable_ft_lcdfilter qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp
--- qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp.enable_ft_lcdfilter	2009-04-21 18:57:41.000000000 -0500
+++ qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp	2009-04-24 11:17:49.562695405 -0500
@@ -72,7 +72,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) // && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING)
 #define QT_USE_FREETYPE_LCDFILTER
 #endif
 
@@ -1051,7 +1051,7 @@ QFontEngineFT::Glyph *QFontEngineFT::loa
             Q_ASSERT(antialias);
             uchar *convoluted = new uchar[bitmap.rows*bitmap.pitch];
             bool useLegacyLcdFilter = false;
-#if defined(FC_LCD_FILTER) && defined(FT_LCD_FILTER_H)
+#if defined(FT_LCD_FILTER_H) // && defined(FC_LCD_FILTER)
             useLegacyLcdFilter = (lcdFilterType == FT_LCD_FILTER_LEGACY);
 #endif
             uchar *buffer = bitmap.buffer;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	23 Apr 2009 11:43:37 -0000	1.54
+++ .cvsignore	24 Apr 2009 17:16:23 -0000	1.55
@@ -1,6 +1,4 @@
 hi128-app-qt4-logo.png
 hi48-app-qt4-logo.png
-qt-x11-opensource-src-4.5.0.tar.bz2
-qt-copy-patches-20090325svn.tar.bz2
-qt-copy-patches-20090423svn.tar.bz2
 qt-x11-opensource-src-4.5.1.tar.bz2
+qt-copy-patches-20090424svn.tar.bz2


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- qt.spec	23 Apr 2009 11:43:37 -0000	1.262
+++ qt.spec	24 Apr 2009 17:16:23 -0000	1.263
@@ -12,7 +12,7 @@
 Name:    qt4
 %endif
 Version: 4.5.1
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -41,8 +41,7 @@
 Patch13: qt-x11-opensource-src-4.5.0-gcc_hack.patch
 # qt fails to build on ia64: http://bugzilla.redhat.com/492174
 Patch14: qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch
-# http://bugzilla.redhat.com/490377
-Patch15: qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch
+Patch15: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
@@ -54,7 +53,7 @@
 Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
 
 ## qt-copy patches
-%define qt_copy 20090423
+%define qt_copy 20090424
 Source1: qt-copy-patches-svn_checkout.sh
 %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
 %{?qt_copy:Provides: qt-copy = %{qt_copy}}
@@ -308,10 +307,6 @@
 
 %if 0%{?qt_copy}
 echo "0250" >> patches/DISABLED
-echo "0245" >> patches/DISABLED
-echo "0275" >> patches/DISABLED
-echo "0276" >> patches/DISABLED
-echo "0278" >> patches/DISABLED
 test -x apply_patches && ./apply_patches
 %endif
 
@@ -324,7 +319,7 @@
 %patch5 -p1 -b .bz#437440-as_IN-437440
 %patch13 -p1 -b .gcc_hack
 %patch14 -p1 -b .ia64_boilerplate
-%patch15 -p1 -b .disable_ft_lcdfilter
+%patch15 -p1 -b .enable_ft_lcdfilter
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
@@ -809,6 +804,12 @@
 
 
 %changelog
+* Fri Apr 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-3
+- enable FT_LCD_FILTER
+
+* Fri Apr 24 2009 Than Ngo <than at redhat.com> - 4.5.1-2
+- apply upstream patch to fix the svg rendering regression
+
 * Thu Apr 23 2009 Than Ngo <than at redhat.com> - 4.5.1-1
 - 4.5.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	23 Apr 2009 11:43:38 -0000	1.55
+++ sources	24 Apr 2009 17:16:23 -0000	1.56
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
-e658d26376d678bd45a877ca47e42b7a  qt-copy-patches-20090423svn.tar.bz2
 afc43e566341cf3e5ed0bcb974f0c3b2  qt-x11-opensource-src-4.5.1.tar.bz2
+8718da189e55c91a749ec9d142aea784  qt-copy-patches-20090424svn.tar.bz2


--- qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch DELETED ---