From 7cfd4728c35026a14f6d301e35f61c593e09cae8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jun 25 2016 23:32:27 +0000 Subject: 5.6.95 --- diff --git a/.gitignore b/.gitignore index 095fb3a..8f56c15 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/plasma-desktop-5.6.5.tar.xz +/plasma-desktop-5.6.95.tar.xz diff --git a/0065-muon-discover-plasma-discover.patch b/0065-muon-discover-plasma-discover.patch deleted file mode 100644 index 16eaa1a..0000000 --- a/0065-muon-discover-plasma-discover.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 64bb8e4206f6d82f5a51bfee43217512df206787 Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Mon, 18 Apr 2016 14:50:45 -0500 -Subject: [PATCH 65/65] muon-discover => plasma-discover - ---- - applets/kickoff/package/contents/config/main.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/applets/kickoff/package/contents/config/main.xml b/applets/kickoff/package/contents/config/main.xml -index ec222dd..2de73ba 100644 ---- a/applets/kickoff/package/contents/config/main.xml -+++ b/applets/kickoff/package/contents/config/main.xml -@@ -29,7 +29,7 @@ - - - -- muon-discover --application -+ plasma-discover --application - - - --- -2.7.3 - diff --git a/plasma-desktop-5.6-kactivities-stats.patch b/plasma-desktop-5.6-kactivities-stats.patch deleted file mode 100644 index f893aa8..0000000 --- a/plasma-desktop-5.6-kactivities-stats.patch +++ /dev/null @@ -1,116 +0,0 @@ -https://bugs.kde.org/show_bug.cgi?id=361952 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dfd7822..9c849ae 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -48,6 +48,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS - Declarative - People - DBusAddons -+ ActivitiesStats - ) - - find_package(LibKWorkspace CONFIG REQUIRED) -diff --git a/applets/kicker/CMakeLists.txt b/applets/kicker/CMakeLists.txt -index 6aa9d8d..2e112e4 100644 ---- a/applets/kicker/CMakeLists.txt -+++ b/applets/kicker/CMakeLists.txt -@@ -63,7 +63,7 @@ target_link_libraries(kickerplugin - Qt5::Quick - Qt5::X11Extras - KF5::Activities -- KF5::ActivitiesExperimentalStats -+ KF5::ActivitiesStats - KF5::ConfigCore - KF5::CoreAddons - KF5::I18n -diff --git a/applets/kicker/package/contents/ui/CompactRepresentation.qml b/applets/kicker/package/contents/ui/CompactRepresentation.qml -index 6d84b14..ed4c4e5 100644 ---- a/applets/kicker/package/contents/ui/CompactRepresentation.qml -+++ b/applets/kicker/package/contents/ui/CompactRepresentation.qml -@@ -103,7 +103,7 @@ Item { - } - } - -- visible: plasmoid.configuration.useCustomButtonImage && plasmoid.configuration.customButtonImage -+ visible: plasmoid.configuration.useCustomButtonImage && (plasmoid.configuration.customButtonImage != "") - source: plasmoid.configuration.customButtonImage - fillMode: Image.PreserveAspectFit - smooth: true -diff --git a/applets/kicker/plugin/actionlist.cpp b/applets/kicker/plugin/actionlist.cpp -index 57f2a2c..2aa97d9 100644 ---- a/applets/kicker/plugin/actionlist.cpp -+++ b/applets/kicker/plugin/actionlist.cpp -@@ -27,13 +27,13 @@ - #include - #include - --#include --#include --#include -+#include -+#include -+#include - - #include "containmentinterface.h" - --namespace KAStats = KActivities::Experimental::Stats; -+namespace KAStats = KActivities::Stats; - - using namespace KAStats; - using namespace KAStats::Terms; -diff --git a/applets/kicker/plugin/recentcontactsmodel.cpp b/applets/kicker/plugin/recentcontactsmodel.cpp -index 182b7d0..1d2c9f5 100644 ---- a/applets/kicker/plugin/recentcontactsmodel.cpp -+++ b/applets/kicker/plugin/recentcontactsmodel.cpp -@@ -26,14 +26,14 @@ - - #include - --#include --#include -+#include -+#include - - #include //FIXME TODO: Pretty include in KPeople broken. - #include - #include - --namespace KAStats = KActivities::Experimental::Stats; -+namespace KAStats = KActivities::Stats; - - using namespace KAStats; - using namespace KAStats::Terms; -diff --git a/applets/kicker/plugin/recentusagemodel.cpp b/applets/kicker/plugin/recentusagemodel.cpp -index d6fe840..85fd607 100644 ---- a/applets/kicker/plugin/recentusagemodel.cpp -+++ b/applets/kicker/plugin/recentusagemodel.cpp -@@ -37,11 +37,11 @@ - #include - #include - --#include --#include --#include -+#include -+#include -+#include - --namespace KAStats = KActivities::Experimental::Stats; -+namespace KAStats = KActivities::Stats; - - using namespace KAStats; - using namespace KAStats::Terms; -diff --git a/applets/kicker/plugin/runnermodel.cpp b/applets/kicker/plugin/runnermodel.cpp -index 732d047..88b3670 100644 ---- a/applets/kicker/plugin/runnermodel.cpp -+++ b/applets/kicker/plugin/runnermodel.cpp -@@ -261,6 +261,7 @@ void RunnerModel::matchesChanged(const QList &matches) - m_models.removeAt(row); - delete matchesModel; - endRemoveRows(); -+ emit countChanged(); - } else { - matchesModel->setMatches(matches); - } diff --git a/plasma-desktop.spec b/plasma-desktop.spec index e7c1afb..2c76306 100644 --- a/plasma-desktop.spec +++ b/plasma-desktop.spec @@ -3,7 +3,7 @@ Name: plasma-desktop Summary: Plasma Desktop shell -Version: 5.6.5 +Version: 5.6.95 Release: 1%{?dist} License: GPLv2+ and (GPLv2 or GPLv3) @@ -30,13 +30,10 @@ Patch102: plasma-desktop-fedora_layout.patch ## upstream patches ## upstream patches (master branch) -Patch65: 0065-muon-discover-plasma-discover.patch ## upstreamable patches # missing '#include ' means PK never used Patch50: plasma-desktop-PackageKit.patch -# https://bugs.kde.org/show_bug.cgi?id=361952 -Patch51: plasma-desktop-5.6-kactivities-stats.patch BuildRequires: libusb-devel BuildRequires: fontconfig-devel @@ -182,11 +179,11 @@ BuildArch: noarch ## upstream patches ## muon-discover => plasma-discover rename on f24+ only -%if 0%{?fedora} > 23 -%patch65 -p1 -b .0065 -%endif +# rename to muon for < f24 ? +#if 0%{?fedora} > 23 +#patch65 -p1 -b .0065 +#endif %patch50 -p1 -b .PackageKit -%patch51 -p1 -b .kactivities-stats %if 0%{?fedora} > 22 %patch100 -p1 @@ -339,6 +336,9 @@ fi %changelog +* Sat Jun 25 2016 Rex Dieter - 5.6.95-1 +- 5.6.95 + * Tue Jun 14 2016 Rex Dieter - 5.6.5-1 - 5.6.5 diff --git a/sources b/sources index 14de0d5..6f0a4f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -36858c6e1696bfead82d3a06edc6df20 plasma-desktop-5.6.5.tar.xz +9f43b486a8a15f05a41c4d300507aef6 plasma-desktop-5.6.95.tar.xz