pool/plasma5-workspace
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=96

Browse Source
This commit is contained in:
Hrvoje Senjan 2015-08-09 09:04:24 +00:00 committed by Git OBS Bridge
parent f0bd00aedc
commit b8f75a7449
4 changed files with 4 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
0003-Remove-export-of-QT_PLUGIN_PATH.patch
View File

@ -1,29 +0,0 @@
From dde9b1c1930d333d8daff25c73400e1e67f3c630 Mon Sep 17 00:00:00 2001
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
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

19
Baloo-Result-header-is-no-longer-installed.patch
View File

@ -1,19 +0,0 @@
From: Vishesh Handa <me@vhanda.in>
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 <QTimer>
#include <Baloo/Query>
-#include <Baloo/Result>
SearchRunner::SearchRunner(QObject* parent, const QVariantList& args)
: Plasma::AbstractRunner(parent, args)

7
plasma5-workspace.spec
View File

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

22
use-the-filepath-as-the-unique-id-of-the-match.patch
View File

@ -1,22 +0,0 @@
From: Vishesh Handa <me@vhanda.in>
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);