Hello community, here is the log from the commit of package libqt4 checked in at Wed Aug 6 01:51:45 CEST 2008. -------- --- libqt4/libqt4.changes 2008-07-31 18:51:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2008-08-05 14:30:49.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Aug 5 14:30:20 CEST 2008 - dmueller@suse.de + +- temporarily revert a change in qwidget.cpp to fix systray + +------------------------------------------------------------------- libqt4-devel-doc-data.changes: same change libqt4-sql-plugins.changes: same change libQtWebKit-devel.changes: same change New: ---- get-systray-back.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc-data.spec ++++++ --- /var/tmp/diff_new_pack.T20987/_old 2008-08-06 01:50:44.000000000 +0200 +++ /var/tmp/diff_new_pack.T20987/_new 2008-08-06 01:50:44.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package libqt4-devel-doc-data (Version 4.4.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -28,7 +35,7 @@ # COMMON-BEGIN # COMMON-BEGIN Version: 4.4.1 -Release: 1 +Release: 6 %define base_name libqt4 %define x11_free -x11-opensource-src- %define rversion 4.4.1 @@ -70,6 +77,7 @@ Patch83: 0235-qdbus-dispatch-async-timeout.diff Patch84: 0236-qtoolbararealayout-restore.diff Patch86: 0238-fix-qt-qttabbar-size.diff +Patch87: get-systray-back.diff 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 @@ -128,6 +136,7 @@ %patch83 %patch84 %patch86 +%patch87 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -183,6 +192,8 @@ /usr/share/doc/packages/%base_name/src %changelog +* Tue Aug 05 2008 dmueller@suse.de +- temporarily revert a change in qwidget.cpp to fix systray * Thu Jul 31 2008 dmueller@suse.de - update to 4.4.1: * for detailed changelog, see included changes-4.4.1 ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.T20987/_old 2008-08-06 01:50:44.000000000 +0200 +++ /var/tmp/diff_new_pack.T20987/_new 2008-08-06 01:50:44.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package libqt4 (Version 4.4.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -34,7 +41,7 @@ Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-BEGIN Version: 4.4.1 -Release: 1 +Release: 6 %define base_name libqt4 %define x11_free -x11-opensource-src- %define rversion 4.4.1 @@ -76,6 +83,7 @@ Patch83: 0235-qdbus-dispatch-async-timeout.diff Patch84: 0236-qtoolbararealayout-restore.diff Patch86: 0238-fix-qt-qttabbar-size.diff +Patch87: get-systray-back.diff 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 @@ -135,6 +143,7 @@ %patch83 %patch84 %patch86 +%patch87 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -441,6 +450,8 @@ %plugindir/sqldrivers/libqsqlite*.so %changelog +* Tue Aug 05 2008 dmueller@suse.de +- temporarily revert a change in qwidget.cpp to fix systray * Thu Jul 31 2008 dmueller@suse.de - update to 4.4.1: * for detailed changelog, see included changes-4.4.1 ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.T20987/_old 2008-08-06 01:50:44.000000000 +0200 +++ /var/tmp/diff_new_pack.T20987/_new 2008-08-06 01:50:44.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package libqt4-sql-plugins (Version 4.4.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -27,7 +34,7 @@ # COMMON-BEGIN # COMMON-BEGIN Version: 4.4.1 -Release: 1 +Release: 2 %define base_name libqt4 %define x11_free -x11-opensource-src- %define rversion 4.4.1 @@ -69,6 +76,7 @@ Patch83: 0235-qdbus-dispatch-async-timeout.diff Patch84: 0236-qtoolbararealayout-restore.diff Patch86: 0238-fix-qt-qttabbar-size.diff +Patch87: get-systray-back.diff 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 @@ -126,6 +134,7 @@ %patch83 %patch84 %patch86 +%patch87 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -244,6 +253,8 @@ %plugindir/sqldrivers/libqsqlmysql*.so %changelog +* Tue Aug 05 2008 dmueller@suse.de +- temporarily revert a change in qwidget.cpp to fix systray * Thu Jul 31 2008 dmueller@suse.de - update to 4.4.1: * for detailed changelog, see included changes-4.4.1 ++++++ libQtWebKit-devel.spec ++++++ --- /var/tmp/diff_new_pack.T20987/_old 2008-08-06 01:50:45.000000000 +0200 +++ /var/tmp/diff_new_pack.T20987/_new 2008-08-06 01:50:45.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package libQtWebKit-devel (Version 4.4.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -31,7 +38,7 @@ # COMMON-BEGIN # COMMON-BEGIN Version: 4.4.1 -Release: 1 +Release: 6 %define base_name libqt4 %define x11_free -x11-opensource-src- %define rversion 4.4.1 @@ -73,6 +80,7 @@ Patch83: 0235-qdbus-dispatch-async-timeout.diff Patch84: 0236-qtoolbararealayout-restore.diff Patch86: 0238-fix-qt-qttabbar-size.diff +Patch87: get-systray-back.diff 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 @@ -132,6 +140,7 @@ %patch83 %patch84 %patch86 +%patch87 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -300,6 +309,8 @@ /usr/bin/qt4-browser %changelog +* Tue Aug 05 2008 dmueller@suse.de +- temporarily revert a change in qwidget.cpp to fix systray * Thu Jul 31 2008 dmueller@suse.de - update to 4.4.1: * for detailed changelog, see included changes-4.4.1 ++++++ get-systray-back.diff ++++++ --- src/gui/kernel/qwidget.cpp +++ src/gui/kernel/qwidget.cpp @@ -9095,8 +9095,6 @@ break; #endif case Qt::WA_NativeWindow: - if (!qApp->testAttribute(Qt::AA_DontCreateNativeWidgetSiblings) && parentWidget()) - parentWidget()->d_func()->enforceNativeChildren(); if (on && !internalWinId() && testAttribute(Qt::WA_WState_Created)) d->createWinId(); break; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org