5.3.0

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/frameworkintegration?expand=0&rev=43

0001-default-to-breeze.patch

@@ -1,32 +0,0 @@
-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
-

0002-colorscheme-in-General.patch

@@ -1,25 +0,0 @@
-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
-

frameworkintegration-5.2.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b904050f618af2856c5a119b5010d8f210a64549614d9e356272dc8aeee5e0de
-size 1765508

frameworkintegration-5.3.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6cb815440d07a5fd115b9c19c5a7decb87f9e37ca6ffbb66f23c78fae541d74b
+size 1768872

frameworkintegration.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sat Oct  4 17:59:33 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update to 5.3.0
+  * For more details please see:
+    https://www.kde.org/announcements/kde-frameworks-5.3.0.php
+- Drop patches merged upstream:
+  0001-default-to-breeze.patch and 0002-colorscheme-in-General.patch
+
 -------------------------------------------------------------------
 Wed Sep 24 19:02:12 UTC 2014 - hrvoje.senjan@gmail.com
 

frameworkintegration.spec

@@ -18,11 +18,11 @@
 
 %define lname   libKF5Style5
 Name:           frameworkintegration
-Version:        5.2.0
+Version:        5.3.0
 Release:        0
 %define kf5_version %{version}
 BuildRequires:  cmake >= 2.8.12
-BuildRequires:  extra-cmake-modules >= 1.2.0
+BuildRequires:  extra-cmake-modules >= 1.3.0
 BuildRequires:  fdupes
 BuildRequires:  kconfig-devel >= %{kf5_version}
 BuildRequires:  kconfigwidgets-devel >= %{kf5_version}
@@ -44,10 +44,6 @@ 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
@@ -89,8 +85,6 @@ 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