From 38ffac52c388938eea6402887cb4ffa5093d5474 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 2 Aug 2016 16:47:48 -0500 Subject: [PATCH] 5.7.3, drop f22 support --- .gitignore | 1 + ...-desktop-5.4.0-default_favorites_f22.patch | 13 ------ plasma-desktop-PackageKit.patch | 46 +++++++++++++++---- plasma-desktop-fedora_layout.patch | 12 ----- plasma-desktop.spec | 29 ++++++------ sources | 2 +- 6 files changed, 51 insertions(+), 52 deletions(-) delete mode 100644 plasma-desktop-5.4.0-default_favorites_f22.patch delete mode 100644 plasma-desktop-fedora_layout.patch diff --git a/.gitignore b/.gitignore index 2b15b5d..c16f7c5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /plasma-desktop-5.7.0.tar.xz /plasma-desktop-5.7.1.tar.xz /plasma-desktop-5.7.2.tar.xz +/plasma-desktop-5.7.3.tar.xz diff --git a/plasma-desktop-5.4.0-default_favorites_f22.patch b/plasma-desktop-5.4.0-default_favorites_f22.patch deleted file mode 100644 index cea6f38..0000000 --- a/plasma-desktop-5.4.0-default_favorites_f22.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/applets/kickoff/package/contents/config/main.xml b/applets/kickoff/package/contents/config/main.xml -index afd0b6f..aa55c49 100644 ---- a/applets/kickoff/package/contents/config/main.xml -+++ b/applets/kickoff/package/contents/config/main.xml -@@ -16,7 +16,7 @@ - start-here-kde - - -- preferred://browser,kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,ktp-contactlist.desktop,org.kde.kate.desktop,org.kde.discover -+ konqbrowser.desktop,kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,dolphin.desktop,org.kde.ktpcontactlist.desktop,ktpcontactlist.desktop,org.kde.kate.desktop,kate.desktop,org.kde.konsole.desktop,apper.desktop,org.kde.kate.desktop,org.kde.discover.desktop - - - systemsettings.desktop diff --git a/plasma-desktop-PackageKit.patch b/plasma-desktop-PackageKit.patch index 5a4344c..5dc6a2c 100644 --- a/plasma-desktop-PackageKit.patch +++ b/plasma-desktop-PackageKit.patch @@ -1,11 +1,37 @@ -diff -up plasma-desktop-5.5.4/applets/kicker/plugin/appentry.cpp.PackageKit plasma-desktop-5.5.4/applets/kicker/plugin/appentry.cpp ---- plasma-desktop-5.5.4/applets/kicker/plugin/appentry.cpp.PackageKit 2016-02-26 11:19:47.956302194 -0600 -+++ plasma-desktop-5.5.4/applets/kicker/plugin/appentry.cpp 2016-02-26 11:23:50.421393814 -0600 -@@ -17,6 +17,7 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . * - ***************************************************************************/ +commit 7dfb92b08584c79ef18a1a709f53759899eeac87 +Author: Kai Uwe Broulik +Date: Tue Aug 2 10:15:46 2016 +0200 + + [Kicker] Disable PackageKit integration (aka "Uninstall app") context menu entry + + Currently we cannot populate the context menu asynchronously which means we + block waiting for PackageKit which takes multiple seconds. While fixing the missing + include was correct, the result is a terrible regression in a bugfix release. + + Once changes to the context menu can be notified by the Kicker backend, ie. 5.8, + this feature will return, sorry. + + As discussed with Eike + +diff --git a/applets/kicker/plugin/appentry.cpp b/applets/kicker/plugin/appentry.cpp +index ee2a2d3..3bab47f 100644 +--- a/applets/kicker/plugin/appentry.cpp ++++ b/applets/kicker/plugin/appentry.cpp +@@ -177,7 +177,7 @@ QVariantList AppEntry::actions() const + } -+#include - #include "appentry.h" - #include "actionlist.h" - #include "appsmodel.h" + #ifdef PackageKitQt5_FOUND +- QStringList files(m_service->entryPath()); ++ /*QStringList files(m_service->entryPath()); + + if (m_service->isApplication()) { + files += QStandardPaths::findExecutable(KShell::splitArgs(m_service->exec()).first()); +@@ -191,7 +191,7 @@ QVariantList AppEntry::actions() const + QVariantMap removeAction = Kicker::createActionItem(i18n("Remove '%1'...", packageName), "removeApplication", packageName); + removeAction["icon"] = "applications-other"; + actionList << removeAction; +- } ++ }*/ + #endif + + QQmlPropertyMap *appletConfig = qobject_cast(appletInterface->property("configuration").value()); diff --git a/plasma-desktop-fedora_layout.patch b/plasma-desktop-fedora_layout.patch deleted file mode 100644 index cb7efd8..0000000 --- a/plasma-desktop-fedora_layout.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up plasma-desktop-5.3.0/desktoppackage/contents/layout.js.fedora_layout plasma-desktop-5.3.0/desktoppackage/contents/layout.js ---- plasma-desktop-5.3.0/desktoppackage/contents/layout.js.fedora_layout 2015-04-23 05:02:33.000000000 -0500 -+++ plasma-desktop-5.3.0/desktoppackage/contents/layout.js 2015-05-21 08:10:39.185880487 -0500 -@@ -2,7 +2,7 @@ - loadTemplate("org.kde.plasma.desktop.defaultPanel") - - for (var i = 0; i < screenCount; ++i) { -- var id = createActivity("Desktop"); -+ var id = createActivity("Fedora Desktop", "org.kde.plasma.folder"); - var desktopsArray = desktopsForActivity(id); - print(desktopsArray.length); - for( var j = 0; j < desktopsArray.length; j++) { diff --git a/plasma-desktop.spec b/plasma-desktop.spec index 4f66be0..4683b6d 100644 --- a/plasma-desktop.spec +++ b/plasma-desktop.spec @@ -3,7 +3,7 @@ Name: plasma-desktop Summary: Plasma Desktop shell -Version: 5.7.2 +Version: 5.7.3 Release: 1%{?dist} License: GPLv2+ and (GPLv2 or GPLv3) @@ -22,18 +22,14 @@ Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}. ## downstream patches # default kickoff favorites: -preferred_browser(buggy) +firefox +konsole +apper Patch100: plasma-desktop-5.4.0-default_favorites.patch -# default kickoff favorites: -preferred_browser(buggy) +konqbrowser +konsole +apper -Patch101: plasma-desktop-5.4.0-default_favorites_f22.patch -# Default to Folder containment (rather than Desktop) -Patch102: plasma-desktop-fedora_layout.patch +# Restore PackageKit integration feature +Patch103: plasma-desktop-PackageKit.patch ## upstream patches ## upstream patches (master branch) ## upstreamable patches -# missing '#include ' means PK never used -Patch50: plasma-desktop-PackageKit.patch BuildRequires: libusb-devel BuildRequires: fontconfig-devel @@ -183,14 +179,9 @@ BuildArch: noarch #if 0%{?fedora} > 23 #patch65 -p1 -b .0065 #endif -%patch50 -p1 -b .PackageKit -%if 0%{?fedora} > 22 %patch100 -p1 -%else -%patch101 -p1 -%endif -%patch102 -p1 -b .fedora_layout +%patch103 -p1 -R %build @@ -321,14 +312,17 @@ fi %files doc #lang(ca) %{_docdir}/HTML/ca/kcontrol/ -%lang(ca) %{_docdir}/HTML/ca/kfontview/ -%lang(ca) %{_docdir}/HTML/ca/knetattach/ -%lang(ca) %{_docdir}/HTML/ca/plasma-desktop/ +#lang(ca) %{_docdir}/HTML/ca/kfontview/ +#lang(ca) %{_docdir}/HTML/ca/knetattach/ +#lang(ca) %{_docdir}/HTML/ca/plasma-desktop/ %lang(cs) %{_docdir}/HTML/cs/kcontrol/ %lang(en) %{_docdir}/HTML/en/kcontrol/ %lang(en) %{_docdir}/HTML/en/kfontview/ %lang(en) %{_docdir}/HTML/en/knetattach/ %lang(en) %{_docdir}/HTML/en/plasma-desktop/ +%lang(de) %{_docdir}/HTML/de/kfontview/ +%lang(de) %{_docdir}/HTML/de/knetattach/ +%lang(de) %{_docdir}/HTML/de/plasma-desktop/ %lang(it) %{_docdir}/HTML/it/plasma-desktop %lang(nl) %{_docdir}/HTML/nl/plasma-desktop/ %lang(pt_BR) %{_docdir}/HTML/pt_BR/plasma-desktop/ @@ -338,6 +332,9 @@ fi %changelog +* Tue Aug 02 2016 Rex Dieter - 5.7.3-1 +- 5.7.3, drop f22 support + * Tue Jul 19 2016 Rex Dieter - 5.7.2-1 - 5.7.2 diff --git a/sources b/sources index 04c5f28..76d15cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0563d5d12ef9b1822c63598075997ef8 plasma-desktop-5.7.2.tar.xz +1b97771749effa32aee19ed789e67ddd plasma-desktop-5.7.3.tar.xz