filter qml/plugin provides, drop unused PK patch/support

epel9
Rex Dieter 8 years ago
parent eb9bd5d8ce
commit 042045da97

@ -1,37 +0,0 @@
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 *>());

@ -4,7 +4,7 @@
Name: plasma-desktop Name: plasma-desktop
Summary: Plasma Desktop shell Summary: Plasma Desktop shell
Version: 5.8.5 Version: 5.8.5
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ and (GPLv2 or GPLv3) License: GPLv2+ and (GPLv2 or GPLv3)
URL: https://quickgit.kde.org/?p=%{name}.git URL: https://quickgit.kde.org/?p=%{name}.git
@ -22,8 +22,6 @@ Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.
## downstream patches ## downstream patches
# default kickoff favorites: +konsole +apper # default kickoff favorites: +konsole +apper
Patch100: plasma-desktop-5.8-default_favorites.patch Patch100: plasma-desktop-5.8-default_favorites.patch
# Restore PackageKit integration feature
Patch103: plasma-desktop-PackageKit.patch
## upstream patches ## upstream patches
@ -31,6 +29,9 @@ Patch103: plasma-desktop-PackageKit.patch
## upstreamable patches ## upstreamable patches
# filter qmk/plugins provides
%global __provides_exclude_from ^(%{_kf5_qmldir}/.*\\.so|%{_kf5_qtplugindir}/.*\\.so)$
BuildRequires: libusb-devel BuildRequires: libusb-devel
BuildRequires: fontconfig-devel BuildRequires: fontconfig-devel
BuildRequires: libX11-devel BuildRequires: libX11-devel
@ -52,16 +53,6 @@ BuildRequires: phonon-qt5-devel
BuildRequires: ibus-devel BuildRequires: ibus-devel
BuildRequires: scim-devel BuildRequires: scim-devel
# PackageKit-Qt 5 is not avaialble on F20, because PackageKit is too old there
%if 0%{?fedora} >= 21
BuildRequires: PackageKit-Qt5-devel
%if 0%{?fedora} > 23
Recommends: plasma-discover >= %{majmin_ver}
%else
Recommends: muon-discover >= %{majmin_ver}
%endif
%endif
BuildRequires: kf5-rpm-macros >= %{_kf5_version} BuildRequires: kf5-rpm-macros >= %{_kf5_version}
BuildRequires: extra-cmake-modules BuildRequires: extra-cmake-modules
BuildRequires: kf5-plasma-devel >= %{kf5_version} BuildRequires: kf5-plasma-devel >= %{kf5_version}
@ -181,14 +172,8 @@ BuildArch: noarch
## upstream patches ## upstream patches
## muon-discover => plasma-discover rename on f24+ only ## downstream patches
# rename to muon for < f24 ?
#if 0%{?fedora} > 23
#patch65 -p1 -b .0065
#endif
%patch100 -p1 %patch100 -p1
#patch103 -p1 -R
%build %build
@ -342,6 +327,9 @@ fi
%changelog %changelog
* Mon Jan 02 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.8.5-2
- filter qml/plugin provides, drop unused PK patch/support
* Wed Dec 28 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.8.5-1 * Wed Dec 28 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.8.5-1
- 5.8.5 - 5.8.5

Loading…
Cancel
Save