Hello community, here is the log from the commit of package libqt4 checked in at Thu Dec 6 01:08:07 CET 2007. -------- --- libqt4/libqt4.changes 2007-11-15 16:24:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2007-12-05 17:43:19.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Dec 5 17:43:02 CET 2007 - dmueller@suse.de + +- update to 4.3.3: + * for changelog, see included changes-4.3.3 + +------------------------------------------------------------------- libqt4-devel-doc-data.changes: same change libqt4-sql-plugins.changes: same change Old: ---- 0193-qtreeview-division-by-zero.diff 0196-q3toolbar-clean-rebuild.diff 0198-fix-qstylesheetstyle2.diff qt-x11-opensource-src-4.3.2.tar.bz2 New: ---- 0172-prefer-xrandr-over-xinerama.diff 0200-fix-qsslsocket-waitfor.diff 0203-qtexthtmlparser-link-color.diff qt-x11-opensource-src-4.3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc-data.spec ++++++ --- /var/tmp/diff_new_pack.Vi1059/_old 2007-12-06 01:07:47.000000000 +0100 +++ /var/tmp/diff_new_pack.Vi1059/_new 2007-12-06 01:07:47.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-devel-doc-data (Version 4.3.2) +# spec file for package libqt4-devel-doc-data (Version 4.3.3) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -25,11 +25,11 @@ BuildArch: noarch # COMMON-BEGIN # COMMON-BEGIN -Version: 4.3.2 -Release: 18 +Version: 4.3.3 +Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.3.2 +%define rversion 4.3.3 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -55,10 +55,10 @@ Patch39: 0191-listview-alternate-row-colors.diff Patch40: 0188-fix-moc-parser-same-name-header.diff Patch41: 0189-fix-q3toolbar-qcombobox-signal-slot.diff -Patch42: 0193-qtreeview-division-by-zero.diff Patch43: 0195-compositing-properties.diff -Patch44: 0196-q3toolbar-clean-rebuild.diff -Patch45: 0198-fix-qstylesheetstyle2.diff +Patch46: 0172-prefer-xrandr-over-xinerama.diff +Patch47: 0200-fix-qsslsocket-waitfor.diff +Patch48: 0203-qtexthtmlparser-link-color.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -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 %_docdir/%{base_name}/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 -glib @@ -79,6 +79,7 @@ %if 0%{?opensuse_bs} %endif + %prep %define plugindir %_libdir/qt4/plugins %setup -q -n qt%x11_free%rversion @@ -100,10 +101,10 @@ %patch39 %patch40 %patch41 -%patch42 %patch43 -%patch44 -%patch45 +%patch46 +%patch47 +%patch48 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -118,6 +119,7 @@ sed -i -e "/QMAKE_CFLAGS_RELEASE[ \t]*=/s,$, $RPM_OPT_FLAGS," $f done sed -i -e "s,^CXXFLAGS[ \t]*=,& $RPM_OPT_FLAGS," qmake/Makefile.unix +export MAKEFLAGS=%{?jobs:-j %jobs} echo yes | ./configure %common_options pushd src make %{?jobs:-j%jobs} sub-moc sub-rcc sub-uic @@ -139,7 +141,11 @@ %defattr(-,root,root,755) /usr/share/doc/packages/libqt4/html /usr/share/doc/packages/libqt4/examples + %changelog +* Wed Dec 05 2007 - dmueller@suse.de +- update to 4.3.3: + * for changelog, see included changes-4.3.3 * Wed Nov 14 2007 - dmueller@suse.de - added patches: * add window properties to popups so that they can be properly ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.Vi1059/_old 2007-12-06 01:07:47.000000000 +0100 +++ /var/tmp/diff_new_pack.Vi1059/_new 2007-12-06 01:07:47.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libqt4 (Version 4.3.2) +# spec file for package libqt4 (Version 4.3.3) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -35,11 +35,11 @@ Obsoletes: qt Provides: qt # COMMON-BEGIN -Version: 4.3.2 -Release: 18 +Version: 4.3.3 +Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.3.2 +%define rversion 4.3.3 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -65,10 +65,10 @@ Patch39: 0191-listview-alternate-row-colors.diff Patch40: 0188-fix-moc-parser-same-name-header.diff Patch41: 0189-fix-q3toolbar-qcombobox-signal-slot.diff -Patch42: 0193-qtreeview-division-by-zero.diff Patch43: 0195-compositing-properties.diff -Patch44: 0196-q3toolbar-clean-rebuild.diff -Patch45: 0198-fix-qstylesheetstyle2.diff +Patch46: 0172-prefer-xrandr-over-xinerama.diff +Patch47: 0200-fix-qsslsocket-waitfor.diff +Patch48: 0203-qtexthtmlparser-link-color.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -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 %_docdir/%{base_name}/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 -glib @@ -90,6 +90,7 @@ %if 0%{?opensuse_bs} %endif + %prep %define plugindir %_libdir/qt4/plugins %setup -q -n qt%x11_free%rversion @@ -111,10 +112,10 @@ %patch39 %patch40 %patch41 -%patch42 %patch43 -%patch44 -%patch45 +%patch46 +%patch47 +%patch48 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -151,6 +152,7 @@ Troll Tech AS, Norway %if %suse_version > 1010 + %package dbus-1 Group: System/Libraries Summary: C++ Program Library, D-BUS Bindings @@ -172,6 +174,7 @@ Troll Tech AS, Norway %endif + %package devel-doc Group: Documentation/HTML Summary: Qt documentation @@ -251,6 +254,7 @@ sed -i -e "s,^(CXXFLAGS[ \t]*=.*),\1 $RPM_OPT_FLAGS," qmake/Makefile.unix export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS" export CFLAGS="$CFLAGS $RPM_OPT_FLAGS" +export MAKEFLAGS=%{?jobs:-j %jobs} echo yes | ./configure %common_options -no-sql-sqlite -no-sql-sqlite2 make %{?jobs:-j %jobs} @@ -443,7 +447,11 @@ %defattr(-,root,root,755) %dir %plugindir/sqldrivers %_libdir/libQtSql*.so.* + %changelog +* Wed Dec 05 2007 - dmueller@suse.de +- update to 4.3.3: + * for changelog, see included changes-4.3.3 * Wed Nov 14 2007 - dmueller@suse.de - added patches: * add window properties to popups so that they can be properly ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.Vi1059/_old 2007-12-06 01:07:47.000000000 +0100 +++ /var/tmp/diff_new_pack.Vi1059/_new 2007-12-06 01:07:47.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-sql-plugins (Version 4.3.2) +# spec file for package libqt4-sql-plugins (Version 4.3.3) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -25,11 +25,11 @@ Summary: Qt 4 SQL-Related Libraries # COMMON-BEGIN # COMMON-BEGIN -Version: 4.3.2 -Release: 3 +Version: 4.3.3 +Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.3.2 +%define rversion 4.3.3 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -55,10 +55,10 @@ Patch39: 0191-listview-alternate-row-colors.diff Patch40: 0188-fix-moc-parser-same-name-header.diff Patch41: 0189-fix-q3toolbar-qcombobox-signal-slot.diff -Patch42: 0193-qtreeview-division-by-zero.diff Patch43: 0195-compositing-properties.diff -Patch44: 0196-q3toolbar-clean-rebuild.diff -Patch45: 0198-fix-qstylesheetstyle2.diff +Patch46: 0172-prefer-xrandr-over-xinerama.diff +Patch47: 0200-fix-qsslsocket-waitfor.diff +Patch48: 0203-qtexthtmlparser-link-color.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -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 %_docdir/%{base_name}/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 -glib @@ -78,6 +78,7 @@ %if 0%{?opensuse_bs} %endif + %prep %define plugindir %_libdir/qt4/plugins %setup -q -n qt%x11_free%rversion @@ -99,10 +100,10 @@ %patch39 %patch40 %patch41 -%patch42 %patch43 -%patch44 -%patch45 +%patch46 +%patch47 +%patch48 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -188,6 +189,7 @@ %else OPTIONS="" %endif +export MAKEFLAGS=%{?jobs:-j %jobs} echo yes | ./configure %common_options $OPTIONS \ -plugin-sql-psql -I/usr/include -I/usr/include/pgsql/ -I/usr/include/pgsql/server \ -plugin-sql-odbc \ @@ -243,7 +245,11 @@ %defattr(-,root,root,755) %dir %plugindir/sqldrivers %plugindir/sqldrivers/libqsqlmysql*.so + %changelog +* Wed Dec 05 2007 - dmueller@suse.de +- update to 4.3.3: + * for changelog, see included changes-4.3.3 * Wed Nov 14 2007 - dmueller@suse.de - added patches: * add window properties to popups so that they can be properly ++++++ 0172-prefer-xrandr-over-xinerama.diff ++++++ qt-bugs@ issue : none Trolltech task ID : none bugs.kde.org number : applied: no author: Dirk Mueller <mueller@kde.org> only trust libxinerama if its not the emulated information coming from xrandr 1.2. xrandr 1.2 is merged fb and libxinerama presents then virtual screens in clone mode, which qt (and KDE) can't deal with. proper fix would be to detect crtcs as virtual screens, but given that qt can't deal with dynamically changing number of screens, this is for "when I have time". --- src/gui/kernel/qdesktopwidget_x11.cpp +++ src/gui/kernel/qdesktopwidget_x11.cpp @@ -142,7 +142,8 @@ void QDesktopWidgetPrivate::init() // get the geometry of each screen int i, x, y, w, h; - for (i = 0; i < screenCount; i++) { + int itScreenCount = screenCount; + for (i = 0; i < itScreenCount; i++) { #ifndef QT_NO_XINERAMA if (use_xinerama) { @@ -160,10 +161,19 @@ void QDesktopWidgetPrivate::init() } rects[i].setRect(x, y, w, h); + if (i > 0 && rects[i-1].intersects(rects[i]) && + (rects[i].width()*rects[i].height()) > + (rects[i-1].width()*rects[i-1].height())) { + rects[i-1] = rects[i]; + screenCount--; + } workareas[i] = QRect(); } #ifndef QT_NO_XINERAMA + if (use_xinerama && screenCount == 1) + use_xinerama = false; + if (xinerama_screeninfo) XFree(xinerama_screeninfo); #endif // QT_NO_XINERAMA ++++++ 0178-transparency-window-types.diff ++++++ --- /var/tmp/diff_new_pack.Vi1059/_old 2007-12-06 01:07:47.000000000 +0100 +++ /var/tmp/diff_new_pack.Vi1059/_new 2007-12-06 01:07:47.000000000 +0100 @@ -7,23 +7,31 @@ This patch adds Qt support for new window types used for compositing. ---- src/gui/kernel/qapplication_x11.cpp.sav 2007-05-29 14:07:19.000000000 +0200 -+++ src/gui/kernel/qapplication_x11.cpp 2007-05-31 16:14:54.000000000 +0200 -@@ -199,6 +199,11 @@ static const char * x11_atomnames = { - "_NET_WM_WINDOW_TYPE_SPLASH\0" - "_NET_WM_WINDOW_TYPE_TOOLBAR\0" - "_NET_WM_WINDOW_TYPE_UTILITY\0" -+ "_NET_WM_WINDOW_TYPE_DROPDOWN_MENU\0" -+ "_NET_WM_WINDOW_TYPE_POPUP_MENU\0" -+ "_NET_WM_WINDOW_TYPE_COMBO\0" -+ "_NET_WM_WINDOW_TYPE_DND\0" -+ "_NET_WM_WINDOW_TYPE_TOOLTIP\0" +--- src/gui/kernel/qwidget.h ++++ src/gui/kernel/qwidget.h +@@ -352,6 +352,19 @@ public: - "_KDE_NET_WM_FRAME_STRUT\0" + void setWindowOpacity(qreal level); + qreal windowOpacity() const; ++#if defined(Q_WS_X11) ++ enum X11WindowType { ++ X11WindowTypeSelect, ++ X11WindowTypeCombo, ++ X11WindowTypeDND, ++ X11WindowTypeTooltip, ++ X11WindowTypeMenu, // torn-off ++ X11WindowTypeDropdown, ++ X11WindowTypePopup ++ }; ++ void x11SetWindowType( X11WindowType type = X11WindowTypeSelect ); ++ void x11SetWindowTransient( QWidget* parent ); ++#endif ---- src/gui/kernel/qdnd_x11.cpp.sav 2007-05-29 14:07:19.000000000 +0200 -+++ src/gui/kernel/qdnd_x11.cpp 2007-05-31 13:32:33.000000000 +0200 -@@ -254,6 +254,7 @@ public: + bool isWindowModified() const; + #ifndef QT_NO_TOOLTIP +--- src/gui/kernel/qdnd_x11.cpp ++++ src/gui/kernel/qdnd_x11.cpp +@@ -268,6 +268,7 @@ public: QWidget(QApplication::desktop()->screen(screen), Qt::Tool | Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint) { @@ -31,7 +39,7 @@ } void setPixmap(const QPixmap &pm) -@@ -1392,6 +1393,7 @@ void QDragManager::move(const QPoint & g +@@ -1436,6 +1437,7 @@ void QDragManager::move(const QPoint & g // recreate the pixmap on the new screen... delete xdnd_data.deco; xdnd_data.deco = new QShapedPixmapWidget(screen); @@ -39,7 +47,7 @@ if (!QWidget::mouseGrabber()) { updatePixmap(); xdnd_data.deco->grabMouse(); -@@ -1852,6 +1854,7 @@ Qt::DropAction QDragManager::drag(QDrag +@@ -1897,6 +1899,7 @@ Qt::DropAction QDragManager::drag(QDrag object = o; object->d_func()->target = 0; xdnd_data.deco = new QShapedPixmapWidget(); @@ -47,31 +55,23 @@ willDrop = false; ---- src/gui/kernel/qwidget.h.sav 2007-05-29 14:07:19.000000000 +0200 -+++ src/gui/kernel/qwidget.h 2007-05-31 13:35:50.000000000 +0200 -@@ -339,6 +339,19 @@ public: +--- src/gui/kernel/qt_x11_p.h ++++ src/gui/kernel/qt_x11_p.h +@@ -528,6 +528,11 @@ struct QX11Data + _NET_WM_WINDOW_TYPE_SPLASH, + _NET_WM_WINDOW_TYPE_TOOLBAR, + _NET_WM_WINDOW_TYPE_UTILITY, ++ _NET_WM_WINDOW_TYPE_DROPDOWN_MENU, ++ _NET_WM_WINDOW_TYPE_POPUP_MENU, ++ _NET_WM_WINDOW_TYPE_COMBO, ++ _NET_WM_WINDOW_TYPE_DND, ++ _NET_WM_WINDOW_TYPE_TOOLTIP, - void setWindowOpacity(qreal level); - qreal windowOpacity() const; -+#if defined(Q_WS_X11) -+ enum X11WindowType { -+ X11WindowTypeSelect, -+ X11WindowTypeCombo, -+ X11WindowTypeDND, -+ X11WindowTypeTooltip, -+ X11WindowTypeMenu, // torn-off -+ X11WindowTypeDropdown, -+ X11WindowTypePopup -+ }; -+ void x11SetWindowType( X11WindowType type = X11WindowTypeSelect ); -+ void x11SetWindowTransient( QWidget* parent ); -+#endif + _KDE_NET_WM_FRAME_STRUT, - bool isWindowModified() const; - #ifndef QT_NO_TOOLTIP ---- src/gui/kernel/qtooltip.cpp.sav 2007-05-09 11:43:46.000000000 +0200 -+++ src/gui/kernel/qtooltip.cpp 2007-07-04 10:15:28.000000000 +0100 -@@ -134,6 +134,9 @@ QTipLabel::QTipLabel(const QPoint &pos, +--- src/gui/kernel/qtooltip.cpp ++++ src/gui/kernel/qtooltip.cpp +@@ -147,6 +147,9 @@ QTipLabel::QTipLabel(const QPoint &pos, setMouseTracking(true); fadingOut = false; reuseTip(text); @@ -81,7 +81,7 @@ } void QTipLabel::restartHideTimer() -@@ -351,6 +354,10 @@ void QToolTip::showText(const QPoint &po +@@ -367,6 +370,10 @@ void QToolTip::showText(const QPoint &po // that is showing (removes flickering) if (QTipLabel::instance->tipChanged(pos, text, w)){ QTipLabel::instance->reuseTip(text); @@ -92,7 +92,7 @@ QTipLabel::instance->setTipRect(w, rect); QTipLabel::instance->placeTip(pos, w); } -@@ -360,6 +367,10 @@ void QToolTip::showText(const QPoint &po +@@ -376,6 +383,10 @@ void QToolTip::showText(const QPoint &po if (!text.isEmpty()){ // no tip can be reused, create new tip: new QTipLabel(pos, text, w); // sets QTipLabel::instance to itself @@ -103,9 +103,23 @@ QTipLabel::instance->setTipRect(w, rect); QTipLabel::instance->placeTip(pos, w); QTipLabel::instance->setObjectName(QLatin1String("qtooltip_label")); ---- src/gui/kernel/qwidget_x11.cpp.sav 2007-05-29 14:07:19.000000000 +0200 -+++ src/gui/kernel/qwidget_x11.cpp 2007-05-31 17:05:25.000000000 +0200 -@@ -510,10 +510,6 @@ void QWidgetPrivate::create_sys(WId wind +--- src/gui/kernel/qapplication_x11.cpp ++++ src/gui/kernel/qapplication_x11.cpp +@@ -212,6 +212,11 @@ static const char * x11_atomnames = { + "_NET_WM_WINDOW_TYPE_SPLASH\0" + "_NET_WM_WINDOW_TYPE_TOOLBAR\0" + "_NET_WM_WINDOW_TYPE_UTILITY\0" ++ "_NET_WM_WINDOW_TYPE_DROPDOWN_MENU\0" ++ "_NET_WM_WINDOW_TYPE_POPUP_MENU\0" ++ "_NET_WM_WINDOW_TYPE_COMBO\0" ++ "_NET_WM_WINDOW_TYPE_DND\0" ++ "_NET_WM_WINDOW_TYPE_TOOLTIP\0" + + "_KDE_NET_WM_FRAME_STRUT\0" + +--- src/gui/kernel/qwidget_x11.cpp ++++ src/gui/kernel/qwidget_x11.cpp +@@ -560,10 +560,6 @@ void QWidgetPrivate::create_sys(WId wind } #endif // QT_NO_XRENDER @@ -116,7 +130,7 @@ QtMWMHints mwmhints; mwmhints.flags = 0L; mwmhints.functions = MWM_FUNC_ALL; -@@ -524,15 +520,11 @@ void QWidgetPrivate::create_sys(WId wind +@@ -574,15 +570,11 @@ void QWidgetPrivate::create_sys(WId wind if (topLevel) { ulong wsa_mask = 0; if (type == Qt::SplashScreen) { @@ -133,7 +147,7 @@ mwmhints.decorations |= MWM_DECOR_BORDER; mwmhints.decorations |= MWM_DECOR_RESIZEH; -@@ -554,22 +546,6 @@ void QWidgetPrivate::create_sys(WId wind +@@ -604,22 +596,6 @@ void QWidgetPrivate::create_sys(WId wind wsa.save_under = True; wsa_mask |= CWSaveUnder; } @@ -156,7 +170,7 @@ if (flags & Qt::X11BypassWindowManagerHint) { wsa.override_redirect = True; -@@ -588,6 +564,7 @@ void QWidgetPrivate::create_sys(WId wind +@@ -638,6 +614,7 @@ void QWidgetPrivate::create_sys(WId wind wsa.save_under = True; XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder, &wsa); @@ -164,7 +178,7 @@ } else if (topLevel && !desktop) { // top-level widget if (!X11->wm_client_leader) create_wm_client_leader(); -@@ -632,12 +609,7 @@ void QWidgetPrivate::create_sys(WId wind +@@ -682,12 +659,7 @@ void QWidgetPrivate::create_sys(WId wind // set mwm hints SetMWMHints(dpy, id, mwmhints); @@ -178,7 +192,7 @@ // set _NET_WM_PID long curr_pid = getpid(); -@@ -733,6 +705,63 @@ void QWidgetPrivate::create_sys(WId wind +@@ -783,6 +755,63 @@ void QWidgetPrivate::create_sys(WId wind q->setAttribute(Qt::WA_OutsideWSRange, true); } @@ -242,25 +256,11 @@ /*! Frees up window system resources. Destroys the widget window if \a destroyWindow is true. ---- src/gui/kernel/qt_x11_p.h.sav 2007-03-27 16:12:51.000000000 +0200 -+++ src/gui/kernel/qt_x11_p.h 2007-05-31 16:11:42.000000000 +0200 -@@ -514,6 +514,11 @@ struct QX11Data - _NET_WM_WINDOW_TYPE_SPLASH, - _NET_WM_WINDOW_TYPE_TOOLBAR, - _NET_WM_WINDOW_TYPE_UTILITY, -+ _NET_WM_WINDOW_TYPE_DROPDOWN_MENU, -+ _NET_WM_WINDOW_TYPE_POPUP_MENU, -+ _NET_WM_WINDOW_TYPE_COMBO, -+ _NET_WM_WINDOW_TYPE_DND, -+ _NET_WM_WINDOW_TYPE_TOOLTIP, - - _KDE_NET_WM_FRAME_STRUT, - ---- src/gui/widgets/qcombobox.cpp.sav 2007-05-09 11:43:55.000000000 +0200 -+++ src/gui/widgets/qcombobox.cpp 2007-05-31 14:15:01.000000000 +0200 -@@ -370,6 +370,10 @@ QComboBoxPrivateContainer::QComboBoxPriv - layout->insertSpacing(0, verticalMargin); - layout->addSpacing(verticalMargin); +--- src/gui/widgets/qcombobox.cpp ++++ src/gui/widgets/qcombobox.cpp +@@ -332,6 +332,10 @@ void QComboBoxPrivateContainer::timerEve + combo->update(); + } } +#ifdef Q_WS_X11 + x11SetWindowType( X11WindowTypeCombo ); @@ -268,10 +268,10 @@ +#endif } - void QComboBoxPrivateContainer::scrollItemView(int action) ---- src/gui/widgets/qmenu.cpp.sav 2007-05-29 14:07:22.000000000 +0200 -+++ src/gui/widgets/qmenu.cpp 2007-05-31 17:01:03.000000000 +0200 -@@ -84,6 +84,9 @@ public: + void QComboBoxPrivateContainer::resizeEvent(QResizeEvent *e) +--- src/gui/widgets/qmenu.cpp ++++ src/gui/widgets/qmenu.cpp +@@ -97,6 +97,9 @@ public: QTornOffMenu(QMenu *p) : QMenu(*(new QTornOffMenuPrivate(p))) { setParent(p, Qt::Window | Qt::Tool); @@ -281,7 +281,7 @@ setAttribute(Qt::WA_DeleteOnClose, true); setWindowTitle(p->windowTitle()); setEnabled(p->isEnabled()); -@@ -130,6 +133,9 @@ void QMenuPrivate::init() +@@ -143,6 +146,9 @@ void QMenuPrivate::init() } defaultMenuAction = menuAction = new QAction(q); menuAction->d_func()->menu = q; @@ -291,10 +291,11 @@ } //Windows and KDE allows menus to cover the taskbar, while GNOME and Mac don't -@@ -1611,6 +1617,32 @@ void QMenu::popup(const QPoint &p, QActi +@@ -1678,6 +1684,33 @@ void QMenu::popup(const QPoint &p, QActi + } } setGeometry(QRect(pos, size)); - ++ +#ifdef Q_WS_X11 + QWidget* top = this; + for(;;) { @@ -324,7 +325,7 @@ #ifndef QT_NO_EFFECTS int hGuess = qApp->layoutDirection() == Qt::RightToLeft ? QEffects::LeftScroll : QEffects::RightScroll; int vGuess = QEffects::DownScroll; -@@ -1807,6 +1839,9 @@ void QMenu::hideEvent(QHideEvent *) +@@ -1874,6 +1907,9 @@ void QMenu::hideEvent(QHideEvent *) if (QMenuBar *mb = qobject_cast<QMenuBar*>(d->causedPopup.widget)) mb->d_func()->setCurrentAction(0); #endif ++++++ 0200-fix-qsslsocket-waitfor.diff ++++++ qt-bugs@ issue : N188142 Trolltech task ID : 188329 (status: fixed for Qt 4.4.0) bugs.kde.org number : None applied: no author: Andreas Hartmetz <ahartmetz@gmail.com> This patch fixes that some QSslSocket::waitFor$X methods, when passed -1 as the argument, behave as if they were passed 0. -1 is supposed to mean "wait indefi- nitely" while 0 means "don't wait". Index: src/network/qsslsocket.cpp =================================================================== --- src/network/qsslsocket.cpp (Revision 738032) +++ src/network/qsslsocket.cpp (Arbeitskopie) @@ -251,6 +251,19 @@ #include <QtNetwork/qhostaddress.h> #include <QtNetwork/qhostinfo.h> +/* + Returns the difference between msecs and elapsed. If msecs is -1, + however, -1 is returned. +*/ +static int qt_timeout_value(int msecs, int elapsed) +{ + if (msecs == -1) + return -1; + + int timeout = msecs - elapsed; + return timeout < 0 ? 0 : timeout; +} + class QSslSocketGlobalData { public: @@ -1110,7 +1123,7 @@ startClientEncryption(); // Loop, waiting until the connection has been encrypted or an error // occurs. - if (!d->plainSocket->waitForReadyRead(qBound(0, msecs - stopWatch.elapsed(), msecs))) + if (!d->plainSocket->waitForReadyRead(qt_timeout_value(msecs, stopWatch.elapsed()))) return false; } return d->connectionEncrypted; @@ -1138,7 +1151,7 @@ return false; } - while (d->plainSocket->waitForReadyRead(qBound(0, msecs - stopWatch.elapsed(), msecs))) { + while (d->plainSocket->waitForReadyRead(qt_timeout_value(msecs, stopWatch.elapsed()))) { if (d->readBuffer.size() != oldReadBufferSize) { // If the read buffer has grown, readyRead() must have been emitted. return true; @@ -1167,7 +1180,7 @@ return false; } - return d->plainSocket->waitForBytesWritten(qBound(0, msecs - stopWatch.elapsed(), msecs)); + return d->plainSocket->waitForBytesWritten(qt_timeout_value(msecs, stopWatch.elapsed())); } /*! ++++++ 0203-qtexthtmlparser-link-color.diff ++++++ qt-bugs@ issue : none Trolltech task ID : none applied: yes author: Rafael Fernández López <ereslibre@kde.org> Links are assigned a foreground color according to the system current color scheme. --- src/gui/text/qtexthtmlparser.cpp (revisión: 745183) +++ src/gui/text/qtexthtmlparser.cpp (copia de trabajo) @@ -1031,7 +1031,7 @@ void QTextHtmlParserNode::initializeProp && !attributes.at(i + 1).isEmpty()) { hasHref = true; charFormat.setUnderlineStyle(QTextCharFormat::SingleUnderline); - charFormat.setForeground(Qt::blue); + charFormat.setForeground(QApplication::palette().link()); } } ++++++ libqt4-devel-doc-data.spec.in ++++++ --- libqt4/libqt4-devel-doc-data.spec.in 2007-04-16 18:36:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc-data.spec.in 2007-12-05 20:10:26.000000000 +0100 @@ -35,6 +35,7 @@ sed -i -e "/QMAKE_CFLAGS_RELEASE[ \t]*=/s,$, $RPM_OPT_FLAGS," $f done sed -i -e "s,^CXXFLAGS[ \t]*=,& $RPM_OPT_FLAGS," qmake/Makefile.unix +export MAKEFLAGS=%{?jobs:-j %jobs} echo yes | ./configure %common_options pushd src make %{?jobs:-j%jobs} sub-moc sub-rcc sub-uic ++++++ libqt4-sql-plugins.spec.in ++++++ --- libqt4/libqt4-sql-plugins.spec.in 2007-11-15 16:23:40.000000000 +0100 +++ /mounts/work_src_done/STABLE/libqt4/libqt4-sql-plugins.spec.in 2007-12-05 20:10:16.000000000 +0100 @@ -106,6 +106,7 @@ %else OPTIONS="" %endif +export MAKEFLAGS=%{?jobs:-j %jobs} echo yes | ./configure %common_options $OPTIONS \ -plugin-sql-psql -I/usr/include -I/usr/include/pgsql/ -I/usr/include/pgsql/server \ -plugin-sql-odbc \ ++++++ qt-x11-opensource-src-4.3.2.tar.bz2 -> qt-x11-opensource-src-4.3.3.tar.bz2 ++++++ libqt4/qt-x11-opensource-src-4.3.2.tar.bz2 /mounts/work_src_done/STABLE/libqt4/qt-x11-opensource-src-4.3.3.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org