- rel 3; two patches from fc

Changed files:
    qt-everywhere-opensource-src-4.7.1-qtextcursor-crash.patch -> 1.1
    qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch -> 1.1
    qt4.spec -> 1.279

diff --git a/qt-everywhere-opensource-src-4.7.1-qtextcursor-crash.patch b/qt-everywhere-opensource-src-4.7.1-qtextcursor-crash.patch
new file mode 100644 (file)
index 0000000..0d5628c
--- /dev/null
+++ b/qt-everywhere-opensource-src-4.7.1-qtextcursor-crash.patch
@@ -0,0 +1,12 @@
+--- a/src/gui/text/qtextcursor.cpp
++++ b/src/gui/text/qtextcursor.cpp
+@@ -363,6 +363,9 @@
+     bool adjustX = true;
+     QTextBlock blockIt = block();
+ 
++    if (!blockIt.isValid())
++        return false;
++
+     if (op >= QTextCursor::Left && op <= QTextCursor::WordRight
+         && blockIt.textDirection() == Qt::RightToLeft) {
+         if (op == QTextCursor::Left)

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
new file mode 100644 (file)
index 0000000..4ab3ea4
--- /dev/null
+++ b/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
@@ -0,0 +1,12 @@
+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)
+ #define QT_USE_FREETYPE_LCDFILTER
+ #endif
+ 

diff --git a/qt4.spec b/qt4.spec
index 37450c2fc4ab3d22ed483d5e065d337eddb61090..f7ad5a3b854296a401b24bca9bca9c76e210d2a6 100644 (file)
--- a/qt4.spec
+++ b/qt4.spec
@@ -67,7 +67,7 @@ Summary(pl.UTF-8):    Biblioteka Qt do tworzenia GUI
 Summary(pt_BR.UTF-8):  Estrutura para rodar aplicações GUI Qt
 Name:          qt4
 Version:       4.7.1
-Release:       2
+Release:       3
 License:       LGPL v2.1 or GPL v3.0
 Group:         X11/Libraries
 Source0:       http://download.qt.nokia.com/qt/source/qt-everywhere-opensource-src-%{version}.tar.gz
@@ -92,6 +92,8 @@ Patch6:               %{name}-build-lib-static.patch
 Patch7:                %{name}-x11_fonts.patch
 Patch8:                %{name}-pl-update.patch
 Patch9:                %{name}-ibase.patch
+Patch10:       qt-everywhere-opensource-src-4.7.1-qtextcursor-crash.patch
+Patch11:       qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
 URL:           http://www.qtsoftware.com/
 %{?with_ibase:BuildRequires:   Firebird-devel}
 BuildRequires: OpenGL-GLU-devel
@@ -1405,6 +1407,8 @@ Programas exemplo para o Qt versão.
 %patch7 -p1
 #%patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %{__sed} -i -e 's,usr/X11R6/,usr/g,' mkspecs/linux-g++-64/qmake.conf \
        mkspecs/common/linux.conf