diff --git a/0003-Remove-export-of-QT_PLUGIN_PATH.patch b/0003-Remove-export-of-QT_PLUGIN_PATH.patch deleted file mode 100644 index 589b38a..0000000 --- a/0003-Remove-export-of-QT_PLUGIN_PATH.patch +++ /dev/null @@ -1,29 +0,0 @@ -From dde9b1c1930d333d8daff25c73400e1e67f3c630 Mon Sep 17 00:00:00 2001 -From: Hrvoje Senjan -Date: Sun, 7 Sep 2014 22:55:24 +0200 -Subject: [PATCH 3/3] Remove export of QT_PLUGIN_PATH - ---- - startkde/startkde.cmake | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index 51721d1..1d67be0 100644 ---- a/startkde/startkde.cmake -+++ b/startkde/startkde.cmake -@@ -220,12 +220,6 @@ for prefix in `echo $scriptpath`; do - done - done - --# Set the path for Qt plugins provided by KDE --QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths --plugin-dir` --# TODO: Do we really need this? --QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/ --export QT_PLUGIN_PATH -- - # Activate the kde font directories. - # - # There are 4 directories that may be used for supplying fonts for KDE. --- -2.1.0 - diff --git a/Baloo-Result-header-is-no-longer-installed.patch b/Baloo-Result-header-is-no-longer-installed.patch deleted file mode 100644 index 1b8b456..0000000 --- a/Baloo-Result-header-is-no-longer-installed.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Vishesh Handa -Date: Mon, 11 May 2015 13:34:51 +0000 -Subject: BalooRunner: Baloo/Result header is no longer installed -X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=321cdc7278c29bcf4cf15078a71c8ceea47e7e95 ---- -BalooRunner: Baloo/Result header is no longer installed ---- - - ---- a/runners/baloo/baloosearchrunner.cpp -+++ b/runners/baloo/baloosearchrunner.cpp -@@ -30,7 +30,6 @@ - #include - - #include --#include - - SearchRunner::SearchRunner(QObject* parent, const QVariantList& args) - : Plasma::AbstractRunner(parent, args) diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index 59d7005..1624623 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -90,7 +90,7 @@ BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(zlib) Conflicts: kdebase4-workspace < 5.3.0 -Requires: %{name}-branding = %{_plasma5_branding_version} +Requires: %{name}-branding = %{version} Requires: %{name}-libs = %{version}-%{release} # used within startup Requires: kde-cli-tools5 >= %{version} @@ -135,7 +135,7 @@ This package contains the basic packages for a Plasma workspace. %package branding-upstream Summary: The KDE Plasma Workspace Components Group: System/GUI/KDE -Provides: %{name}-branding = %{_plasma5_branding_version} +Provides: %{name}-branding = %{version} Supplements: packageand(plasma5-workspace:branding-upstream) Conflicts: otherproviders(%{name}-branding) @@ -307,7 +307,8 @@ workspace. Development files. %files lang %defattr(-,root,root) %{_kf5_localedir}/ -%doc %lang(de) %{_kf5_htmldir}/de/ +%doc %lang(ca) %{_kf5_htmldir}/ca/ +%doc %lang(et) %{_kf5_htmldir}/et/ %endif %changelog diff --git a/use-the-filepath-as-the-unique-id-of-the-match.patch b/use-the-filepath-as-the-unique-id-of-the-match.patch deleted file mode 100644 index 9201810..0000000 --- a/use-the-filepath-as-the-unique-id-of-the-match.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Vishesh Handa -Date: Wed, 06 May 2015 12:27:37 +0000 -Subject: Baloo Runner: Use the filepath as the unique id of the match -X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=34c11a481baafd9824ef681b6d359ca34ab04ad8 ---- -Baloo Runner: Use the filepath as the unique id of the match - -Baloo no longer exports the identifier of the file ---- - - ---- a/runners/baloo/baloosearchrunner.cpp -+++ b/runners/baloo/baloosearchrunner.cpp -@@ -114,7 +114,7 @@ - - QString iconName = QMimeDatabase().mimeTypeForFile(localUrl).iconName(); - match.setIcon(QIcon::fromTheme(iconName)); -- match.setId(it.id()); -+ match.setId(it.filePath()); - match.setText(url.fileName()); - match.setData(url); - match.setType(Plasma::QueryMatch::PossibleMatch);