diff --git a/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch b/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch deleted file mode 100644 index 9923f33..0000000 --- a/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch +++ /dev/null @@ -1,21 +0,0 @@ -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; diff --git a/qt.spec b/qt.spec index 86ff794..735bfbf 100644 --- a/qt.spec +++ b/qt.spec @@ -12,7 +12,7 @@ Epoch: 1 Name: qt4 %endif Version: 4.5.1 -Release: 5%{?dist} +Release: 6%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -41,7 +41,6 @@ Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch 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 -Patch15: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch ## upstreamable bits # http://bugzilla.redhat.com/485677 @@ -342,7 +341,6 @@ test -x apply_patches && ./apply_patches %patch5 -p1 -b .bz#437440-as_IN-437440 %patch13 -p1 -b .gcc_hack %patch14 -p1 -b .ia64_boilerplate -%patch15 -p1 -b .enable_ft_lcdfilter %patch51 -p1 -b .qdoc3 %patch52 -p1 -b .sparc64 %patch53 -p1 -b .qatomic-inline-asm @@ -820,6 +818,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: %changelog +* Mon Apr 27 2009 Than Ngo - 4.5.1-6 +- drop useless qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch + * Mon Apr 27 2009 Rex Dieter - 4.5.1-5 - -devel: Provides: *-static for libQtUiTools.a