Hello community, here is the log from the commit of package libqt4 checked in at Thu May 1 14:23:11 CEST 2008. -------- --- libqt4/libqt4.changes 2008-04-22 12:42:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2008-04-30 02:08:48.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Apr 30 01:35:54 CEST 2008 - dmueller@suse.de + +- fix QTabBar layout being wrongly cached (kde#159014) +- fix major performance regression in QPixmap::hasAlpha() +- fix wrongly diffed snapshot update + +------------------------------------------------------------------- libqt4-devel-doc-data.changes: same change libqt4-sql-plugins.changes: same change libQtWebKit-devel.changes: same change New: ---- 0223-fix-qpixmap-hasalpha.diff 0225-invalidate-tabbar-geometry-on-refresh.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc-data.spec ++++++ --- /var/tmp/diff_new_pack.B14645/_old 2008-05-01 14:22:22.000000000 +0200 +++ /var/tmp/diff_new_pack.B14645/_new 2008-05-01 14:22:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-devel-doc-data (Version 4.3.95+20080424) +# spec file for package libqt4-devel-doc-data (Version 4.3.95+20080429) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -27,7 +27,7 @@ %requires_eq libqt4 # COMMON-BEGIN # COMMON-BEGIN -Version: 4.3.95+20080424 +Version: 4.3.95+20080429 Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- @@ -62,6 +62,8 @@ Patch66: statusbar-recursion.diff Patch67: revert-psql-detection.diff Patch68: xim-callback-crash.diff +Patch69: 0223-fix-qpixmap-hasalpha.diff +Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions -system-libtiff -no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite @@ -109,6 +111,8 @@ %patch66 %patch67 %patch68 +%patch69 +%patch70 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -167,6 +171,10 @@ /usr/share/doc/packages/%base_name/src %changelog +* Wed Apr 30 2008 dmueller@suse.de +- fix QTabBar layout being wrongly cached (kde#159014) +- fix major performance regression in QPixmap::hasAlpha() +- fix wrongly diffed snapshot update * Tue Apr 22 2008 dmueller@suse.de - fix crash in xim destroy callback (bnc#382254) * Mon Apr 21 2008 dmueller@suse.de ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.B14645/_old 2008-05-01 14:22:22.000000000 +0200 +++ /var/tmp/diff_new_pack.B14645/_new 2008-05-01 14:22:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libqt4 (Version 4.3.95+20080424) +# spec file for package libqt4 (Version 4.3.95+20080429) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -33,7 +33,7 @@ Provides: libqt4-dbus-1 <= 4.4.0 Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-BEGIN -Version: 4.3.95+20080424 +Version: 4.3.95+20080429 Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- @@ -68,6 +68,8 @@ Patch66: statusbar-recursion.diff Patch67: revert-psql-detection.diff Patch68: xim-callback-crash.diff +Patch69: 0223-fix-qpixmap-hasalpha.diff +Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions -system-libtiff -no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite @@ -116,6 +118,8 @@ %patch66 %patch67 %patch68 +%patch69 +%patch70 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -293,7 +297,9 @@ %defattr(-,root,root,755) %dir %_libdir/qt4 %dir %plugindir +%if %suse_version > 910 %dir %plugindir/script +%endif %dir %plugindir/codecs %dir %plugindir/iconengines %dir %plugindir/imageformats @@ -339,7 +345,9 @@ %plugindir/accessible/* /usr/share/qt4/translations /usr/share/qt4/phrasebooks +%if %suse_version > 910 %plugindir/script/libqtscriptdbus.so +%endif %files qt3support %defattr(-,root,root,755) @@ -409,6 +417,10 @@ %plugindir/sqldrivers/libqsqlite*.so %changelog +* Wed Apr 30 2008 dmueller@suse.de +- fix QTabBar layout being wrongly cached (kde#159014) +- fix major performance regression in QPixmap::hasAlpha() +- fix wrongly diffed snapshot update * Tue Apr 22 2008 dmueller@suse.de - fix crash in xim destroy callback (bnc#382254) * Mon Apr 21 2008 dmueller@suse.de ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.B14645/_old 2008-05-01 14:22:22.000000000 +0200 +++ /var/tmp/diff_new_pack.B14645/_new 2008-05-01 14:22:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-sql-plugins (Version 4.3.95+20080424) +# spec file for package libqt4-sql-plugins (Version 4.3.95+20080429) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -26,7 +26,7 @@ Summary: Qt 4 SQL-Related Libraries # COMMON-BEGIN # COMMON-BEGIN -Version: 4.3.95+20080424 +Version: 4.3.95+20080429 Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- @@ -61,6 +61,8 @@ Patch66: statusbar-recursion.diff Patch67: revert-psql-detection.diff Patch68: xim-callback-crash.diff +Patch69: 0223-fix-qpixmap-hasalpha.diff +Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions -system-libtiff -no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite @@ -107,6 +109,8 @@ %patch66 %patch67 %patch68 +%patch69 +%patch70 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -225,6 +229,10 @@ %plugindir/sqldrivers/libqsqlmysql*.so %changelog +* Wed Apr 30 2008 dmueller@suse.de +- fix QTabBar layout being wrongly cached (kde#159014) +- fix major performance regression in QPixmap::hasAlpha() +- fix wrongly diffed snapshot update * Tue Apr 22 2008 dmueller@suse.de - fix crash in xim destroy callback (bnc#382254) * Mon Apr 21 2008 dmueller@suse.de ++++++ libQtWebKit-devel.spec ++++++ --- /var/tmp/diff_new_pack.B14645/_old 2008-05-01 14:22:22.000000000 +0200 +++ /var/tmp/diff_new_pack.B14645/_new 2008-05-01 14:22:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libQtWebKit-devel (Version 4.3.95+20080424) +# spec file for package libQtWebKit-devel (Version 4.3.95+20080429) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -30,7 +30,7 @@ %requires_eq libqt4-devel # COMMON-BEGIN # COMMON-BEGIN -Version: 4.3.95+20080424 +Version: 4.3.95+20080429 Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- @@ -65,6 +65,8 @@ Patch66: statusbar-recursion.diff Patch67: revert-psql-detection.diff Patch68: xim-callback-crash.diff +Patch69: 0223-fix-qpixmap-hasalpha.diff +Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions -system-libtiff -no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite @@ -113,6 +115,8 @@ %patch66 %patch67 %patch68 +%patch69 +%patch70 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -278,6 +282,10 @@ /usr/bin/svgviewer %changelog +* Wed Apr 30 2008 dmueller@suse.de +- fix QTabBar layout being wrongly cached (kde#159014) +- fix major performance regression in QPixmap::hasAlpha() +- fix wrongly diffed snapshot update * Tue Apr 22 2008 dmueller@suse.de - fix crash in xim destroy callback (bnc#382254) * Mon Apr 21 2008 dmueller@suse.de ++++++ 0223-fix-qpixmap-hasalpha.diff ++++++ qt-bugs@ issue : N206173 Trolltech task ID : 206174 bugs.kde.org number : none applied: yes author: Fredrik Höglund <fredrik@kde.org> Calling data->mask() in a pixmap that has an alpha channel causes the mask to be generated from the alpha channel. This is a very expensive operation, and completely unecessary in this case since the generated bitmap is immediately discarded. Fix the issue by reversing the order of the tests in the return statement, so the function returns true if the pixmap has an alpha channel, without generating the mask. Index: src/gui/image/qpixmap.cpp =================================================================== --- src/gui/image/qpixmap.cpp (revision 798574) +++ src/gui/image/qpixmap.cpp (working copy) @@ -1661,7 +1661,7 @@ */ bool QPixmap::hasAlpha() const { - return (!data->mask().isNull() || data->hasAlphaChannel()); + return (data->hasAlphaChannel() || !data->mask().isNull()); } /*! ++++++ 0225-invalidate-tabbar-geometry-on-refresh.patch ++++++ qt-bugs@ issue : None Trolltech task ID : None bugs.kde.org number : 159014 applied: no author: Robert Knight <robertknight@gmail.com> When tabs are inserted or removed in a QTabBar, QTabBarPrivate::refresh() is called to update the layout. If the tabbar widget is hidden, this just sets a boolean variable (layoutDirty) and returns, so the parent widget's layout is not notified about the possible geometry change. Prior to Qt 4.4 this was not a problem because the geometry was recalculated in QTabBar::sizeHint() if the layoutDirty variable was set. In Qt 4.4 however the layout caches size hint information in QWidgetItemV2. Since the cache information is not invalidated, the layout may end up using out-of-date size hint information to compute the widget size. If the QTabBar is empty when QTabBar::sizeHint() is called, it will return a size with a height of 0, which will be kept in the cache and so the tab bar will never be shown. This patch fixes the problem by calling updateGeometry() whenever the tab bar's layout is refreshed. Index: src/gui/widgets/qtabbar.cpp =================================================================== --- src/gui/widgets/qtabbar.cpp (revision 796858) +++ src/gui/widgets/qtabbar.cpp (working copy) @@ -533,8 +533,8 @@ layoutTabs(); makeVisible(currentIndex); q->update(); - q->updateGeometry(); } + q->updateGeometry(); } /*! ++++++ qt-4.4-update.diff ++++++ ++++ 20242 lines (skipped) ++++ between libqt4/qt-4.4-update.diff ++++ and /mounts/work_src_done/STABLE/libqt4/qt-4.4-update.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org