Hello community, here is the log from the commit of package plasma5-desktop for openSUSE:Factory checked in at 2014-08-16 15:42:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-desktop (Old) and /work/SRC/openSUSE:Factory/.plasma5-desktop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-desktop" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-desktop/plasma5-desktop.changes 2014-07-28 16:11:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plasma5-desktop.new/plasma5-desktop.changes 2014-08-16 15:43:52.000000000 +0200 @@ -1,0 +2,13 @@ +Sun Aug 10 21:32:49 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 5.0.1 + * Bugfix release +- Rebase sync_settings.diff + +------------------------------------------------------------------- +Mon Jul 28 18:50:31 UTC 2014 - hrvoje.sen...@gmail.com + +- Adjust BuildRequires depending whether Qt is built with openGL + or open GL ES2 + +------------------------------------------------------------------- Old: ---- plasma-desktop-5.0.1~20140724~85baf47.tar.xz New: ---- plasma-desktop-5.0.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-desktop.spec ++++++ --- /var/tmp/diff_new_pack.rt5hWk/_old 2014-08-16 15:43:53.000000000 +0200 +++ /var/tmp/diff_new_pack.rt5hWk/_new 2014-08-16 15:43:53.000000000 +0200 @@ -17,7 +17,7 @@ Name: plasma5-desktop -Version: 5.0.1~20140724~85baf47 +Version: 5.0.1 Release: 0 Summary: The KDE Plasma Workspace Components License: GPL-2.0 @@ -62,6 +62,11 @@ BuildRequires: pkgconfig(Qt5Widgets) >= 5.3.0 BuildRequires: pkgconfig(Qt5X11Extras) >= 5.3.0 BuildRequires: pkgconfig(x11) +%ifarch %arm aarch64 +BuildRequires: pkgconfig(glesv2) +%else +BuildRequires: pkgconfig(gl) +%endif #BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xcb-icccm) BuildRequires: pkgconfig(xcb-image) ++++++ plasma-desktop-5.0.1~20140724~85baf47.tar.xz -> plasma-desktop-5.0.1.tar.xz ++++++ ++++ 1026013 lines of diff (skipped) ++++++ sync_settings.diff ++++++ --- /var/tmp/diff_new_pack.rt5hWk/_old 2014-08-16 15:43:56.000000000 +0200 +++ /var/tmp/diff_new_pack.rt5hWk/_new 2014-08-16 15:43:56.000000000 +0200 @@ -91,34 +91,3 @@ bool mbChanged[6], mbAnimated[6]; int mSizes[6]; -diff --git a/kcms/krdb/krdb.cpp b/kcms/krdb/krdb.cpp -index 76aaa56..9976bc6 100644 ---- a/kcms/krdb/krdb.cpp -+++ b/kcms/krdb/krdb.cpp -@@ -621,6 +621,7 @@ void runRdb( uint flags ) - - //Apply the color scheme - QString configFilePath = migration.saveLocation("config") + "kdeglobals"; -+ - if (configFilePath.isEmpty()) { - return; - } -@@ -676,5 +677,18 @@ void runRdb( uint flags ) - cg.copyTo(&cg2); - } - -+ //widgets settings -+ KConfigGroup kglobals4(&kde4config, "KDE"); -+ kglobals4.writeEntry("ShowIconsInMenuItems", kglobals.readEntry("ShowIconsInMenuItems", true)); -+ kglobals4.writeEntry("ShowIconsOnPushButtons", kglobals.readEntry("ShowIconsOnPushButtons", true)); -+ kglobals4.writeEntry("contrast", kglobals.readEntry("contrast", 4)); -+ //FIXME: this should somehow check if the kde4 version of the style is installed -+ kde4generalGroup.writeEntry("widgetStyle", kglobals.readEntry("widgetStyle", "oxygen")); -+ -+ //toolbar style -+ KConfigGroup toolbars4(&kde4config, "Toolbar style"); -+ KConfigGroup toolbars5(kglobalcfg, "Toolbar style"); -+ toolbars4.writeEntry("ToolButtonStyle", toolbars5.readEntry("ToolButtonStyle", "TextBesideIcon")); -+ toolbars4.writeEntry("ToolButtonStyleOtherToolbars", toolbars5.readEntry("ToolButtonStyleOtherToolbars", "TextBesideIcon")); - } - -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org