Hello community, here is the log from the commit of package frameworkintegration for openSUSE:Factory checked in at 2014-10-01 11:22:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/frameworkintegration (Old) and /work/SRC/openSUSE:Factory/.frameworkintegration.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "frameworkintegration" Changes: -------- --- /work/SRC/openSUSE:Factory/frameworkintegration/frameworkintegration.changes 2014-09-12 17:03:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.frameworkintegration.new/frameworkintegration.changes 2014-10-01 11:22:18.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Sep 24 19:02:12 UTC 2014 - hrvoje.senjan@gmail.com + +- Added 0001-default-to-breeze.patch and 0002-colorscheme-in-General.patch + from upstream: adjust correct default widget theme, and makes + colorscheme be read from correct kconfig section + +------------------------------------------------------------------- New: ---- 0001-default-to-breeze.patch 0002-colorscheme-in-General.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ frameworkintegration.spec ++++++ --- /var/tmp/diff_new_pack.aLrK16/_old 2014-10-01 11:22:19.000000000 +0200 +++ /var/tmp/diff_new_pack.aLrK16/_new 2014-10-01 11:22:19.000000000 +0200 @@ -44,6 +44,10 @@ Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{version}/%{name}-%{version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-UPSTREAM 0001-default-to-breeze.patch +Patch0: 0001-default-to-breeze.patch +# PATCH-FIX-UPSTREAM 0002-colorscheme-in-General.patch +Patch1: 0002-colorscheme-in-General.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -85,6 +89,8 @@ %lang_package -n %lname %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build %cmake_kf5 -d build ++++++ 0001-default-to-breeze.patch ++++++
From 0c42e21578386a37453ee1dd8f88767fd033c899 Mon Sep 17 00:00:00 2001 From: Marco Martin
Date: Wed, 24 Sep 2014 17:38:53 +0200 Subject: [PATCH 1/2] default to breeze
--- src/platformtheme/khintssettings.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/platformtheme/khintssettings.cpp b/src/platformtheme/khintssettings.cpp index 84b8452..c7b2967 100644 --- a/src/platformtheme/khintssettings.cpp +++ b/src/platformtheme/khintssettings.cpp @@ -77,6 +77,7 @@ KHintsSettings::KHintsSettings() : QObject(0) QStringList styleNames; styleNames << cg.readEntry("widgetStyle", QString()) + << "breeze" << "oxygen" << "fusion" << "windows"; @@ -239,6 +240,7 @@ void KHintsSettings::slotNotifyChange(int type, int arg) QStringList styleNames; styleNames << cg.readEntry("widgetStyle", QString()) + << "breeze" << "oxygen" << "fusion" << "windows"; -- 2.1.0 ++++++ 0002-colorscheme-in-General.patch ++++++
From d162a0726f8320018b8ec6b4b54f694e69a7767c Mon Sep 17 00:00:00 2001 From: Marco Martin
Date: Wed, 24 Sep 2014 20:00:46 +0200 Subject: [PATCH 2/2] colorscheme in General
--- src/platformtheme/khintssettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platformtheme/khintssettings.cpp b/src/platformtheme/khintssettings.cpp index c7b2967..8799216 100644 --- a/src/platformtheme/khintssettings.cpp +++ b/src/platformtheme/khintssettings.cpp @@ -348,7 +348,7 @@ void KHintsSettings::loadPalettes() return; } - const QString scheme = readConfigValue("KDE", "ColorScheme", "Breeze").toString(); + const QString scheme = readConfigValue("General", "ColorScheme", "Breeze").toString(); path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "color-schemes/" + scheme + ".colors"); if (!path.isEmpty()) { -- 2.1.0 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org