From 30343ee2d23f7353713e67cf23765e6f91cbeac7cf511a84f8ec5469b9eb6b2b Mon Sep 17 00:00:00 2001
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
Date: Wed, 24 Sep 2014 20:04:13 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/KDE:Frameworks5/frameworkintegration?expand=0&rev=42

---
 0001-default-to-breeze.patch      | 32 +++++++++++++++++++++++++++++++
 0002-colorscheme-in-General.patch | 25 ++++++++++++++++++++++++
 frameworkintegration.changes      |  7 +++++++
 frameworkintegration.spec         |  6 ++++++
 4 files changed, 70 insertions(+)
 create mode 100644 0001-default-to-breeze.patch
 create mode 100644 0002-colorscheme-in-General.patch

diff --git a/0001-default-to-breeze.patch b/0001-default-to-breeze.patch
new file mode 100644
index 0000000..c20506e
--- /dev/null
+++ b/0001-default-to-breeze.patch
@@ -0,0 +1,32 @@
+From 0c42e21578386a37453ee1dd8f88767fd033c899 Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+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
+
diff --git a/0002-colorscheme-in-General.patch b/0002-colorscheme-in-General.patch
new file mode 100644
index 0000000..9747624
--- /dev/null
+++ b/0002-colorscheme-in-General.patch
@@ -0,0 +1,25 @@
+From d162a0726f8320018b8ec6b4b54f694e69a7767c Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+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
+
diff --git a/frameworkintegration.changes b/frameworkintegration.changes
index e167dd9..94b544d 100644
--- a/frameworkintegration.changes
+++ b/frameworkintegration.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+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
+
 -------------------------------------------------------------------
 Tue Sep  9 09:49:23 UTC 2014 - hrvoje.senjan@gmail.com
 
diff --git a/frameworkintegration.spec b/frameworkintegration.spec
index ec213c1..8ef1499 100644
--- a/frameworkintegration.spec
+++ b/frameworkintegration.spec
@@ -44,6 +44,10 @@ Group:          System/GUI/KDE
 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 @@ Applications do not need to link to this directly. Development files
 %lang_package -n %lname
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
   %cmake_kf5 -d build