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=98

Browse Source
This commit is contained in:
Hrvoje Senjan 2015-08-14 16:05:38 +00:00 committed by Git OBS Bridge
parent 1d4b17dd8d
commit 5fb3412e3f
6 changed files with 104 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,29 @@
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 Normal file
View File

@ -0,0 +1,19 @@
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)

3
plasma-workspace-5.3.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4165a547efc59dd42a15d24f21f722d88e4acfb6fb6d6a4db3c3d0ce54fa54c4
size 6860364

3
plasma-workspace-5.3.95.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:80227f1f5bbf45ad71c397fc670eef3f7ae8dc888942a11a4799b5c661b8bd7c
size 6889568

59
plasma5-workspace.spec
View File

@ -18,7 +18,7 @@
%bcond_without lang
Name: plasma5-workspace
Version: 5.3.95
Version: 5.3.2
Release: 0
Summary: The KDE Plasma Workspace Components
License: GPL-2.0+
@ -31,41 +31,45 @@ Source99: %{name}-rpmlintrc
Patch0: 0001-Rename-qdbus-in-startkde.patch
# PATCH-FIX_OPENSUSE create_kdehome.patch -- https://bugs.kde.org/show_bug.cgi?id=338422#c8
Patch1: create_kdehome.patch
# PATCH-FIX_OPENSUSE 0003-Remove-export-of-QT_PLUGIN_PATH.patch -- we install plugins to directory known to Qt5, so export just pollutes both Qt4 and Qt5 plugins
Patch2: 0003-Remove-export-of-QT_PLUGIN_PATH.patch
# PATCHES 100-200 and above are from upstream 5.3 branch
# PATCHES 201-300 and above are from upstream master/5.4 branch
Patch201: use-the-filepath-as-the-unique-id-of-the-match.patch
Patch202: Baloo-Result-header-is-no-longer-installed.patch
BuildRequires: alsa-devel
BuildRequires: baloo5-devel >= %{version}
BuildRequires: kactivities5-devel >= 5.12.0
BuildRequires: kcmutils-devel >= 5.12.0
BuildRequires: kcoreaddons-devel >= 5.12.0
BuildRequires: kcrash-devel >= 5.12.0
BuildRequires: kdbusaddons-devel >= 5.12.0
BuildRequires: kdeclarative-devel >= 5.12.0
BuildRequires: kdelibs4support-devel >= 5.12.0
BuildRequires: kdesu-devel >= 5.12.0
BuildRequires: kdewebkit-devel >= 5.12.0
BuildRequires: kdoctools-devel >= 5.12.0
BuildRequires: kactivities5-devel >= 5.8.0
BuildRequires: kcmutils-devel >= 5.8.0
BuildRequires: kcoreaddons-devel >= 5.8.0
BuildRequires: kcrash-devel >= 5.8.0
BuildRequires: kdbusaddons-devel >= 5.8.0
BuildRequires: kdeclarative-devel >= 5.8.0
BuildRequires: kdelibs4support-devel >= 5.8.0
BuildRequires: kdesu-devel >= 5.8.0
BuildRequires: kdewebkit-devel >= 5.8.0
BuildRequires: kdoctools-devel >= 5.8.0
BuildRequires: kf5-filesystem
BuildRequires: kglobalaccel-devel >= 5.12.0
BuildRequires: kidletime-devel >= 5.12.0
BuildRequires: kjsembed-devel >= 5.12.0
BuildRequires: knewstuff-devel >= 5.12.0
BuildRequires: knotifyconfig-devel >= 5.12.0
BuildRequires: kpackage-devel >= 5.12.0
BuildRequires: krunner-devel >= 5.12.0
BuildRequires: ktexteditor-devel >= 5.12.0
BuildRequires: kwallet-framework-devel >= 5.12.0
BuildRequires: kglobalaccel-devel >= 5.8.0
BuildRequires: kidletime-devel >= 5.8.0
BuildRequires: kjsembed-devel >= 5.8.0
BuildRequires: knewstuff-devel >= 5.8.0
BuildRequires: knotifyconfig-devel >= 5.8.0
BuildRequires: kpackage-devel >= 5.8.0
BuildRequires: krunner-devel >= 5.8.0
BuildRequires: ktexteditor-devel >= 5.8.0
BuildRequires: kwallet-framework-devel >= 5.8.0
BuildRequires: kwayland-devel >= %{version}
BuildRequires: kwin5-devel >= %{version}
BuildRequires: kxmlrpcclient5-devel >= 5.12.0
BuildRequires: libKF5NetworkManagerQt-devel >= 5.12.0
BuildRequires: kxmlrpcclient5-devel >= 5.8.0
BuildRequires: libKF5NetworkManagerQt-devel >= 5.8.0
BuildRequires: libkscreen2-devel >= %{version}
BuildRequires: libksysguard5-devel >= %{version}
BuildRequires: libxcb-devel
BuildRequires: pam-devel
BuildRequires: phonon4qt5-devel
BuildRequires: plasma-framework-devel >= 5.12.0
BuildRequires: solid-devel >= 5.12.0
BuildRequires: plasma-framework-devel >= 5.8.0
BuildRequires: solid-devel >= 5.8.0
BuildRequires: update-desktop-files
BuildRequires: wayland-devel >= 1.3.0
BuildRequires: xz
@ -187,6 +191,9 @@ workspace. Development files.
%setup -q -n plasma-workspace-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch201 -p1
%patch202 -p1
%build
%cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5
@ -231,7 +238,6 @@ workspace. Development files.
%{_kf5_bindir}/plasmashell
%{_kf5_bindir}/plasmawindowed
%{_kf5_bindir}/startkde
%{_kf5_bindir}/startplasmacompositor
%{_kf5_bindir}/systemmonitor
%{_kf5_configdir}/autostart/org.kde.klipper.desktop
%{_kf5_configdir}/autostart/plasmashell.desktop
@ -243,7 +249,6 @@ workspace. Development files.
%{_kf5_libdir}/libexec/kcheckpass
%{_kf5_libdir}/libexec/kscreenlocker_greet
%{_kf5_libdir}/libexec/ksyncdbusenv
%{_kf5_libdir}/libexec/startplasma
%{_kf5_libdir}/libkdeinit5_kcminit.so
%{_kf5_libdir}/libkdeinit5_kcminit_startup.so
%{_kf5_libdir}/libkdeinit5_klipper.so
@ -260,7 +265,6 @@ workspace. Development files.
%dir %{_kf5_htmldir}/en
%dir %{_kf5_htmldir}
%doc %{_kf5_htmldir}/en/klipper/
%doc %{_kf5_htmldir}/en/kcontrol/
%{_kf5_notifydir}/
%{_kf5_servicesdir}/
%{_kf5_servicetypesdir}/
@ -271,7 +275,6 @@ workspace. Development files.
%{_kf5_plasmadir}/
%{_kf5_sharedir}/solid/
%{_kf5_sharedir}/sddm/
%{_kf5_sharedir}/kio_desktop/
%files -n drkonqi5
%defattr(-,root,root)

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

@ -0,0 +1,22 @@
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);