5.7.3, drop f22 support

epel9
Rex Dieter 8 years ago
parent cee8fbe52d
commit 38ffac52c3

1
.gitignore vendored

@ -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

@ -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 @@
<default>start-here-kde</default>
</entry>
<entry name="favorites" type="StringList">
- <default>preferred://browser,kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,ktp-contactlist.desktop,org.kde.kate.desktop,org.kde.discover</default>
+ <default>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</default>
</entry>
<entry name="systemApplications" type="StringList">
<default>systemsettings.desktop</default>

@ -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 . *
***************************************************************************/
+#include <config-workspace.h>
#include "appentry.h"
#include "actionlist.h"
#include "appsmodel.h"
commit 7dfb92b08584c79ef18a1a709f53759899eeac87
Author: Kai Uwe Broulik <kde@privat.broulik.de>
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
}
#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<QQmlPropertyMap *>(appletInterface->property("configuration").value<QObject *>());

@ -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++) {

@ -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 <config-workspace.h>' 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 <rdieter@fedoraproject.org> - 5.7.3-1
- 5.7.3, drop f22 support
* Tue Jul 19 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.2-1
- 5.7.2

@ -1 +1 @@
0563d5d12ef9b1822c63598075997ef8 plasma-desktop-5.7.2.tar.xz
1b97771749effa32aee19ed789e67ddd plasma-desktop-5.7.3.tar.xz

Loading…
Cancel
Save