Hello community, here is the log from the commit of package breeze for openSUSE:Factory checked in at 2016-10-04 15:57:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/breeze (Old) and /work/SRC/openSUSE:Factory/.breeze.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "breeze" Changes: -------- --- /work/SRC/openSUSE:Factory/breeze/breeze.changes 2016-08-29 15:24:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.breeze.new/breeze.changes 2016-10-04 15:57:11.000000000 +0200 @@ -1,0 +2,29 @@ +Thu Sep 29 16:36:28 UTC 2016 - fab...@ritter-vogt.de + +- Update to 5.8.0 + * New LTS feature release + * For more details please see: + https://www.kde.org/announcements/plasma-5.8.0.php + +------------------------------------------------------------------- +Wed Sep 21 09:15:37 UTC 2016 - fab...@ritter-vogt.de + +- Use %{_plasma5_version} again, define it if needed + +------------------------------------------------------------------- +Thu Sep 15 15:53:55 UTC 2016 - fab...@ritter-vogt.de + +- Update to 5.7.95 (Plasma 5.8 Beta) + * New LTS feature release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.95.php + +------------------------------------------------------------------- +Tue Sep 13 17:42:09 UTC 2016 - fab...@ritter-vogt.de + +- Update to 5.7.5 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.5.php + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/breeze/breeze4-style.changes 2016-08-12 15:38:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.breeze.new/breeze4-style.changes 2016-10-04 15:57:11.000000000 +0200 @@ -1,0 +2,39 @@ +Sun Oct 2 11:17:40 UTC 2016 - wba...@tmo.at + +- Add add-support-for-Q3ListView-to-the-KDE4-style.patch to fix + the display of the collapse/expand icon in Q3ListView that still + may be used by some KDE4 applications, knode e.g. (boo#973728) + +------------------------------------------------------------------- +Thu Sep 29 16:36:28 UTC 2016 - fab...@ritter-vogt.de + +- Update to 5.8.0 + * New LTS feature release + * For more details please see: + https://www.kde.org/announcements/plasma-5.8.0.php + +------------------------------------------------------------------- +Thu Sep 15 15:53:55 UTC 2016 - fab...@ritter-vogt.de + +- Update to 5.7.95 (Plasma 5.8 Beta) + * New LTS feature release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.95.php + +------------------------------------------------------------------- +Tue Sep 13 17:42:09 UTC 2016 - fab...@ritter-vogt.de + +- Update to 5.7.5 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.5.php + +------------------------------------------------------------------- +Fri Aug 26 20:36:41 UTC 2016 - fab...@ritter-vogt.de + +- Update to 5.7.4 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.4.php + +------------------------------------------------------------------- Old: ---- breeze-5.7.4.tar.xz New: ---- add-support-for-Q3ListView-to-the-KDE4-style.patch breeze-5.8.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ breeze.spec ++++++ --- /var/tmp/diff_new_pack.bz3T2B/_old 2016-10-04 15:57:13.000000000 +0200 +++ /var/tmp/diff_new_pack.bz3T2B/_new 2016-10-04 15:57:13.000000000 +0200 @@ -18,14 +18,15 @@ %bcond_without lang Name: breeze -Version: 5.7.4 +Version: 5.8.0 Release: 0 +%{!?_plasma5_version: %global _plasma5_version %{version}} BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= 0.0.13 BuildRequires: fdupes BuildRequires: hicolor-icon-theme BuildRequires: kf5-filesystem -BuildRequires: cmake(KDecoration2) >= %{version} +BuildRequires: cmake(KDecoration2) >= %{_plasma5_version} BuildRequires: cmake(KF5ConfigWidgets) BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF5FrameworkIntegration) @@ -33,7 +34,7 @@ BuildRequires: cmake(KF5I18n) BuildRequires: cmake(KF5KCMUtils) BuildRequires: cmake(KF5Package) -BuildRequires: cmake(KF5Wayland) >= %{version} +BuildRequires: cmake(KF5Wayland) >= %{_plasma5_version} BuildRequires: cmake(KF5WindowSystem) BuildRequires: cmake(Qt5DBus) >= 5.4.0 BuildRequires: cmake(Qt5Widgets) >= 5.4.0 @@ -49,7 +50,6 @@ License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -#Source: http://download.kde.org/stable/plasma/%{version}/%{name}-%{version}.tar.xz Source: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ breeze4-style.spec ++++++ --- /var/tmp/diff_new_pack.bz3T2B/_old 2016-10-04 15:57:14.000000000 +0200 +++ /var/tmp/diff_new_pack.bz3T2B/_new 2016-10-04 15:57:14.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package breeze4-style # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: breeze4-style -Version: 5.7.4 +Version: 5.8.0 Release: 0 BuildRequires: automoc4 BuildRequires: cmake >= 2.8.12 @@ -29,7 +29,10 @@ License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -Source: http://download.kde.org/stable/plasma/%{version}/breeze-%{version}.tar.xz +#Source: http://download.kde.org/stable/plasma/%{version}/breeze-%{version}.tar.xz +Source: breeze-%{version}.tar.xz +# PATCH-FIX-OPENSUSE add-support-for-Q3ListView-to-the-KDE4-style.patch boo#973728 wba...@tmo.at -- fixes collapse/expand icon in Q3ListView that still may be used by some KDE4 applications (knode e.g.) +Patch: add-support-for-Q3ListView-to-the-KDE4-style.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -38,6 +41,7 @@ %prep %setup -q -n breeze-%{version} +%patch -p1 %build %cmake_kde4 -d build -- -DBUILD_po=OFF -DUSE_KDE4=ON ++++++ add-support-for-Q3ListView-to-the-KDE4-style.patch ++++++ diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp index 8a02d75..359d1ab 100644 --- a/kstyle/breezestyle.cpp +++ b/kstyle/breezestyle.cpp @@ -929,6 +929,7 @@ namespace Breeze case CC_ToolButton: fcn = &Style::drawToolButtonComplexControl; break; case CC_ComboBox: fcn = &Style::drawComboBoxComplexControl; break; case CC_SpinBox: fcn = &Style::drawSpinBoxComplexControl; break; + case CC_Q3ListView: fcn = &Style::drawQ3ListViewComplexControl; break; case CC_Slider: fcn = &Style::drawSliderComplexControl; break; case CC_Dial: fcn = &Style::drawDialComplexControl; break; case CC_ScrollBar: fcn = &Style::drawScrollBarComplexControl; break; @@ -6122,6 +6123,63 @@ namespace Breeze } //______________________________________________________________ + bool Style::drawQ3ListViewComplexControl( const QStyleOptionComplex* option, QPainter* painter, const QWidget* widget ) const + { + + const QStyleOptionQ3ListView* optListView( qstyleoption_cast<const QStyleOptionQ3ListView*>( option ) ); + if( !optListView ) return true; + + // this is copied from skulpture code + // Copyright ( c ) 2007-2010 Christoph Feck <christ...@maxiom.de> + if( optListView->subControls & QStyle::SC_Q3ListView ) + { + painter->fillRect( + optListView->rect, + optListView->viewportPalette.brush( optListView->viewportBGRole ) ); + } + + if( optListView->subControls & QStyle::SC_Q3ListViewBranch ) + { + + QStyleOption opt = *static_cast<const QStyleOption*>( option ); + int y = optListView->rect.y(); + + for ( int i = 1; i < optListView->items.size(); ++i ) + { + QStyleOptionQ3ListViewItem item = optListView->items.at( i ); + if( y + item.totalHeight > 0 && y < optListView->rect.height() ) + { + opt.state = QStyle::State_Item; + if ( i + 1 < optListView->items.size() ) + { opt.state |= QStyle::State_Sibling; } + + if( + item.features & QStyleOptionQ3ListViewItem::Expandable + || ( item.childCount > 0 && item.height > 0 ) ) + { opt.state |= QStyle::State_Children | ( item.state & QStyle::State_Open ); } + + opt.rect = QRect( optListView->rect.left(), y, optListView->rect.width(), item.height ); + drawIndicatorBranchPrimitive( &opt, painter, widget ); + + if( ( opt.state & QStyle::State_Sibling ) && item.height < item.totalHeight ) + { + opt.state = QStyle::State_Sibling; + opt.rect = QRect( + optListView->rect.left(), y + item.height, + optListView->rect.width(), item.totalHeight - item.height ); + drawIndicatorBranchPrimitive( &opt, painter, widget ); + } + } + + y += item.totalHeight; + } + } + + return true; + + } + + //______________________________________________________________ bool Style::drawSliderComplexControl( const QStyleOptionComplex* option, QPainter* painter, const QWidget* widget ) const { diff --git a/kstyle/breezestyle.h b/kstyle/breezestyle.h index a627252..dcbfe4a 100644 --- a/kstyle/breezestyle.h +++ b/kstyle/breezestyle.h @@ -320,6 +320,7 @@ namespace Breeze bool drawToolButtonComplexControl( const QStyleOptionComplex*, QPainter*, const QWidget* ) const; bool drawComboBoxComplexControl( const QStyleOptionComplex*, QPainter*, const QWidget* ) const; bool drawSpinBoxComplexControl( const QStyleOptionComplex*, QPainter*, const QWidget* ) const; + bool drawQ3ListViewComplexControl( const QStyleOptionComplex*, QPainter*, const QWidget* ) const; bool drawSliderComplexControl( const QStyleOptionComplex*, QPainter*, const QWidget* ) const; bool drawDialComplexControl( const QStyleOptionComplex*, QPainter*, const QWidget* ) const; bool drawScrollBarComplexControl( const QStyleOptionComplex*, QPainter*, const QWidget* ) const; ++++++ breeze-5.7.4.tar.xz -> breeze-5.8.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/breeze/breeze-5.7.4.tar.xz /work/SRC/openSUSE:Factory/.breeze.new/breeze-5.8.0.tar.xz differ: char 25, line 1
