Hello community, here is the log from the commit of package qtcurve-kde4 for openSUSE:Factory checked in at Thu Apr 7 10:38:07 CEST 2011.
-------- --- KDE/qtcurve-kde4/qtcurve-kde4.changes 2011-02-19 23:11:04.000000000 +0100 +++ /mounts/work_src_done/STABLE/qtcurve-kde4/qtcurve-kde4.changes 2011-03-15 23:32:39.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Mar 15 22:31:46 UTC 2011 - [email protected] + +- Update to 1.8.6 + 1. Fix potential crash when using translucency and the raster + engine. (Fix taken from oxygen-transparent) + 2. Fix crash when changing QtCurve settings - handle free'ing + of colours better. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- QtCurve-KDE4-1.8.5.tar.bz2 New: ---- QtCurve-KDE4-1.8.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-kde4.spec ++++++ --- /var/tmp/diff_new_pack.hSngmM/_old 2011-04-07 10:37:31.000000000 +0200 +++ /var/tmp/diff_new_pack.hSngmM/_new 2011-04-07 10:37:31.000000000 +0200 @@ -24,7 +24,7 @@ License: GPLv2+ Group: System/GUI/KDE Summary: QtCurve style for KDE 4 -Version: 1.8.5 +Version: 1.8.6 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: QtCurve-KDE4-%{version}.tar.bz2 ++++++ QtCurve-KDE4-1.8.5.tar.bz2 -> QtCurve-KDE4-1.8.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-1.8.5/CMakeLists.txt new/QtCurve-KDE4-1.8.6/CMakeLists.txt --- old/QtCurve-KDE4-1.8.5/CMakeLists.txt 2011-02-15 20:39:31.000000000 +0100 +++ new/QtCurve-KDE4-1.8.6/CMakeLists.txt 2011-03-15 22:47:04.000000000 +0100 @@ -8,7 +8,7 @@ set(CPACK_SOURCE_GENERATOR "TBZ2") set(CPACK_PACKAGE_VERSION_MAJOR "1") set(CPACK_PACKAGE_VERSION_MINOR "8") -set(CPACK_PACKAGE_VERSION_PATCH "5") +set(CPACK_PACKAGE_VERSION_PATCH "6") set(CPACK_PACKAGE_CONTACT "Craig Drummond <[email protected]>") set(QTCURVE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}") set(QTCURVE_VERSION_FULL "${QTCURVE_VERSION}.${CPACK_PACKAGE_VERSION_PATCH}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-1.8.5/ChangeLog new/QtCurve-KDE4-1.8.6/ChangeLog --- old/QtCurve-KDE4-1.8.5/ChangeLog 2011-02-15 20:39:31.000000000 +0100 +++ new/QtCurve-KDE4-1.8.6/ChangeLog 2011-03-15 22:47:04.000000000 +0100 @@ -1,3 +1,10 @@ +1.8.6 +----- +1. Fix potential crash when using translucency and the raster engine. + (Fix taken from oxygen-transparent) +2. Fix crash when changing QtCurve settings - handle free'ing of colours + better. + 1.8.5 ----- 1. Fix fill of bottom corners of kwin decoration when not compositing. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-1.8.5/style/qtcurve.cpp new/QtCurve-KDE4-1.8.6/style/qtcurve.cpp --- old/QtCurve-KDE4-1.8.5/style/qtcurve.cpp 2011-02-15 20:39:31.000000000 +0100 +++ new/QtCurve-KDE4-1.8.6/style/qtcurve.cpp 2011-03-15 22:47:04.000000000 +0100 @@ -1359,65 +1359,43 @@ #endif } +void Style::freeColor(QSet<QColor *> &freedColors, QColor **cols) +{ + if(!freedColors.contains(*cols) && + *cols!=itsHighlightCols && + *cols!=itsBackgroundCols && + *cols!=itsMenubarCols && + *cols!=itsFocusCols && + *cols!=itsMouseOverCols && + *cols!=itsButtonCols && + *cols!=itsColoredButtonCols && + *cols!=itsColoredBackgroundCols && + *cols!=itsColoredHighlightCols) + { + freedColors.insert(*cols); + delete [] *cols; + } + *cols=0L; +} + void Style::freeColors() { if(0!=itsProgressBarAnimateTimer) killTimer(itsProgressBarAnimateTimer); - if(itsSidebarButtonsCols && itsSidebarButtonsCols!=itsSliderCols && itsSidebarButtonsCols!=itsDefBtnCols) - { - delete [] itsSidebarButtonsCols; - itsSidebarButtonsCols=0L; - } - if(itsPopupMenuCols && itsPopupMenuCols!=itsMenubarCols && itsPopupMenuCols!=itsBackgroundCols && itsPopupMenuCols!=itsActiveMdiColors) - { - delete [] itsPopupMenuCols; - itsPopupMenuCols=0L; - } - if(itsActiveMdiColors && itsActiveMdiColors!=itsHighlightCols && itsActiveMdiColors!=itsBackgroundCols) - { - delete [] itsActiveMdiColors; - itsActiveMdiColors=0L; - } - if(itsMdiColors && itsMdiColors!=itsBackgroundCols) - { - delete [] itsMdiColors; - itsMdiColors=0L; - } - if(itsProgressCols && itsProgressCols!=itsHighlightCols && itsProgressCols!=itsBackgroundCols && - itsProgressCols!=itsSliderCols && itsProgressCols!=itsComboBtnCols && itsProgressCols!=itsCheckRadioSelCols && itsProgressCols!=itsSortedLvColors) - { - delete [] itsProgressCols; - itsProgressCols=0L; - } - if(itsCheckRadioSelCols && itsCheckRadioSelCols!=itsDefBtnCols && itsCheckRadioSelCols!=itsSliderCols && - itsCheckRadioSelCols!=itsComboBtnCols && itsCheckRadioSelCols!=itsSortedLvColors && - itsCheckRadioSelCols!=itsButtonCols && itsCheckRadioSelCols!=itsHighlightCols) - { - delete [] itsCheckRadioSelCols; - itsCheckRadioSelCols=0L; - } - if(itsSortedLvColors && itsSortedLvColors!=itsHighlightCols && itsSortedLvColors!=itsSliderCols && - itsSortedLvColors!=itsComboBtnCols) - { - delete [] itsSortedLvColors; - itsSortedLvColors=0L; - } - if(itsComboBtnCols && itsComboBtnCols!=itsHighlightCols && itsComboBtnCols!=itsSliderCols) - { - delete [] itsComboBtnCols; - itsComboBtnCols=0L; - } - if(itsDefBtnCols && itsDefBtnCols!=itsSliderCols && itsDefBtnCols!=itsFocusCols && itsDefBtnCols!=itsHighlightCols) - { - delete [] itsDefBtnCols; - itsDefBtnCols=0L; - } - if(itsSliderCols && itsSliderCols!=itsHighlightCols) - { - delete [] itsSliderCols; - itsSliderCols=0L; - } + QSet<QColor *> freedColors; + + freeColor(freedColors, &itsSidebarButtonsCols); + freeColor(freedColors, &itsPopupMenuCols); + freeColor(freedColors, &itsActiveMdiColors); + freeColor(freedColors, &itsMdiColors); + freeColor(freedColors, &itsProgressCols); + freeColor(freedColors, &itsCheckRadioSelCols); + freeColor(freedColors, &itsSortedLvColors); + freeColor(freedColors, &itsComboBtnCols); + freeColor(freedColors, &itsDefBtnCols); + freeColor(freedColors, &itsSliderCols); + if(opts.titlebarButtons&TITLEBAR_BUTTON_COLOR) for(int i=0; i<NUM_TITLEBAR_BUTTONS; ++i) { @@ -1803,7 +1781,8 @@ if(100==opacity || !widget->isWindow() || Qt::Desktop==widget->windowType() || widget->testAttribute(Qt::WA_X11NetWmWindowTypeDesktop) || widget->testAttribute(Qt::WA_TranslucentBackground) || widget->testAttribute(Qt::WA_NoSystemBackground) || widget->testAttribute(Qt::WA_PaintOnScreen) || widget->inherits("KScreenSaver") || widget->inherits( "QTipLabel") || - widget->inherits( "QSplashScreen") || widget->windowFlags().testFlag(Qt::FramelessWindowHint)) + widget->inherits( "QSplashScreen") || widget->windowFlags().testFlag(Qt::FramelessWindowHint) || + !(widget->testAttribute(Qt::WA_WState_Created) || widget->internalWinId())) break; // whenever you set the translucency flag, Qt will create a new widget under the hood, replacing the old diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-1.8.5/style/qtcurve.h new/QtCurve-KDE4-1.8.6/style/qtcurve.h --- old/QtCurve-KDE4-1.8.5/style/qtcurve.h 2011-02-15 20:39:31.000000000 +0100 +++ new/QtCurve-KDE4-1.8.6/style/qtcurve.h 2011-03-15 22:47:04.000000000 +0100 @@ -139,6 +139,7 @@ ~Style(); void init(bool initial); + void freeColor(QSet<QColor *> &freedColors, QColor **cols); void freeColors(); Options & options() { return opts; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
