Author: arekm Date: Fri Dec 17 20:14:56 2010 GMT Module: packages Tag: HEAD ---- Log message: - rel 3; two patches from fc
---- Files affected: packages/qt4: qt4.spec (1.278 -> 1.279) , qt-everywhere-opensource-src-4.7.1-qtextcursor-crash.patch (NONE -> 1.1) (NEW), qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/qt4/qt4.spec diff -u packages/qt4/qt4.spec:1.278 packages/qt4/qt4.spec:1.279 --- packages/qt4/qt4.spec:1.278 Sat Dec 4 18:08:18 2010 +++ packages/qt4/qt4.spec Fri Dec 17 21:14:51 2010 @@ -68,7 +68,7 @@ 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 @@ -93,6 +93,8 @@ 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 @@ -1406,6 +1408,8 @@ %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 @@ -2355,6 +2359,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.279 2010/12/17 20:14:51 arekm +- rel 3; two patches from fc + Revision 1.278 2010/12/04 17:08:18 sls - added TODO about QtWebKit-devel ================================================================ Index: packages/qt4/qt-everywhere-opensource-src-4.7.1-qtextcursor-crash.patch diff -u /dev/null packages/qt4/qt-everywhere-opensource-src-4.7.1-qtextcursor-crash.patch:1.1 --- /dev/null Fri Dec 17 21:14:56 2010 +++ packages/qt4/qt-everywhere-opensource-src-4.7.1-qtextcursor-crash.patch Fri Dec 17 21:14:51 2010 @@ -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) ================================================================ Index: packages/qt4/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch diff -u /dev/null packages/qt4/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch:1.1 --- /dev/null Fri Dec 17 21:14:56 2010 +++ packages/qt4/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch Fri Dec 17 21:14:51 2010 @@ -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 + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt4/qt4.spec?r1=1.278&r2=1.279&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
