Hello community, here is the log from the commit of package kdebase4-workspace checked in at Wed Oct 8 11:51:43 CEST 2008. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-10-07 16:00:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-10-08 11:50:32.568511000 +0200 @@ -6,0 +7,5 @@ +Thu Oct 2 17:19:13 CEST 2008 - llunak@suse.cz + +- update from kwin branch (bnc#430472,bnc#426171,bnc#431386,etc.) + +------------------------------------------------------------------- @@ -11,0 +17,10 @@ +Tue Sep 30 15:50:47 CEST 2008 - llunak@suse.cz + +- shorten decoration stripes to not mix with logo (bnc#410698) + +------------------------------------------------------------------- +Mon Sep 29 12:40:48 CEST 2008 - wstephenson@suse.de + +- Adapt Solid::Control and backend for NetworkManager 0.7-r4060 + +------------------------------------------------------------------- kdebase4-workspace.changes: same change calling whatdependson for head-i586 New: ---- solid_nm07-r4060.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.W32225/_old 2008-10-08 11:50:47.000000000 +0200 +++ /var/tmp/diff_new_pack.W32225/_new 2008-10-08 11:50:47.000000000 +0200 @@ -29,7 +29,7 @@ Summary: KDE 4 Wallpapers Url: http://www.kde.org/ Version: 4.1.2 -Release: 3 +Release: 4 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -68,8 +68,14 @@ %changelog * Tue Oct 07 2008 sbrabec@suse.cz - Conflict with other branding providers (FATE#304881). +* Thu Oct 02 2008 llunak@suse.cz +- update from kwin branch (bnc#430472,bnc#426171,bnc#431386,etc.) * Wed Oct 01 2008 lrupp@suse.de - remove conflict with NLD theme +* Tue Sep 30 2008 llunak@suse.cz +- shorten decoration stripes to not mix with logo (bnc#410698) +* Mon Sep 29 2008 wstephenson@suse.de +- Adapt Solid::Control and backend for NetworkManager 0.7-r4060 * Sun Sep 28 2008 stbinner@suse.de - fix wallpaper configuration (bnc#429971) * Thu Sep 25 2008 dmueller@suse.de ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.W32225/_old 2008-10-08 11:50:48.000000000 +0200 +++ /var/tmp/diff_new_pack.W32225/_new 2008-10-08 11:50:48.000000000 +0200 @@ -34,7 +34,7 @@ Summary: The KDE Workspace Components Url: http://www.kde.org/ Version: 4.1.2 -Release: 3 +Release: 4 Source0: kdebase-workspace-%version.tar.bz2 Source1: rediff-plasma.sh Source2: titlebar_decor.png @@ -76,20 +76,18 @@ # https://svn.kde.org/home/kde/branches/work/~seli/randr # | sed 's#^--- #--- kcontrol/randr/#' | sed 's#^+++ #+++ kcontrol/randr/#' Patch92: randr12.diff +Patch93: solid_nm07-r4060.diff %kde4_runtime_requires %if %suse_version > 1030 Requires: %name-branding = 11.1 %endif -Recommends: kdebase4-SuSE -Recommends: kde4-kwin -Recommends: extragear-plasma +Recommends: kdebase4-SuSE kde4-kwin kdebase4-session kde4-plasma-addons %if %suse_version < 1100 Recommends: kdebase4-workspace-ksysguardd %else Requires: kdebase4-workspace-ksysguardd %endif -Suggests: kde4-kdm -Suggests: kdebase4-wallpapers +Suggests: kde4-kdm kdebase4-wallpapers %define debug_package_requires %name = %version kdelibs4-debuginfo %description @@ -138,6 +136,9 @@ %patch90 %patch91 %patch92 +%if %suse_version > 1030 +%patch93 -p1 +%endif cp %{SOURCE3} kwin/effects/data/cubecap.png %build @@ -755,8 +756,14 @@ %changelog * Tue Oct 07 2008 sbrabec@suse.cz - Conflict with other branding providers (FATE#304881). +* Thu Oct 02 2008 llunak@suse.cz +- update from kwin branch (bnc#430472,bnc#426171,bnc#431386,etc.) * Wed Oct 01 2008 lrupp@suse.de - remove conflict with NLD theme +* Tue Sep 30 2008 llunak@suse.cz +- shorten decoration stripes to not mix with logo (bnc#410698) +* Mon Sep 29 2008 wstephenson@suse.de +- Adapt Solid::Control and backend for NetworkManager 0.7-r4060 * Sun Sep 28 2008 stbinner@suse.de - fix wallpaper configuration (bnc#429971) * Thu Sep 25 2008 dmueller@suse.de ++++++ 4_1_BRANCH.diff ++++++ ++++ 2551 lines (skipped) ++++ between KDE/kdebase4-workspace/4_1_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdebase4-workspace/4_1_BRANCH.diff ++++++ kwin.diff ++++++ ++++ 3930 lines (skipped) ++++ between KDE/kdebase4-workspace/kwin.diff ++++ and /mounts/work_src_done/STABLE/kdebase4-workspace/kwin.diff ++++++ kwin-suse.diff ++++++ --- /var/tmp/diff_new_pack.W32225/_old 2008-10-08 11:50:48.000000000 +0200 +++ /var/tmp/diff_new_pack.W32225/_new 2008-10-08 11:50:48.000000000 +0200 @@ -1,8 +1,8 @@ Index: kwin/clients/ozone/oxygenclient.cpp =================================================================== ---- kwin/clients/ozone/oxygenclient.cpp (revision 832330) +--- kwin/clients/ozone/oxygenclient.cpp (revision 866283) +++ kwin/clients/ozone/oxygenclient.cpp (working copy) -@@ -57,6 +57,9 @@ +@@ -58,6 +58,9 @@ #include "oxygenbutton.h" #include "oxygen.h" @@ -12,7 +12,7 @@ namespace Ozone { namespace Oxygen -@@ -75,6 +78,7 @@ +@@ -76,6 +79,7 @@ , colorCacheInvalid_(true) , helper_(*globalHelper) { @@ -20,16 +20,16 @@ } OxygenClient::~OxygenClient() -@@ -287,7 +291,7 @@ +@@ -289,7 +293,7 @@ const int titleWidth = frame.width() - titleEdgeLeft - layoutMetric(LM_TitleEdgeRight) - buttonsLeftWidth() - buttonsRightWidth() - - marginLeft - marginRight; + marginLeft - marginRight - logo.width() - logooffset; - - int splitY = qMin(300, 3*frame.height()/4); -@@ -319,6 +323,12 @@ + QPalette pal2( palette ); + if( !OxygenFactory::blendTitlebarColors()) { +@@ -305,6 +309,12 @@ painter.drawText(titleLeft, titleTop-1, titleWidth, titleHeight, // -1 is to go into top resizearea OxygenFactory::titleAlign() | Qt::AlignVCenter, caption()); @@ -42,9 +42,18 @@ painter.setRenderHint(QPainter::Antialiasing); // Draw dividing line +@@ -348,7 +358,7 @@ + } + + if (align & Qt::AlignLeft) { +- int left = titleLeft + QFontMetrics(options()->font(isActive(), false)).width(caption()); ++ int left = titleLeft + QFontMetrics(options()->font(isActive(), false)).width(caption()) + logo.width() + logooffset; + int right = titleLeft + titleWidth; + drawScratch(&painter, palette, left, right, titleTop+6); + } Index: kwin/clients/ozone/oxygenclient.h =================================================================== ---- kwin/clients/ozone/oxygenclient.h (revision 832330) +--- kwin/clients/ozone/oxygenclient.h (revision 866283) +++ kwin/clients/ozone/oxygenclient.h (working copy) @@ -59,6 +59,7 @@ QColor titlebarTextColor(const QPalette &palette); ++++++ solid_nm07-r4060.diff ++++++ ++++ 2045 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org