rev 14072 - in trunk/packages/qt4-x11/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Mon Mar 16 11:06:57 UTC 2009
Author: fabo
Date: 2009-03-16 11:06:57 +0000 (Mon, 16 Mar 2009)
New Revision: 14072
Added:
trunk/packages/qt4-x11/debian/patches/0275-qtconcurrent-threadcount.diff
trunk/packages/qt4-x11/debian/patches/0276-webkit-pedantic.diff
trunk/packages/qt4-x11/debian/patches/0277-remove-blurrying-glyph.diff
Modified:
trunk/packages/qt4-x11/debian/changelog
trunk/packages/qt4-x11/debian/patches/series
Log:
* Add qt-copy patches:
- 0275-qtconcurrent-threadcount.diff
Calling idealThreadCount() calls sysconfig in every run, as well as
ignoring the configured number of threads for the main thread pool.
- 0276-webkit-pedantic.diff
Fix playground/base/plasma/applet/welcome compile with -pedantic.
- 0277-remove-blurrying-glyph.diff (Closes: #448555)
This patch removes blurrying glyph.
Thanks to M G Berberich.
Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog 2009-03-16 07:27:23 UTC (rev 14071)
+++ trunk/packages/qt4-x11/debian/changelog 2009-03-16 11:06:57 UTC (rev 14072)
@@ -1,3 +1,17 @@
+qt4-x11 (4.5.0-2) UNRELEASED; urgency=low
+
+ * Add qt-copy patches:
+ - 0275-qtconcurrent-threadcount.diff
+ Calling idealThreadCount() calls sysconfig in every run, as well as
+ ignoring the configured number of threads for the main thread pool.
+ - 0276-webkit-pedantic.diff
+ Fix playground/base/plasma/applet/welcome compile with -pedantic.
+ - 0277-remove-blurrying-glyph.diff (Closes: #448555)
+ This patch removes blurrying glyph.
+ Thanks to M G Berberich.
+
+ -- Fathi Boudra <fabo at debian.org> Mon, 16 Mar 2009 11:59:24 +0100
+
qt4-x11 (4.5.0-1) experimental; urgency=low
* New upstream released:
Added: trunk/packages/qt4-x11/debian/patches/0275-qtconcurrent-threadcount.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0275-qtconcurrent-threadcount.diff (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0275-qtconcurrent-threadcount.diff 2009-03-16 11:06:57 UTC (rev 14072)
@@ -0,0 +1,31 @@
+qt-bugs@ issue : none
+Qt Software task ID : 244718
+bugs.kde.org number : none
+applied: no
+author: Scott Wheeler <wheeler at kde.org>
+
+Calling idealThreadCount() calls sysconfig in every run, as well as ignoring
+the configured number of threads for the main thread pool. The syscall overhead
+means that QtConcurrent is basically rendered useless for relatively atomic tasks
+since the advantages of parallelization are far less than the overhead. In my
+tests this patch procuced a 30-50x improvement in performance on Linux.
+
+--- a/src/corelib/concurrent/qtconcurrentreducekernel.h
++++ b/src/corelib/concurrent/qtconcurrentreducekernel.h
+@@ -210,12 +210,14 @@ public:
+
+ inline bool shouldThrottle()
+ {
+- return (resultsMapSize > (ReduceQueueThrottleLimit * QThread::idealThreadCount()));
++ return (resultsMapSize > (ReduceQueueThrottleLimit *
++ QThreadPool::globalInstance()->maxThreadCount()));
+ }
+
+ inline bool shouldStartThread()
+ {
+- return (resultsMapSize <= (ReduceQueueStartLimit * QThread::idealThreadCount()));
++ return (resultsMapSize <= (ReduceQueueStartLimit *
++ QThreadPool::globalInstance()->maxThreadCount()));
+ }
+ };
+
Added: trunk/packages/qt4-x11/debian/patches/0276-webkit-pedantic.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0276-webkit-pedantic.diff (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0276-webkit-pedantic.diff 2009-03-16 11:06:57 UTC (rev 14072)
@@ -0,0 +1,30 @@
+qt-bugs@ issue : none
+Qt Software task ID : none
+bugs.kde.org number : none
+applied: no
+author: Laurent Montel <montel at kde.org>
+
+Just a little patch to fix playground/base/plasma/applet/welcome compile with -pedantic
+
+--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin.h
++++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin.h
+@@ -28,7 +28,7 @@
+ namespace WebCore {
+ class SecurityOrigin;
+ class ChromeClientQt;
+-};
++}
+
+ class QWebSecurityOriginPrivate;
+ class QWebDatabase;
+--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.h
++++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.h
+@@ -26,7 +26,7 @@
+
+ namespace WebCore {
+ class DatabaseDetails;
+-};
++}
+
+ class QWebDatabasePrivate;
+ class QWebSecurityOrigin;
Added: trunk/packages/qt4-x11/debian/patches/0277-remove-blurrying-glyph.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0277-remove-blurrying-glyph.diff (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0277-remove-blurrying-glyph.diff 2009-03-16 11:06:57 UTC (rev 14072)
@@ -0,0 +1,23 @@
+qt-bugs@ issue : none
+Qt Software task ID : 195256
+bugs.kde.org number : none
+applied: no
+author: M G Berberich <berberic at fmi.uni-passau.de>
+
+This patch removes blurrying glyph.
+See http://bugs.debian.org/448555 for more informations.
+
+--- a/src/gui/text/qfontengine_ft.cpp
++++ b/src/gui/text/qfontengine_ft.cpp
+@@ -1041,10 +1041,7 @@ QFontEngineFT::Glyph *QFontEngineFT::loa
+ if (hsubpixel) {
+ Q_ASSERT (bitmap.pixel_mode == FT_PIXEL_MODE_GRAY);
+ Q_ASSERT(antialias);
+- uchar *convoluted = new uchar[bitmap.rows*bitmap.pitch];
+- convoluteBitmap(bitmap.buffer, convoluted, bitmap.width, info.height, bitmap.pitch);
+- convertRGBToARGB(convoluted + 1, (uint *)glyph_buffer, info.width, info.height, bitmap.pitch, subpixelType != QFontEngineFT::Subpixel_RGB);
+- delete [] convoluted;
++ convertRGBToARGB(bitmap.buffer + 1, (uint *)glyph_buffer, info.width, info.height, bitmap.pitch, subpixelType != QFontEngineFT::Subpixel_RGB);
+ } else if (vfactor != 1) {
+ convertRGBToARGB_V(bitmap.buffer, (uint *)glyph_buffer, info.width, info.height, bitmap.pitch, subpixelType != QFontEngineFT::Subpixel_VRGB);
+ }
Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series 2009-03-16 07:27:23 UTC (rev 14071)
+++ trunk/packages/qt4-x11/debian/patches/series 2009-03-16 11:06:57 UTC (rev 14072)
@@ -9,6 +9,9 @@
0255-qtreeview-selection-columns-hidden.diff
0273-odbc-64bit-compile.diff
0274-shm-native-image-fix.diff
+0275-qtconcurrent-threadcount.diff
+0276-webkit-pedantic.diff
+0277-remove-blurrying-glyph.diff
# debian patches
01_qmake_for_debian.diff
More information about the pkg-kde-commits
mailing list