From 48530a4274ae3f10d0450c85a107d7f7117d05e477424269c010f732ace73273 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 4 Oct 2014 18:34:47 +0000 Subject: [PATCH] 5.3.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/frameworkintegration?expand=0&rev=43 --- 0001-default-to-breeze.patch | 32 ------------------------------- 0002-colorscheme-in-General.patch | 25 ------------------------ frameworkintegration-5.2.0.tar.xz | 3 --- frameworkintegration-5.3.0.tar.xz | 3 +++ frameworkintegration.changes | 9 +++++++++ frameworkintegration.spec | 10 ++-------- 6 files changed, 14 insertions(+), 68 deletions(-) delete mode 100644 0001-default-to-breeze.patch delete mode 100644 0002-colorscheme-in-General.patch delete mode 100644 frameworkintegration-5.2.0.tar.xz create mode 100644 frameworkintegration-5.3.0.tar.xz diff --git a/0001-default-to-breeze.patch b/0001-default-to-breeze.patch deleted file mode 100644 index c20506e..0000000 --- a/0001-default-to-breeze.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 - diff --git a/0002-colorscheme-in-General.patch b/0002-colorscheme-in-General.patch deleted file mode 100644 index 9747624..0000000 --- a/0002-colorscheme-in-General.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 - diff --git a/frameworkintegration-5.2.0.tar.xz b/frameworkintegration-5.2.0.tar.xz deleted file mode 100644 index 854d2dd..0000000 --- a/frameworkintegration-5.2.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b904050f618af2856c5a119b5010d8f210a64549614d9e356272dc8aeee5e0de -size 1765508 diff --git a/frameworkintegration-5.3.0.tar.xz b/frameworkintegration-5.3.0.tar.xz new file mode 100644 index 0000000..768ae98 --- /dev/null +++ b/frameworkintegration-5.3.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6cb815440d07a5fd115b9c19c5a7decb87f9e37ca6ffbb66f23c78fae541d74b +size 1768872 diff --git a/frameworkintegration.changes b/frameworkintegration.changes index 94b544d..4dbc0af 100644 --- a/frameworkintegration.changes +++ b/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 diff --git a/frameworkintegration.spec b/frameworkintegration.spec index 8ef1499..84ddf77 100644 --- a/frameworkintegration.spec +++ b/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