Accepting request 282981 from KDE:Frameworks5
Update to 5.2.0 OBS-URL: https://build.opensuse.org/request/show/282981 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=11
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
93e8f4c337
@ -1,80 +0,0 @@
|
||||
From 1ae78f08474878e60d086ea60e933d62228eac2f Mon Sep 17 00:00:00 2001
|
||||
From: Vishesh Handa <me@vhanda.in>
|
||||
Date: Fri, 17 Oct 2014 17:45:42 +0200
|
||||
Subject: [PATCH 1/2] LocationRunner: Convert case insensitive path to a proper
|
||||
one
|
||||
|
||||
BUG: 333395
|
||||
FIXED-IN: 5.2
|
||||
---
|
||||
runners/locations/locationrunner.cpp | 40 ++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 40 insertions(+)
|
||||
|
||||
diff --git a/runners/locations/locationrunner.cpp b/runners/locations/locationrunner.cpp
|
||||
index 13035a9..0b79655 100644
|
||||
--- a/runners/locations/locationrunner.cpp
|
||||
+++ b/runners/locations/locationrunner.cpp
|
||||
@@ -21,6 +21,7 @@
|
||||
#include <QMimeData>
|
||||
#include <QIcon>
|
||||
#include <QUrl>
|
||||
+#include <QDir>
|
||||
|
||||
#include <QDebug>
|
||||
#include <KRun>
|
||||
@@ -129,6 +130,43 @@ void LocationsRunner::match(Plasma::RunnerContext &context)
|
||||
}
|
||||
}
|
||||
|
||||
+static QString convertCaseInsensitivePath(const QString& path)
|
||||
+{
|
||||
+ // Split the string on /
|
||||
+ QStringList dirNames = path.split(QDir::separator(), QString::SkipEmptyParts);
|
||||
+
|
||||
+ // Match folders
|
||||
+ QDir dir("/");
|
||||
+ for (int i = 0; i < dirNames.size() - 1; i++) {
|
||||
+ QString dirName = dirNames[i];
|
||||
+
|
||||
+ bool foundMatch = false;
|
||||
+ QStringList entries = dir.entryList(QDir::Dirs);
|
||||
+ for (const QString& entry: entries) {
|
||||
+ if (entry.compare(dirName, Qt::CaseInsensitive) == 0) {
|
||||
+ foundMatch = dir.cd(entry);
|
||||
+ if (foundMatch) {
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if (!foundMatch) {
|
||||
+ return path;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ QString finalName = dirNames.last();
|
||||
+ QStringList entries = dir.entryList();
|
||||
+ for (const QString& entry: entries) {
|
||||
+ if (entry.compare(finalName, Qt::CaseInsensitive) == 0) {
|
||||
+ return dir.absoluteFilePath(entry);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ return path;
|
||||
+}
|
||||
+
|
||||
void LocationsRunner::run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &match)
|
||||
{
|
||||
Q_UNUSED(match)
|
||||
@@ -139,6 +177,8 @@ void LocationsRunner::run(const Plasma::RunnerContext &context, const Plasma::Qu
|
||||
return;
|
||||
}
|
||||
|
||||
+ location = convertCaseInsensitivePath(location);
|
||||
+
|
||||
//qDebug() << "command: " << context.query();
|
||||
//qDebug() << "url: " << location << data;
|
||||
|
||||
--
|
||||
2.1.2
|
||||
|
||||
@ -1,50 +0,0 @@
|
||||
From 1fc19e8dfb8290ad7d21ba8f8913160f880a095b Mon Sep 17 00:00:00 2001
|
||||
From: Vishesh Handa <me@vhanda.in>
|
||||
Date: Tue, 21 Oct 2014 17:59:40 +0200
|
||||
Subject: [PATCH 2/2] Baloo Runner: Lower relevance because krunner does not
|
||||
know any better
|
||||
|
||||
The KRunner framework expects all runners to set a relevance for each
|
||||
match, except that this relevance information is taken to globally sort
|
||||
the results. So I can write a plugin which whose results will always be
|
||||
on top. Yaye! </sarcasm>
|
||||
|
||||
Explicitly lower Baloo's relevance so that in general applications are
|
||||
higher.
|
||||
---
|
||||
runners/baloo/baloosearchrunner.cpp | 12 +++++++++---
|
||||
1 file changed, 9 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/runners/baloo/baloosearchrunner.cpp b/runners/baloo/baloosearchrunner.cpp
|
||||
index 996f719..115abd0 100644
|
||||
--- a/runners/baloo/baloosearchrunner.cpp
|
||||
+++ b/runners/baloo/baloosearchrunner.cpp
|
||||
@@ -99,7 +99,13 @@ void SearchRunner::match(Plasma::RunnerC
|
||||
|
||||
Baloo::ResultIterator it = query.exec();
|
||||
|
||||
- int relevance = 100;
|
||||
+ // KRunner is absolutely retarded and allows plugins to set the global
|
||||
+ // relevance levels. so Baloo should not set the relevance of results too
|
||||
+ // high because then Applications will often appear after if the application
|
||||
+ // runner has not a higher relevance. So stupid.
|
||||
+ // Each runner plugin should not have to know about the others.
|
||||
+ // Anyway, that's why we're starting with .75
|
||||
+ float relevance = .75;
|
||||
while (context.isValid() && it.next()) {
|
||||
Plasma::QueryMatch match(this);
|
||||
match.setIcon(QIcon::fromTheme(it.icon()));
|
||||
@@ -108,8 +114,8 @@ void SearchRunner::match(Plasma::RunnerC
|
||||
match.setData(it.url());
|
||||
match.setType(Plasma::QueryMatch::PossibleMatch);
|
||||
match.setMatchCategory(category);
|
||||
- match.setRelevance(relevance * .01);
|
||||
- relevance--;
|
||||
+ match.setRelevance(relevance);
|
||||
+ relevance -= 0.05;
|
||||
|
||||
QString url = it.url().toLocalFile();
|
||||
if (url.startsWith(QDir::homePath())) {
|
||||
--
|
||||
2.1.2
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b329a2e4120e5bd6bcd718e4bba2763bc4ccd3a97031e13c7d71d5da679cfc0d
|
||||
size 6716768
|
||||
3
plasma-workspace-5.2.0.tar.xz
Normal file
3
plasma-workspace-5.2.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:43eece34f9ca2a15dc01aa4163db7d97aea09daab6b337cf4062ec2a4e8891eb
|
||||
size 6698876
|
||||
@ -1,3 +1,35 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 26 19:49:31 UTC 2015 - hrvoje.senjan@gmail.com
|
||||
|
||||
- Update to 5.2 Final:
|
||||
* For more details please see:
|
||||
https://www.kde.org/announcements/plasma-5.2.0.php
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 13 16:35:13 UTC 2015 - hrvoje.senjan@gmail.com
|
||||
|
||||
- Update to 5.2 Beta aka 5.1.95:
|
||||
* Undo changes to Plasma desktop layout
|
||||
* Smarter sorting of results in KRunner
|
||||
* Breeze window decoration theme adds a new look to your
|
||||
desktop and is now used by default
|
||||
* New white mouse cursor theme for Breeze.
|
||||
* New plasma widgets: 15 puzzle, web browser, show desktop
|
||||
* Over 300 bugs fixed throughout Plasma modules.
|
||||
* For more details please see:
|
||||
https://www.kde.org/announcements/plasma-5.1.95.php
|
||||
* Use the correct path for ksyncdbusenv, boo#912565
|
||||
- Harden external libs requires for the libs subpackage
|
||||
- Use exact version for plasma5-workspace-libs Requires
|
||||
- Bump KF5 Requires to 5.6.0
|
||||
- Bump (Build)Requires of other Plasma 5 components to same version
|
||||
- Add wayland-devel BuildRequires
|
||||
- Drop no longer relevant obsoletes
|
||||
- Require oxygen5-sounds, boo#912317
|
||||
- Drop 0001-LocationRunner-Convert-case-insensitive-path-to-a-pr.patch
|
||||
and 0002-Baloo-Runner-Lower-relevance-because-krunner-does-no.patch,
|
||||
merged upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 11 18:00:08 UTC 2014 - hrvoje.senjan@gmail.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package plasma5-workspace
|
||||
#
|
||||
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: plasma5-workspace
|
||||
Version: 5.1.2
|
||||
Version: 5.2.0
|
||||
Release: 0
|
||||
Summary: The KDE Plasma Workspace Components
|
||||
License: GPL-2.0+
|
||||
@ -34,38 +34,36 @@ Patch1: create_kdehome.patch
|
||||
Patch2: 0003-Remove-export-of-QT_PLUGIN_PATH.patch
|
||||
# PATCHES 100-1000 and above are from upstream 5.1 branch
|
||||
# PATCHES 1000 and above are from upstream master/5.2 branch
|
||||
# PATCH-FIX-UPSTREAM 0001-LocationRunner-Convert-case-insensitive-path-to-a-pr.patch -- kde#333395
|
||||
Patch1000: 0001-LocationRunner-Convert-case-insensitive-path-to-a-pr.patch
|
||||
# PATCH-FIX-UPSTREAM 0002-Baloo-Runner-Lower-relevance-because-krunner-does-no.patch -- make sure that applications are shown as top results in krunner
|
||||
Patch1001: 0002-Baloo-Runner-Lower-relevance-because-krunner-does-no.patch
|
||||
BuildRequires: alsa-devel
|
||||
BuildRequires: baloo5-devel >= 5.0.0
|
||||
BuildRequires: kactivities5-devel >= 5.0.0
|
||||
BuildRequires: kcmutils-devel >= 5.0.0
|
||||
BuildRequires: kcoreaddons-devel >= 5.0.0
|
||||
BuildRequires: kcrash-devel >= 5.0.0
|
||||
BuildRequires: kdeclarative-devel >= 5.0.0
|
||||
BuildRequires: kdelibs4support-devel >= 5.0.0
|
||||
BuildRequires: kdesu-devel >= 5.0.0
|
||||
BuildRequires: kdewebkit-devel >= 5.0.0
|
||||
BuildRequires: kdoctools-devel >= 5.0.0
|
||||
BuildRequires: baloo5-devel >= %{version}
|
||||
BuildRequires: kactivities5-devel >= 5.6.0
|
||||
BuildRequires: kcmutils-devel >= 5.6.0
|
||||
BuildRequires: kcoreaddons-devel >= 5.6.0
|
||||
BuildRequires: kcrash-devel >= 5.6.0
|
||||
BuildRequires: kdeclarative-devel >= 5.6.0
|
||||
BuildRequires: kdelibs4support-devel >= 5.6.0
|
||||
BuildRequires: kdesu-devel >= 5.6.0
|
||||
BuildRequires: kdewebkit-devel >= 5.6.0
|
||||
BuildRequires: kdoctools-devel >= 5.6.0
|
||||
BuildRequires: kf5-filesystem
|
||||
BuildRequires: kidletime-devel >= 5.0.0
|
||||
BuildRequires: kjsembed-devel >= 5.0.0
|
||||
BuildRequires: knewstuff-devel >= 5.0.0
|
||||
BuildRequires: knotifyconfig-devel >= 5.0.0
|
||||
BuildRequires: krunner-devel >= 5.0.0
|
||||
BuildRequires: ktexteditor-devel >= 5.0.0
|
||||
BuildRequires: kwallet-framework-devel >= 5.0.0
|
||||
BuildRequires: kwin5-devel
|
||||
BuildRequires: libkscreen2-devel
|
||||
BuildRequires: libksysguard5-devel
|
||||
BuildRequires: kidletime-devel >= 5.6.0
|
||||
BuildRequires: kjsembed-devel >= 5.6.0
|
||||
BuildRequires: knewstuff-devel >= 5.6.0
|
||||
BuildRequires: knotifyconfig-devel >= 5.6.0
|
||||
BuildRequires: krunner-devel >= 5.6.0
|
||||
BuildRequires: ktexteditor-devel >= 5.6.0
|
||||
BuildRequires: kwallet-framework-devel >= 5.6.0
|
||||
BuildRequires: kwayland-devel >= %{version}
|
||||
BuildRequires: kwin5-devel >= %{version}
|
||||
BuildRequires: libkscreen2-devel >= %{version}
|
||||
BuildRequires: libksysguard5-devel >= %{version}
|
||||
BuildRequires: libxcb-devel
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: phonon4qt5-devel
|
||||
BuildRequires: plasma-framework-devel >= 5.0.0
|
||||
BuildRequires: solid-devel >= 5.0.0
|
||||
BuildRequires: plasma-framework-devel >= 5.6.0
|
||||
BuildRequires: solid-devel >= 5.6.0
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: wayland-devel >= 1.3.0
|
||||
BuildRequires: xz
|
||||
BuildRequires: pkgconfig(Qt5Concurrent) >= 5.3.0
|
||||
BuildRequires: pkgconfig(Qt5DBus) >= 5.3.0
|
||||
@ -86,31 +84,30 @@ BuildRequires: pkgconfig(xcursor)
|
||||
BuildRequires: pkgconfig(xrender)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
Conflicts: kdebase4-workspace
|
||||
Provides: baloo5-runner
|
||||
Obsoletes: baloo5-runner
|
||||
Provides: plasma-workspace5 = %{version}
|
||||
Obsoletes: plasma-workspace5 <= %{version}
|
||||
Requires: %{name}-branding = %{_plasma5_branding_version}
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
# used within startup
|
||||
Requires: kde-cli-tools5
|
||||
Requires: kde-cli-tools5 >= %{version}
|
||||
Requires: kded
|
||||
Requires: kdelibs4support
|
||||
Requires: kinit
|
||||
Requires: kwin5
|
||||
Requires: kwin5 >= %{version}
|
||||
Requires: libqt5-qttools >= 5.3.0
|
||||
# contains default style, cursors, etc
|
||||
Requires: breeze
|
||||
Requires: breeze >= %{version}
|
||||
# needed by krunner
|
||||
Requires: milou5
|
||||
Requires: milou5 >= %{version}
|
||||
# heavily used by plasma
|
||||
Requires: libqt5-qtquickcontrols
|
||||
# battery applet
|
||||
Requires: drkonqi5
|
||||
Requires: kglobalaccel5
|
||||
Requires: drkonqi5 >= %{version}
|
||||
Requires: kglobalaccel5 >= %{version}
|
||||
Requires: solid-imports
|
||||
# dialog/platformtheme/etc
|
||||
Requires: frameworkintegration-plugin
|
||||
Requires: libkscreen2-plugin
|
||||
Requires: libkscreen2-plugin >= %{version}
|
||||
# boo#912317
|
||||
Requires: oxygen5-sounds >= %{version}
|
||||
# hardcode versions of plasma-framework-componets and plasma-framework-private packages, as upstream doesn't keep backwards compability there
|
||||
%requires_ge plasma-framework-components
|
||||
%requires_ge plasma-framework-private
|
||||
@ -159,6 +156,19 @@ does not need focus for them to be activated.
|
||||
%package libs
|
||||
Summary: The KDE Plasma Workspace Components
|
||||
Group: Development/Libraries/KDE
|
||||
%requires_ge libQt5Core5
|
||||
%requires_ge libQt5DBus5
|
||||
%requires_ge libQt5Gui5
|
||||
%requires_ge libQt5Widgets5
|
||||
%requires_ge libQt5X11Extras5
|
||||
%requires_ge libksysguard5
|
||||
%requires_ge libKF5CoreAddons5
|
||||
%requires_ge libKF5WindowSystem5
|
||||
%requires_ge libKF5Activities5
|
||||
%requires_ge libKF5I18n5
|
||||
%requires_ge kservice
|
||||
%requires_ge kio
|
||||
%requires_ge plasma-framework
|
||||
|
||||
%description libs
|
||||
This package contains the basic packages for a K Desktop Environment
|
||||
@ -167,7 +177,7 @@ workspace.
|
||||
%package devel
|
||||
Summary: The KDE Plasma Workspace Components
|
||||
Group: Development/Libraries/KDE
|
||||
Requires: %{name}-libs = %{version}
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
Conflicts: kdebase4-workspace-devel
|
||||
Provides: plasma-workspace5-devel = %{version}
|
||||
Obsoletes: plasma-workspace5-devel <= %{version}
|
||||
@ -182,8 +192,6 @@ workspace. Development files.
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch1000 -p1
|
||||
%patch1001 -p1
|
||||
|
||||
%build
|
||||
%cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5
|
||||
@ -244,6 +252,7 @@ workspace. Development files.
|
||||
%{_kf5_configdir}/autostart/krunner.desktop
|
||||
%config %{_kf5_configdir}/plasmoids.knsrc
|
||||
%config %{_kf5_configdir}/wallpaper.knsrc
|
||||
%config %{_kf5_configdir}/taskmanagerrulesrc
|
||||
%dir %{_kf5_libdir}/libexec
|
||||
%{_kf5_libdir}/libexec/kcheckpass
|
||||
%{_kf5_libdir}/libexec/kscreenlocker_greet
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user