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

update in the right project

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=255
This commit is contained in:
Hrvoje Senjan 2016-09-17 18:40:56 +00:00 committed by Git OBS Bridge
parent eaa0fb32c8
commit 0af1e5c68b
9 changed files with 74 additions and 988 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Configuration-option-for-System-Tray-icon-size.patch
View File

@ -1,42 +0,0 @@
From: Marco Martin <notmart@gmail.com>
Date: Thu, 14 Jul 2016 11:02:25 +0000
Subject: Configuration option for System Tray's icon size
X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=7f060403a2d44fc76b2b14fc9ebf43ee272d1c54
---
Configuration option for System Tray's icon size
the option is not user exposed, so can only either be set manually
or by the default configuration script in the look and feel kcm
patch by John Salatas jsalatas@gmail.com
REVIEW:128400
---
--- a/applets/systemtray/package/contents/config/main.xml
+++ b/applets/systemtray/package/contents/config/main.xml
@@ -45,6 +45,9 @@
<entry name="knownItems" type="StringList">
<default></default>
</entry>
+ <entry name="iconSize" type="Int">
+ <default>2</default>
+ </entry>
</group>
</kcfg>
--- a/applets/systemtray/package/contents/ui/main.qml
+++ b/applets/systemtray/package/contents/ui/main.qml
@@ -30,8 +30,10 @@
Layout.minimumHeight: vertical ? tasksRow.implicitHeight + (expander.visible ? expander.implicitHeight : 0) + units.smallSpacing : units.smallSpacing
+ property var iconSizes: ["small", "smallMedium", "medium", "large", "huge", "enormous"];
+
property bool vertical: plasmoid.formFactor == PlasmaCore.Types.Vertical
- property int itemSize: units.roundToIconSize(Math.min(Math.min(width, height), units.iconSizes.medium))
+ property int itemSize: units.roundToIconSize(Math.min(Math.min(width, height), units.iconSizes[iconSizes[plasmoid.configuration.iconSize]]))
property int hiddenItemSize: units.iconSizes.smallMedium
property alias expanded: dialog.visible
property Item activeApplet

362
Use-iconName-instead-of-icon-in-all-runners.patch
View File

@ -1,362 +0,0 @@
From: Kai Uwe Broulik <kde@privat.broulik.de>
Date: Fri, 17 Jun 2016 19:23:39 +0000
Subject: Use iconName instead of icon in all runners
X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=e1692f1a21458986fac18daf6eb1d1037c9d5051
---
Use iconName instead of icon in all runners
Also bump Frameworks version requirement to 5.24 for this
Differential Revision: https://phabricator.kde.org/D1922
---
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
set(QT_MIN_VERSION "5.6.0")
-set(KF5_MIN_VERSION "5.18.0")
+set(KF5_MIN_VERSION "5.24.0")
set(INSTALL_SDDM_THEME TRUE)
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick QuickWidgets Concurrent Test Script Network)
find_package(ECM 1.8.0 REQUIRED NO_MODULE)
--- a/runners/activities/activityrunner.cpp
+++ b/runners/activities/activityrunner.cpp
@@ -158,7 +158,7 @@
Plasma::QueryMatch match(this);
match.setData(activity.id());
match.setType(Plasma::QueryMatch::ExactMatch);
- match.setIcon(activity.icon().isEmpty() ? QIcon::fromTheme(QStringLiteral("preferences-activities")) : QIcon::fromTheme(activity.icon()));
+ match.setIconName(activity.icon().isEmpty() ? QStringLiteral("preferences-activities") : activity.icon());
match.setText(i18n("Switch to \"%1\"", activity.name()));
match.setRelevance(0.7 + ((activity.state() == KActivities::Info::Running ||
activity.state() == KActivities::Info::Starting) ? 0.1 : 0));
--- a/runners/baloo/baloosearchrunner.cpp
+++ b/runners/baloo/baloosearchrunner.cpp
@@ -115,7 +115,7 @@
const QUrl url = QUrl::fromLocalFile(localUrl);
QString iconName = mimeDb.mimeTypeForFile(localUrl).iconName();
- match.setIcon(QIcon::fromTheme(iconName));
+ match.setIconName(iconName);
match.setId(it.filePath());
match.setText(url.fileName());
match.setData(url);
--- a/runners/calculator/calculatorrunner.cpp
+++ b/runners/calculator/calculatorrunner.cpp
@@ -215,7 +215,7 @@
if (cmd.toLower() == QLatin1String("universe") || cmd.toLower() == QLatin1String("life")) {
Plasma::QueryMatch match(this);
match.setType(Plasma::QueryMatch::InformationalMatch);
- match.setIcon(QIcon::fromTheme(QStringLiteral("accessories-calculator")));
+ match.setIconName(QStringLiteral("accessories-calculator"));
match.setText(QStringLiteral("42"));
match.setData("42");
match.setId(term);
@@ -264,7 +264,7 @@
Plasma::QueryMatch match(this);
match.setType(Plasma::QueryMatch::InformationalMatch);
- match.setIcon(QIcon::fromTheme(QStringLiteral("accessories-calculator")));
+ match.setIconName(QStringLiteral("accessories-calculator"));
match.setText(result);
match.setData(result);
match.setId(term);
--- a/runners/kill/killrunner.cpp
+++ b/runners/kill/killrunner.cpp
@@ -141,7 +141,7 @@
Plasma::QueryMatch match(this);
match.setText(i18n("Terminate %1", name));
match.setSubtext(i18n("Process ID: %1\nRunning as user: %2", QString::number(pid), user));
- match.setIcon(QIcon::fromTheme(QStringLiteral("application-exit")));
+ match.setIconName(QStringLiteral("application-exit"));
match.setData(data);
match.setId(name);
--- a/runners/locations/locationrunner.cpp
+++ b/runners/locations/locationrunner.cpp
@@ -61,9 +61,9 @@
match.setText(i18n("Open %1", term));
if (type == Plasma::RunnerContext::File) {
- match.setIcon(QIcon::fromTheme(KIO::iconNameForUrl(QUrl(term))));
- } else {
- match.setIcon(QIcon::fromTheme(QStringLiteral("system-file-manager")));
+ match.setIconName(KIO::iconNameForUrl(QUrl(term)));
+ } else {
+ match.setIconName(QStringLiteral("system-file-manager"));
}
match.setRelevance(1);
@@ -81,7 +81,7 @@
Plasma::QueryMatch match(this);
match.setType(Plasma::QueryMatch::ExactMatch);
match.setText(i18n("Open %1", term));
- match.setIcon(QIcon::fromTheme(QStringLiteral("system-help")));
+ match.setIconName(QStringLiteral("system-help"));
match.setRelevance(1);
match.setType(Plasma::QueryMatch::ExactMatch);
match.setId(QStringLiteral("help"));
@@ -101,7 +101,7 @@
Plasma::QueryMatch match(this);
match.setText(i18n("Go to %1", url.toDisplayString()));
- match.setIcon(QIcon::fromTheme(KProtocolInfo::icon(url.scheme())));
+ match.setIconName(KProtocolInfo::icon(url.scheme()));
match.setData(url.url());
if (KProtocolInfo::isHelperProtocol(url.scheme())) {
--- a/runners/powerdevil/PowerDevilRunner.cpp
+++ b/runners/powerdevil/PowerDevilRunner.cpp
@@ -197,7 +197,7 @@
}
Plasma::QueryMatch match(this);
match.setType(Plasma::QueryMatch::ExactMatch);
- match.setIcon(QIcon::fromTheme(m_profileIcon[i.key()]));
+ match.setIconName(m_profileIcon[i.key()]);
match.setText(i18n("Set Profile to '%1'", i.value()));
match.setData(i.key());
match.setRelevance(1);
@@ -217,7 +217,7 @@
int brightness = qBound(0, b, 100);
Plasma::QueryMatch match(this);
match.setType(Plasma::QueryMatch::ExactMatch);
- match.setIcon(QIcon::fromTheme(QStringLiteral("preferences-system-power-management")));
+ match.setIconName(QStringLiteral("preferences-system-power-management"));
match.setText(i18n("Set Brightness to %1", brightness));
match.setData(brightness);
match.setRelevance(1);
@@ -227,7 +227,7 @@
} else {
Plasma::QueryMatch match1(this);
match1.setType(Plasma::QueryMatch::ExactMatch);
- match1.setIcon(QIcon::fromTheme(QStringLiteral("preferences-system-power-management")));
+ match1.setIconName(QStringLiteral("preferences-system-power-management"));
match1.setText(i18n("Dim screen totally"));
match1.setRelevance(1);
match1.setId(QStringLiteral("DimTotal"));
@@ -235,7 +235,7 @@
Plasma::QueryMatch match2(this);
match2.setType(Plasma::QueryMatch::ExactMatch);
- match2.setIcon(QIcon::fromTheme(QStringLiteral("preferences-system-power-management")));
+ match2.setIconName(QStringLiteral("preferences-system-power-management"));
match2.setText(i18n("Dim screen by half"));
match2.setRelevance(1);
match2.setId(QStringLiteral("DimHalf"));
@@ -272,12 +272,12 @@
switch ((Solid::PowerManagement::SleepState)value) {
case Solid::PowerManagement::SuspendState:
case Solid::PowerManagement::StandbyState:
- match.setIcon(QIcon::fromTheme(QStringLiteral("system-suspend")));
+ match.setIconName(QStringLiteral("system-suspend"));
match.setText(i18n("Suspend to RAM"));
match.setRelevance(1);
break;
case Solid::PowerManagement::HibernateState:
- match.setIcon(QIcon::fromTheme(QStringLiteral("system-suspend-hibernate")));
+ match.setIconName(QStringLiteral("system-suspend-hibernate"));
match.setText(i18n("Suspend to Disk"));
match.setRelevance(0.99);
break;
--- a/runners/recentdocuments/recentdocuments.cpp
+++ b/runners/recentdocuments/recentdocuments.cpp
@@ -36,7 +36,6 @@
{
Q_UNUSED(args);
setObjectName( QStringLiteral("Recent Documents" ));
- m_icon = QIcon::fromTheme(QStringLiteral("document-open-recent"));
loadRecentDocuments();
// listen for changes to the list of recent documents
KDirWatch *recentDocWatch = new KDirWatch(this);
@@ -53,7 +52,6 @@
void RecentDocuments::loadRecentDocuments()
{
- //qDebug() << "Refreshing recent documents.";
m_recentdocuments = KRecentDocument::recentDocuments();
}
@@ -79,10 +77,11 @@
Plasma::QueryMatch match(this);
match.setType(Plasma::QueryMatch::PossibleMatch);
match.setRelevance(1.0);
- match.setIcon(QIcon::fromTheme(config.readIcon()));
+ match.setIconName(config.readIcon());
match.setData(config.readUrl());
match.setText(config.readName());
match.setSubtext(i18n("Recent Document"));
+
context.addMatch(match);
}
}
--- a/runners/recentdocuments/recentdocuments.h
+++ b/runners/recentdocuments/recentdocuments.h
@@ -41,7 +41,6 @@
void loadRecentDocuments();
private:
- QIcon m_icon;
QStringList m_recentdocuments;
};
--- a/runners/services/servicerunner.cpp
+++ b/runners/services/servicerunner.cpp
@@ -253,9 +253,9 @@
Plasma::QueryMatch match(this);
match.setType(Plasma::QueryMatch::HelperMatch);
if (!action.icon().isEmpty()) {
- match.setIcon(QIcon::fromTheme(action.icon()));
+ match.setIconName(action.icon());
} else {
- match.setIcon(QIcon::fromTheme(service->icon()));
+ match.setIconName(service->icon());
}
match.setText(i18nc("Jump list search result, %1 is action (eg. open new tab), %2 is application (eg. browser)",
"%1 - %2", action.text(), service->name()));
@@ -310,7 +310,7 @@
}
if (!service->icon().isEmpty()) {
- match.setIcon(QIcon::fromTheme(service->icon()));
+ match.setIconName(service->icon());
}
}
--- a/runners/sessions/sessionrunner.cpp
+++ b/runners/sessions/sessionrunner.cpp
@@ -84,7 +84,7 @@
term.compare(i18n("log out"), Qt::CaseInsensitive) == 0) {
Plasma::QueryMatch match(this);
match.setText(i18nc("log out command","Logout"));
- match.setIcon(QIcon::fromTheme(QStringLiteral("system-log-out")));
+ match.setIconName(QStringLiteral("system-log-out"));
match.setData(LogoutAction);
match.setType(Plasma::QueryMatch::ExactMatch);
match.setRelevance(0.9);
@@ -93,7 +93,7 @@
term.compare(i18nc("restart computer command", "reboot"), Qt::CaseInsensitive) == 0) {
Plasma::QueryMatch match(this);
match.setText(i18n("Restart the computer"));
- match.setIcon(QIcon::fromTheme(QStringLiteral("system-reboot")));
+ match.setIconName(QStringLiteral("system-reboot"));
match.setData(RestartAction);
match.setType(Plasma::QueryMatch::ExactMatch);
match.setRelevance(0.9);
@@ -101,7 +101,7 @@
} else if (term.compare(i18nc("shutdown computer command","shutdown"), Qt::CaseInsensitive) == 0) {
Plasma::QueryMatch match(this);
match.setText(i18n("Shutdown the computer"));
- match.setIcon(QIcon::fromTheme(QStringLiteral("system-shutdown")));
+ match.setIconName(QStringLiteral("system-shutdown"));
match.setData(ShutdownAction);
match.setType(Plasma::QueryMatch::ExactMatch);
match.setRelevance(0.9);
@@ -110,7 +110,7 @@
if (KAuthorized::authorizeKAction(QStringLiteral("lock_screen"))) {
Plasma::QueryMatch match(this);
match.setText(i18n("Lock the screen"));
- match.setIcon(QIcon::fromTheme(QStringLiteral("system-lock-screen")));
+ match.setIconName(QStringLiteral("system-lock-screen"));
match.setData(LockAction);
match.setType(Plasma::QueryMatch::ExactMatch);
match.setRelevance(0.9);
@@ -161,7 +161,7 @@
dm.numReserve() >= 0) {
Plasma::QueryMatch match(this);
match.setType(Plasma::QueryMatch::ExactMatch);
- match.setIcon(QIcon::fromTheme(QStringLiteral("system-switch-user")));
+ match.setIconName(QStringLiteral("system-switch-user"));
match.setText(i18n("New Session"));
matches << match;
}
@@ -198,7 +198,7 @@
Plasma::QueryMatch match(this);
match.setType(type);
match.setRelevance(relevance);
- match.setIcon(QIcon::fromTheme(QStringLiteral("user-identity")));
+ match.setIconName(QStringLiteral("user-identity"));
match.setText(name);
match.setData(QString::number(session.vt));
matches << match;
--- a/runners/shell/shellrunner.cpp
+++ b/runners/shell/shellrunner.cpp
@@ -66,7 +66,7 @@
Plasma::QueryMatch match(this);
match.setId(term);
match.setType(Plasma::QueryMatch::ExactMatch);
- match.setIcon(QIcon::fromTheme(QStringLiteral("system-run")));
+ match.setIconName(QStringLiteral("system-run"));
match.setText(i18n("Run %1", term));
match.setRelevance(0.7);
context.addMatch(match);
--- a/runners/webshortcuts/webshortcutrunner.cpp
+++ b/runners/webshortcuts/webshortcutrunner.cpp
@@ -32,8 +32,6 @@
Q_UNUSED(args);
setObjectName( QLatin1String("Web Shortcut" ));
setIgnoredTypes(Plasma::RunnerContext::Directory | Plasma::RunnerContext::File | Plasma::RunnerContext::Executable);
-
- m_icon = QIcon::fromTheme(QStringLiteral("internet-web-browser"));
m_match.setType(Plasma::QueryMatch::ExactMatch);
m_match.setRelevance(0.9);
@@ -134,7 +132,7 @@
m_match.setData(filterData.uri().url());
m_match.setId("WebShortcut:" + key);
- m_match.setIcon(QIcon::fromTheme(filterData.iconName()));
+ m_match.setIconName(filterData.iconName());
m_match.setText(i18n("Search %1 for %2", m_lastProvider, filterData.searchTerm()));
context.addMatch(m_match);
}
--- a/runners/webshortcuts/webshortcutrunner.h
+++ b/runners/webshortcuts/webshortcutrunner.h
@@ -41,7 +41,6 @@
void resetState();
private:
- QIcon m_icon;
Plasma::QueryMatch m_match;
bool m_filterBeforeRun;
--- a/runners/windowedwidgets/windowedwidgetsrunner.cpp
+++ b/runners/windowedwidgets/windowedwidgetsrunner.cpp
@@ -120,7 +120,7 @@
}
if (!service->icon().isEmpty()) {
- match.setIcon(QIcon::fromTheme(service->icon()));
+ match.setIconName(service->icon());
}
}
--- a/runners/windows/windowsrunner.cpp
+++ b/runners/windows/windowsrunner.cpp
@@ -399,7 +399,7 @@
match.setType(Plasma::QueryMatch::ExactMatch);
match.setData(desktop);
match.setId("desktop-" + QString::number(desktop));
- match.setIcon(QIcon::fromTheme(QStringLiteral("user-desktop")));
+ match.setIconName(QStringLiteral("user-desktop"));
QString desktopName;
if (desktop <= m_desktopNames.size()) {
desktopName = m_desktopNames[desktop - 1];

304
add-separate-autostart-file-for-klipper.patch
View File

@ -1,304 +0,0 @@
From: Jonathan Riddell <jr@jriddell.org>
Date: Mon, 01 Aug 2016 09:49:45 +0000
Subject: add separate autostart file for klipper
X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=7ff606de2c7bcd8d2ea2893f01390b48f8b283e3
---
add separate autostart file for klipper
Summary: add separate autostart file for klipper
Test Plan: install
Subscribers: plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D2323
---
--- a/klipper/CMakeLists.txt
+++ b/klipper/CMakeLists.txt
@@ -65,7 +65,7 @@
install(TARGETS klipper ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(PROGRAMS org.kde.klipper.desktop DESTINATION ${KDE_INSTALL_APPDIR})
-install(PROGRAMS org.kde.klipper.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR})
+install(PROGRAMS klipper.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR})
# Plasma Data Engine
set(plasma_engine_clipboard_SRCS ${libklipper_common_SRCS} clipboardengine.cpp clipboardservice.cpp clipboardjob.cpp)
--- /dev/null
+++ b/klipper/klipper.desktop
@@ -0,0 +1,269 @@
+[Desktop Entry]
+Name=Klipper
+Name[af]=Klipper
+Name[ar]=مقصّ.ك
+Name[be]=Klipper
+Name[be@latin]=Klipper
+Name[bg]=Klipper
+Name[bn]=ক্লিপার
+Name[bn_IN]=Klipper
+Name[br]=Klipper
+Name[bs]=Kliper
+Name[ca]=Klipper
+Name[ca@valencia]=Klipper
+Name[cs]=Klipper
+Name[csb]=Klipper
+Name[cy]=Klipper
+Name[da]=Klipper
+Name[de]=Klipper
+Name[el]=Klipper
+Name[en_GB]=Klipper
+Name[eo]=Poŝilo
+Name[es]=Klipper
+Name[et]=Klipper
+Name[eu]=Klipper
+Name[fa]=Klipper
+Name[fi]=Klipper
+Name[fr]=Klipper
+Name[fy]=Klipper
+Name[ga]=Klipper
+Name[gl]=Klipper
+Name[gu]=ક્લિપર
+Name[he]=Klipper
+Name[hi]=क्लिपर
+Name[hne]=क्लिपर
+Name[hr]=Klipper
+Name[hsb]=Klipper
+Name[hu]=Klipper
+Name[ia]=Klipper
+Name[id]=Klipper
+Name[is]=Klipper
+Name[it]=Klipper
+Name[ja]=Klipper
+Name[ka]=Klipper
+Name[kk]=Алмасу буфері
+Name[km]=Klipper
+Name[kn]=ಕ್ಲಿಪ್ಪರ್
+Name[ko]=Klipper
+Name[ku]=Klipper
+Name[lt]=Klipper
+Name[lv]=Klipper
+Name[mai]=क्लिपर
+Name[mk]=Клипер
+Name[ml]=ക്ലിപ്പര്‍
+Name[mr]=क्लिपर
+Name[ms]=Klipper
+Name[nb]=Klipper
+Name[nds]=Klipper
+Name[ne]=क्लिपर
+Name[nl]=Klipper
+Name[nn]=Klipper
+Name[pa]=ਕੇਲਿਪਰ
+Name[pl]=Klipper
+Name[pt]=Klipper
+Name[pt_BR]=Klipper
+Name[ro]=Klipper
+Name[ru]=Klipper
+Name[se]=Klipper
+Name[si]=Klipper
+Name[sk]=Klipper
+Name[sl]=Klipper
+Name[sr]=Клипер
+Name[sr@ijekavian]=Клипер
+Name[sr@ijekavianlatin]=Klipper
+Name[sr@latin]=Klipper
+Name[sv]=Klipper
+Name[ta]=க்ளிப்பர்
+Name[te]=క్లిప్పర్
+Name[tg]=Клиппер
+Name[th]=คลิปเปอร์
+Name[tr]=Klipper
+Name[ug]=Klipper
+Name[uk]=Klipper
+Name[uz]=Klipper
+Name[uz@cyrillic]=Klipper
+Name[vi]=Klipper
+Name[wa]=Klipper
+Name[xh]=Klipper
+Name[x-test]=xxKlipperxx
+Name[zh_CN]=Klipper
+Name[zh_TW]=剪貼薄(Klipper)
+GenericName=Clipboard Tool
+GenericName[af]=Klipbord Program
+GenericName[ar]=أداة حافظة
+GenericName[be]=Буфер абмену
+GenericName[be@latin]=Pryłada, jakaja absłuhoŭvaje abmienny bufer
+GenericName[bg]=Системен буфер
+GenericName[bn]=ক্লিপবোর্ড টুল
+GenericName[br]=Ostilh ar golver
+GenericName[bs]=Alatka za klipbord
+GenericName[ca]=Eina de porta-retalls
+GenericName[ca@valencia]=Eina de porta-retalls
+GenericName[cs]=Program pro práci se schránkou
+GenericName[csb]=Nôrzãdze tacnika
+GenericName[cy]=Offeryn Gludfwrdd
+GenericName[da]=Udklipsholderværktøj
+GenericName[de]=Verwaltung der Zwischenablage
+GenericName[el]=Εργαλείο πρόχειρου
+GenericName[en_GB]=Clipboard Tool
+GenericName[eo]=Ilo por la poŝo
+GenericName[es]=Portapapeles
+GenericName[et]=Lõikepuhvri haldamine
+GenericName[eu]=Arbeleko tresna
+GenericName[fa]=ابزار تخته‌یادداشت
+GenericName[fi]=Leikepöytätyökalu
+GenericName[fr]=Presse-papier
+GenericName[fy]=Klamboerdbehear
+GenericName[ga]=Uirlis Ghearrthaisce
+GenericName[gl]=Utilidade de portarretallos
+GenericName[gu]=ક્લિપ બોર્ડ સાધન
+GenericName[he]=כלי לוח גזירה
+GenericName[hi]=क्लिपबोर्ड औज़ार
+GenericName[hne]=क्लिपबोर्ड औजार
+GenericName[hr]=Alat međuspremnika
+GenericName[hsb]=Zapisnik
+GenericName[hu]=Vágólapkezelő
+GenericName[ia]=Instrumento de Area de transferentia
+GenericName[id]=Alat Papan Klip
+GenericName[is]=Klippispjaldstól
+GenericName[it]=Strumento per gli appunti
+GenericName[ja]=クリップボードツール
+GenericName[ka]=გაცვლის ბუფერის უტილიტა
+GenericName[kk]=Алмасу буфер құралы
+GenericName[km]=ឧបករណ៍​ក្ដារ​តម្បៀត​ខ្ទាស់
+GenericName[kn]=ಹಿಡಿಕೆ ಕಟ್ಟು (ಕ್ಲಿಪ್ ಬೋರ್ಡ್) ಸಲಕರಣೆ
+GenericName[ko]=클립보드 도구
+GenericName[lt]=Iškarpinės tvarkytuvė
+GenericName[lv]=Starpliktuves rīks
+GenericName[mai]=क्लिपबोर्ड अओजार
+GenericName[mk]=Алатка за табла со исечоци
+GenericName[ml]=ക്ലിപ്ബോര്‍ഡ് ഉപകരണം
+GenericName[mr]=क्लिपबोर्ड साधन
+GenericName[ms]=Alat Klipbod
+GenericName[nb]=Utklippstavle
+GenericName[nds]=Twischenaflaag-Warktüüch
+GenericName[ne]=क्लिपबोर्ड उपकरण
+GenericName[nl]=Klembordbeheer
+GenericName[nn]=Utklippstavle
+GenericName[pa]=ਕਲਿੱਪਬੋਰਡ ਟੂਲ
+GenericName[pl]=Narzędzie schowka
+GenericName[pt]=Ferramenta da Área de Transferência
+GenericName[pt_BR]=Ferramenta da área de transferência
+GenericName[ro]=Utilitar de clipboard
+GenericName[ru]=Монитор буфера обмена
+GenericName[se]=Čuohpusgirjereaidu
+GenericName[si]=ක්ලිප් පුවරු මෙවලම
+GenericName[sk]=Nástroj pre schránku
+GenericName[sl]=Orodje za odložišče
+GenericName[sr]=Алатка за клипборд
+GenericName[sr@ijekavian]=Алатка за клипборд
+GenericName[sr@ijekavianlatin]=Alatka za klipbord
+GenericName[sr@latin]=Alatka za klipbord
+GenericName[sv]=Klippbordsverktyg
+GenericName[ta]=தற்காலிக கருவி
+GenericName[te]=క్లిప్ బోర్డ్ పనిముట్టు
+GenericName[tg]=Утилита для буфера обмена
+GenericName[th]=เครื่องมือคลิปบอร์ด
+GenericName[tr]=Pano Aracı
+GenericName[ug]=چاپلاش تاختىسى قورالى
+GenericName[uk]=Утиліта буфера даних
+GenericName[uz]=Klipbord vositasi
+GenericName[uz@cyrillic]=Клипборд воситаси
+GenericName[vi]=Công cụ bảng nhớ tạm
+GenericName[wa]=Usteye presse-papî
+GenericName[xh]=Isixhobo Sebhodi eqhoboshayo
+GenericName[x-test]=xxClipboard Toolxx
+GenericName[zh_CN]=剪贴板工具
+GenericName[zh_TW]=剪貼簿工具
+Exec=klipper
+Icon=klipper
+Type=Application
+X-DocPath=klipper/index.html
+Terminal=false
+X-KDE-autostart-after=panel
+X-KDE-StartupNotify=false
+X-DBUS-StartupType=Unique
+X-DBUS-ServiceName=org.kde.klipper
+X-KDE-UniqueApplet=true
+X-KDE-autostart-condition=klipperrc:General:AutoStart:false
+OnlyShowIn=KDE;
+Categories=Qt;KDE;Utility;X-KDE-Utilities-Desktop;
+Comment=A cut & paste history utility
+Comment[af]='n Knip & plak geskiedenis program
+Comment[ar]=أداة تأريخ القصّ واللصق
+Comment[be]=Службовая праграма працы з гісторыяй выразання/устаўкі
+Comment[be@latin]=Pryłada dla prahladu historyi aperacyjaŭ vycinańnia dy ŭklejvańnia
+Comment[bg]=Инструмент за управление на операциите по копиране и поставяне
+Comment[bs]=Alatka za istorijat isecanja i naljepljivanja
+Comment[ca]=Una utilitat de l'historial per retallar i enganxar
+Comment[ca@valencia]=Una utilitat de l'historial per retallar i enganxar
+Comment[cs]=Nástroj pro historii práce se schránkou
+Comment[csb]=Nôrzãdze trzëmôjące historëjã tacnika
+Comment[da]=Et værktøj med historik til at klippe ud og indsætte
+Comment[de]=Programm zur Verwaltung der Zwischenablage
+Comment[el]=Ένα εργαλείο ιστορικού αποκοπής & επικόλλησης
+Comment[en_GB]=A cut & paste history utility
+Comment[eo]=Ilo por la eltonda kaj alglua historio
+Comment[es]=Una utilidad de cortar y pegar historial
+Comment[et]=Lõikamiste ja asetamiste ajaloo rakendus
+Comment[eu]=Ebaki/Itsatsi historiaren tresna bat
+Comment[fa]=برنامه سودمند تاریخچه برش و چسباندن
+Comment[fi]=Työkalu leikkaamiseen ja liittämiseen
+Comment[fr]=Un outil d'historique de copier / coller
+Comment[fy]=Klamboerdhistoarje
+Comment[ga]=Uirlis staire gearrtha agus greamaithe
+Comment[gl]=Un historial de cortar e apegar
+Comment[gu]=ઇતિહાસ કાપવા અને મૂકવાનું સાધન
+Comment[he]=כלי המשמש לשמירת היסטוריה אודות גזירה והדבקה
+Comment[hi]=काटें एवं चिपकाएं इतिहास यूटिलिटी
+Comment[hne]=काटव अउ चिपकाव इतिहास यूटिलिटी
+Comment[hr]=Alat za izrezivanje i preljepljivanje iz povijesti
+Comment[hsb]=Nastroj za wutřihanje a zasunjenje z prjedawšich přikazow
+Comment[hu]=Kezelőprogram a vágólaphoz (naplózással)
+Comment[ia]=Un utilitate per historia de talia & colla
+Comment[id]=Sebuah utilitas riwayat potong & tempel
+Comment[is]=Klipp & lím sögutól
+Comment[it]=Un programma per la cronologia del copia e incolla
+Comment[ja]=カット＆ペースト履歴ユーティリティ
+Comment[kk]=Қиып алу және орналастыру журналы
+Comment[km]=កាត់ និង​បិទភ្ជាប់​ឧបករណ៍​ប្រើប្រាស់​ប្រវត្តិ
+Comment[kn]=ಕತ್ತರಿಸು ಮತ್ತು ಅಂಟಿಸು ಚರಿತ್ರೆ ಸೌಲಭ್ಯ
+Comment[ko]=자르고 붙인 기록 도구
+Comment[lt]=„Iškirpti ir padėti“ istorijos pagalbinė programa
+Comment[lv]=Izgriešanas un ielīmēšanas vēstures rīks
+Comment[mai]=काटू आओर साटू इतिहास यूटिलिटी
+Comment[mk]=Алатка за историјат на сечење и вметнување
+Comment[ml]=മുറിക്കല്‍-പകര്‍ത്തല്‍ നാള്‍വഴിസൂക്ഷിപ്പുസഹായി.
+Comment[mr]=कापा व चिकटवा इतिहास उपकार्यक्रम
+Comment[nb]=Et verktøy som viser tidligere utklipp
+Comment[nds]=Vörgeschicht vun't Knippen un Infögen
+Comment[ne]=काट्ने र टाँस्ने इतिहास उपयोगिता
+Comment[nl]=Klembordgeschiedenis
+Comment[nn]=Eit verktøy som viser eldre utklipp
+Comment[pa]=ਇੱਕ ਕੱਟਣ ਅਤੇ ਚੇਪਣ ਅਤੀਤ ਸਹੂਲਤ
+Comment[pl]=Narzędzie przechowujące historię schowka
+Comment[pt]=Um utilitário de histórico de cópias e colagens
+Comment[pt_BR]=Um utilitário com o histórico de recortar e colar
+Comment[ro]=Utilitar cu istoria de tăiere și adăugare
+Comment[ru]=История буфера обмена
+Comment[se]=Reaidu mii čájeha boares čuohppusiid
+Comment[si]=කැපීම් හා ඇලවීම් ඉතිහාස මෙවලම
+Comment[sk]=Nástroj pre históriu akcií "Vystrihnúť a vložiť"
+Comment[sl]=Pripomoček z zgodovino za izreži in prilepi
+Comment[sr]=Алатка за историјат исецања и налепљивања
+Comment[sr@ijekavian]=Алатка за историјат исецања и налепљивања
+Comment[sr@ijekavianlatin]=Alatka za istorijat isecanja i nalepljivanja
+Comment[sr@latin]=Alatka za istorijat isecanja i nalepljivanja
+Comment[sv]=Ett verktyg med historik för klipp ut och klistra in
+Comment[ta]=A cut & paste history utility
+Comment[te]=కత్తిరించు & అతికించు చరిత్ర సౌలభ్యం
+Comment[tg]=История буфера обмена
+Comment[th]=เครื่องมือดูประวัติการตัดและวาง
+Comment[tr]=Bir kes & yapıştır geçmişi aracı
+Comment[ug]=كەس ۋە چاپلا تارىخىنى باشقۇرۇش قورالى
+Comment[uk]=Утиліта журналу буфера даних
+Comment[vi]=Công cụ chứa lịch sử các cắt dán
+Comment[wa]=Ene ahesse d' istwere di coper/aclacper
+Comment[x-test]=xxA cut & paste history utilityxx
+Comment[zh_CN]=管理剪切和粘贴历史的工具
+Comment[zh_TW]=剪貼紀錄公用程式
+

181
fix-breeze-sddm-theme-with-many-users.patch
View File

@ -1,181 +0,0 @@
Index: plasma-workspace-5.5.0/lookandfeel/contents/components/UserSelect.qml
===================================================================
--- plasma-workspace-5.5.0.orig/lookandfeel/contents/components/UserSelect.qml
+++ plasma-workspace-5.5.0/lookandfeel/contents/components/UserSelect.qml
@@ -27,11 +27,15 @@ FocusScope {
id: root
property alias model: usersList.model
property alias selectedUser: usersList.selectedUser
+ property var username: usersList.visible ? usersList.selectedUser : userPasswordPrompt.username
+ property alias password: userPasswordPrompt.password
property alias selectedIndex: usersList.currentIndex
property alias selectedItem: usersList.currentItem
property alias delegate: usersList.delegate
property alias notification: notificationLabel.text
property alias infoPaneVisible: infoPaneLoader.active
+ property bool showUserList: (usersList.model.count && usersList.model.disableAvatarsThreshold) ? usersList.model.count <= usersList.model.disableAvatarsThreshold : true
+ property alias pwFieldEnabled: userPasswordPrompt.pwFieldEnabled
activeFocusOnTab: true
@@ -43,6 +47,10 @@ FocusScope {
usersList.decrementCurrentIndex()
}
+ function reenablePasswordInput() {
+ userPasswordPrompt.reenablePasswordInput();
+ }
+
Loader {
id: infoPaneLoader
anchors {
@@ -57,6 +65,7 @@ FocusScope {
id: usersList
focus: true
+ visible: root.showUserList
anchors {
top: parent.top
@@ -96,6 +105,21 @@ FocusScope {
]
}
+ UserPasswordPrompt {
+ id: userPasswordPrompt
+
+ focus: true
+ visible: !root.showUserList
+
+ anchors {
+ left: parent.horizontalCenter
+ top: parent.top
+ right: parent.right
+
+ topMargin: parent.height*0.2
+ }
+ }
+
BreezeLabel {
id: notificationLabel
anchors {
Index: plasma-workspace-5.4.3/lookandfeel/contents/components/UserPasswordPrompt.qml
===================================================================
--- plasma-workspace-5.4.3.orig/lookandfeel/contents/components/UserPasswordPrompt.qml 2015-11-11 16:14:28.277434982 +0100
+++ plasma-workspace-5.4.3/lookandfeel/contents/components/UserPasswordPrompt.qml 2015-11-11 15:25:12.528242834 +0100
@@ -0,0 +1,54 @@
+import QtQuick 2.2
+import SddmComponents 2.0
+import QtQuick.Layouts 1.1
+import org.kde.plasma.components 2.0 as PlasmaComponents
+
+Rectangle {
+ readonly property string username: usernameInput.text
+ readonly property string password: passwordInput.text
+ property alias pwFieldEnabled: passwordInput.enabled
+ color: "transparent"
+
+ function reenablePasswordInput() {
+ passwordInput.enabled = true
+ passwordInput.selectAll()
+ passwordInput.forceActiveFocus()
+ }
+
+ ColumnLayout {
+ anchors.fill: parent
+ PlasmaComponents.TextField {
+ id: usernameInput
+ placeholderText: i18nd("plasma_lookandfeel_org.kde.lookandfeel","Username")
+ onAccepted: nextItemInFocusChain().forceActiveFocus();
+ focus: true
+ text: userModel.lastUser
+ }
+
+ PlasmaComponents.TextField {
+ id: passwordInput
+ placeholderText: i18nd("plasma_lookandfeel_org.kde.lookandfeel","Password")
+ echoMode: TextInput.Password
+ onAccepted: loginPrompt.startLogin()
+ focus: true
+
+ //focus works in qmlscene
+ //but this seems to be needed when loaded from SDDM
+ //I don't understand why, but we have seen this before in the old lock screen
+ Timer {
+ interval: 200
+ running: parent.visible
+ onTriggered: passwordInput.forceActiveFocus()
+ }
+ //end hack
+
+ Keys.onEscapePressed: {
+ //nextItemInFocusChain(false) is previous Item
+ nextItemInFocusChain(false).forceActiveFocus();
+ }
+
+ }
+
+ } // ColumnLayout
+
+}
Index: plasma-workspace-5.4.3/lookandfeel/contents/loginmanager/Main.qml
===================================================================
--- plasma-workspace-5.4.3.orig/lookandfeel/contents/loginmanager/Main.qml 2015-11-05 13:49:30.000000000 +0100
+++ plasma-workspace-5.4.3/lookandfeel/contents/loginmanager/Main.qml 2015-11-11 15:25:12.832242854 +0100
@@ -78,6 +78,9 @@ Image {
initialItem: BreezeBlock {
id: loginPrompt
+ property var showUserList: mainItem.showUserList
+ property var username: mainItem.username
+ property var password: mainItem.showUserList ? controlsItem.password : mainItem.password
//Enable clipping whilst animating, otherwise the items would be shifted to other screens in multiscreen setups
//As there are only 2 items (loginPrompt and logoutScreenComponent), it's sufficient to do it only in this component
@@ -145,13 +148,14 @@ Image {
echoMode: TextInput.Password
onAccepted: loginPrompt.startLogin()
focus: true
+ visible: loginPrompt.mainItem.showUserList
//focus works in qmlscene
//but this seems to be needed when loaded from SDDM
//I don't understand why, but we have seen this before in the old lock screen
Timer {
interval: 200
- running: true
+ running: passwordInput.visible
onTriggered: passwordInput.forceActiveFocus()
}
//end hack
@@ -239,9 +243,13 @@ Image {
target: sddm
onLoginFailed: {
//Re-enable button and textfield
- passwordInput.enabled = true
- passwordInput.selectAll()
- passwordInput.forceActiveFocus()
+ if (loginPrompt.showUserList) {
+ passwordInput.enabled = true
+ passwordInput.selectAll()
+ passwordInput.forceActiveFocus()
+ } else {
+ loginPrompt.mainItem.reenablePasswordInput(true);
+ }
loginButton.enabled = true;
}
}
@@ -250,11 +258,12 @@ Image {
function startLogin () {
//Disable button and textfield while password check is running
+ loginPrompt.mainItem.pwFieldEnabled = false
controlsItem.pwFieldEnabled = false;
controlsItem.buttonEnabled = false;
//Clear notification in case the notificationResetTimer hasn't expired yet
mainItem.notification = ""
- sddm.login(mainItem.selectedUser, controlsItem.password, controlsItem.sessionIndex)
+ sddm.login(loginPrompt.username, loginPrompt.password, controlsItem.sessionIndex)
}
Component {

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

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:116d9af304c212d58163130f1b7d5478085523c967f96f0d9b4ba2c5a73eb9f5
size 6844616

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

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

14
plasma5-workspace.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Thu Sep 15 15:53:55 UTC 2016 - fabian@ritter-vogt.de
- Update to 5.7.95 (Plasma 5.8 Beta)
* New LTS feature release
* For more details please see:
https://www.kde.org/announcements/plasma-5.7.95.php
- Removed patches:
Configuration-option-for-System-Tray-icon-size.patch
Use-iconName-instead-of-icon-in-all-runners.patch
add-separate-autostart-file-for-klipper.patch
fix-breeze-sddm-theme-with-many-users.patch
require-qt56.diff
-------------------------------------------------------------------
Tue Sep 13 17:42:09 UTC 2016 - fabian@ritter-vogt.de

140
plasma5-workspace.spec
View File

@ -16,68 +16,64 @@
#
%define kf5_version 5.26.0
%bcond_without lang
Name: plasma5-workspace
Version: 5.7.5
Version: 5.7.95
Release: 0
%define plasma_version 5.7.5
%define plasma_version 5.7.95
Summary: The KDE Plasma Workspace Components
License: GPL-2.0+
Group: System/GUI/KDE
Url: http://www.kde.org/
Source: http://download.kde.org/stable/plasma/%{version}/plasma-workspace-%{version}.tar.xz
Source: http://download.kde.org/unstable/plasma/%{version}/plasma-workspace-%{version}.tar.xz
Source1: baselibs.conf
# PATCH-FIX_OPENSUSE 0001-Rename-qdbus-in-startkde.patch cgiboudeaux@gmx.com -- Rename the qdbus executable in startkde
Patch0: 0001-Rename-qdbus-in-startkde.patch
# PATCH-FIX_OPENSUSE require-qt56.diff
Patch1: require-qt56.diff
# PATCH-FIX_OPENSUSE fix-breeze-sddm-theme-with-many-users.patch alarrosa@suse.com -- Asks for user/password and hide the user list when there's a large number of users
Patch2: fix-breeze-sddm-theme-with-many-users.patch
# PATCH-FIX-OPENSUSE plasmashell-disable-windowclosing-on-logout.patch kde#349805 wbauer@tmo.at -- Prevent plasma from closing too early on logout resulting in an unusable desktop if the logout is cancelled
Patch4: plasmashell-disable-windowclosing-on-logout.patch
# PATCHES 100-200 and above are from upstream 5.7 branch
# PATCHES 201-300 and above are from upstream master/5.8 branch
# PATCH-FEATURE-UPSTREAM Configuration-option-for-System-Tray-icon-size.patch
Patch201: Configuration-option-for-System-Tray-icon-size.patch
Patch202: add-separate-autostart-file-for-klipper.patch
Patch203: Use-iconName-instead-of-icon-in-all-runners.patch
BuildRequires: breeze5-icons
BuildRequires: fdupes
BuildRequires: kf5-filesystem
BuildRequires: phonon4qt5-devel >= 4.6.60
BuildRequires: update-desktop-files
BuildRequires: cmake(KF5Activities) >= 5.25.0
BuildRequires: cmake(KF5Activities) >= %{kf5_version}
BuildRequires: cmake(KF5Baloo)
BuildRequires: cmake(KF5CoreAddons) >= 5.25.0
BuildRequires: cmake(KF5Crash) >= 5.25.0
BuildRequires: cmake(KF5DBusAddons) >= 5.25.0
BuildRequires: cmake(KF5Declarative) >= 5.25.0
BuildRequires: cmake(KF5DocTools) >= 5.25.0
BuildRequires: cmake(KF5GlobalAccel) >= 5.25.0
BuildRequires: cmake(KF5CoreAddons) >= %{kf5_version}
BuildRequires: cmake(KF5Crash) >= %{kf5_version}
BuildRequires: cmake(KF5DBusAddons) >= %{kf5_version}
BuildRequires: cmake(KF5Declarative) >= %{kf5_version}
BuildRequires: cmake(KF5DocTools) >= %{kf5_version}
BuildRequires: cmake(KF5GlobalAccel) >= %{kf5_version}
%if 0%{?is_opensuse} || 0%{?suse_version} > 1320
BuildRequires: cmake(KF5Holidays)
BuildRequires: cmake(KF5I18n) >= 5.25.0
BuildRequires: cmake(KF5IdleTime) >= 5.25.0
BuildRequires: cmake(KF5JsEmbed) >= 5.25.0
BuildRequires: cmake(KF5KCMUtils) >= 5.25.0
BuildRequires: cmake(KF5KDELibs4Support) >= 5.25.0
BuildRequires: cmake(KF5NetworkManagerQt) >= 5.25.0
BuildRequires: cmake(KF5NewStuff) >= 5.25.0
BuildRequires: cmake(KF5NotifyConfig) >= 5.25.0
BuildRequires: cmake(KF5Package) >= 5.25.0
BuildRequires: cmake(KF5Plasma) >= 5.25.0
%endif
BuildRequires: cmake(KF5I18n) >= %{kf5_version}
BuildRequires: cmake(KF5IdleTime) >= %{kf5_version}
BuildRequires: cmake(KF5JsEmbed) >= %{kf5_version}
BuildRequires: cmake(KF5KCMUtils) >= %{kf5_version}
BuildRequires: cmake(KF5KDELibs4Support) >= %{kf5_version}
BuildRequires: cmake(KF5NetworkManagerQt) >= %{kf5_version}
BuildRequires: cmake(KF5NewStuff) >= %{kf5_version}
BuildRequires: cmake(KF5NotifyConfig) >= %{kf5_version}
BuildRequires: cmake(KF5Package) >= %{kf5_version}
BuildRequires: cmake(KF5Plasma) >= %{kf5_version}
BuildRequires: cmake(KF5PlasmaQuick)
BuildRequires: cmake(KF5Runner) >= 5.25.0
BuildRequires: cmake(KF5Runner) >= %{kf5_version}
BuildRequires: cmake(KF5Screen) >= 5.0.93
BuildRequires: cmake(KF5Solid) >= 5.25.0
BuildRequires: cmake(KF5Su) >= 5.25.0
BuildRequires: cmake(KF5SysGuard) >= %{plasma_version}
BuildRequires: cmake(KF5Solid) >= %{kf5_version}
BuildRequires: cmake(KF5Su) >= %{kf5_version}
BuildRequires: cmake(KF5SysGuard) >= %{_plasma5_version}
BuildRequires: cmake(KF5TextEditor)
BuildRequires: cmake(KF5TextWidgets) >= 5.25.0
BuildRequires: cmake(KF5Wallet) >= 5.25.0
BuildRequires: cmake(KF5Wayland) >= %{plasma_version}
BuildRequires: cmake(KF5TextWidgets) >= %{kf5_version}
BuildRequires: cmake(KF5Wallet) >= %{kf5_version}
BuildRequires: cmake(KF5Wayland) >= %{_plasma5_version}
BuildRequires: cmake(KF5XmlRpcClient)
BuildRequires: cmake(KScreenLocker) >= %{plasma_version}
BuildRequires: cmake(KWinDBusInterface) >= %{plasma_version}
BuildRequires: cmake(KScreenLocker) >= %{_plasma5_version}
BuildRequires: cmake(KWinDBusInterface) >= %{_plasma5_version}
BuildRequires: cmake(Qt5Concurrent) >= 5.4.0
BuildRequires: cmake(Qt5DBus) >= 5.4.0
BuildRequires: cmake(Qt5Network) >= 5.4.0
@ -89,7 +85,7 @@ BuildRequires: cmake(Qt5Sql) >= 5.4.0
BuildRequires: cmake(Qt5Test) >= 5.4.0
BuildRequires: cmake(Qt5Widgets) >= 5.4.0
BuildRequires: cmake(Qt5X11Extras) >= 5.4.0
BuildRequires: cmake(ScreenSaverDBusInterface) >= %{plasma_version}
BuildRequires: cmake(ScreenSaverDBusInterface) >= %{_plasma5_version}
BuildRequires: cmake(dbusmenu-qt5)
BuildRequires: pkgconfig(libgps)
BuildRequires: pkgconfig(libqalculate)
@ -107,34 +103,33 @@ BuildRequires: pkgconfig(zlib)
Conflicts: kdebase4-workspace < 5.3.0
# Some files have been moved from kio-extras5 to plasma5-workspace in 5.4. This should prevent a possible file conflict. (boo#944656)
Conflicts: kio-extras5 < 15.08.0
Requires: %{name}-branding = %{plasma_version}
Requires: %{name}-libs = %{version}-%{release}
# used within startup
Requires: kde-cli-tools5 >= %{plasma_version}
Requires: kde-cli-tools5 >= %{_plasma5_version}
Requires: kded
Requires: kdelibs4support
Requires: kinit
Requires: kscreenlocker >= %{plasma_version}
Requires: kwin5 >= %{plasma_version}
Requires: kscreenlocker >= %{_plasma5_version}
Requires: kwin5 >= %{_plasma5_version}
Requires: libqt5-qttools >= 5.4.0
# /usr/bin/startkde calls xprop
Requires: xprop
# contains default style, cursors, etc
Requires: breeze >= %{plasma_version}
Requires: breeze >= %{_plasma5_version}
# needed by krunner
Requires: milou5 >= %{plasma_version}
Requires: milou5 >= %{_plasma5_version}
# heavily used by plasma
Requires: libqt5-qtquickcontrols
# battery applet
Requires: drkonqi5 >= %{plasma_version}
Requires: kglobalaccel5 >= %{plasma_version}
Requires: drkonqi5 >= %{_plasma5_version}
Requires: kglobalaccel5 >= %{_plasma5_version}
Requires: solid-imports
# dialog/platformtheme/etc
Requires: frameworkintegration-plugin
Requires: kscreen5 >= %{plasma_version}
Requires: libkscreen2-plugin >= %{plasma_version}
Requires: kscreen5 >= %{_plasma5_version}
Requires: libkscreen2-plugin >= %{_plasma5_version}
# boo#912317
Requires: oxygen5-sounds >= %{plasma_version}
Requires: oxygen5-sounds >= %{_plasma5_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
@ -147,6 +142,9 @@ Recommends: systemsettings5
# so Qt4-only apps have some colors in tray
Recommends: sni-qt
Recommends: %{name}-lang
Provides: %{name}-branding = %{_plasma5_version}
Provides: %{name}-branding-upstream = %{version}
Obsoletes: %{name}-branding-upstream < %{version}
Provides: xembed-sni-proxy = %{version}
Obsoletes: xembed-sni-proxy < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -154,17 +152,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
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 = %{plasma_version}
Supplements: packageand(plasma5-workspace:branding-upstream)
Conflicts: otherproviders(%{name}-branding)
Requires: %{name} >= %{plasma_version}
%description branding-upstream
This package contains the basic packages for a Plasma workspace.
%package -n drkonqi5
Summary: KDE crash handler
Group: Development/Tools/Debuggers
@ -197,8 +184,8 @@ workspace.
Summary: The KDE Plasma Workspace Components
Group: Development/Libraries/KDE
Requires: %{name}-libs = %{version}-%{release}
Requires: cmake(KF5SysGuard) >= %{plasma_version}
Requires: cmake(KF5Wayland) >= 5.25.0
Requires: cmake(KF5SysGuard) >= %{_plasma5_version}
Requires: cmake(KF5Wayland) >= %{kf5_version}
Requires: cmake(Qt5Core) >= 5.4.0
Requires: cmake(Qt5Gui) >= 5.4.0
Requires: cmake(Qt5Quick) >= 5.4.0
@ -212,17 +199,13 @@ This package contains the basic packages for a K Desktop Environment
workspace. Development files.
%lang_package
%prep
%setup -q -n plasma-workspace-%{plasma_version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%if 0%{?is_opensuse} || 0%{?suse_version} > 1315
%patch4 -p1
#patch4 -p1
%endif
%patch201 -p1
%patch202 -p1
%patch203 -p1
%build
%cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}
@ -260,7 +243,6 @@ workspace. Development files.
%{_kf5_libdir}/libplasma-geolocation-interface.so.*
%{_kf5_libdir}/libtaskmanager.so.*
%{_kf5_libdir}/libweather_ion.so.*
%{_kf5_libdir}/liblegacytaskmanager.so.*
%files
%defattr(-,root,root)
@ -281,17 +263,17 @@ workspace. Development files.
%{_kf5_bindir}/startkde
%{_kf5_bindir}/startplasmacompositor
%{_kf5_bindir}/systemmonitor
%{_kf5_configdir}/autostart/klipper.desktop
%{_kf5_configdir}/autostart/plasmashell.desktop
%{_kf5_configdir}/autostart/klipper.desktop
%{_kf5_configdir}/autostart/krunner.desktop
%{_kf5_configdir}/autostart/xembedsniproxy.desktop
%config %{_kf5_configdir}/plasmoids.knsrc
%config %{_kf5_configdir}/wallpaper.knsrc
%config %{_kf5_configdir}/taskmanagerrulesrc
%config %{_kf5_configdir}/legacytaskmanagerrulesrc
%dir %{_kf5_libdir}/libexec
%{_kf5_libdir}/libexec/ksyncdbusenv
%{_kf5_libdir}/libexec/startplasma
%{_kf5_libdir}/libexec/ksmserver-logout-greeter
%{_kf5_libdir}/libkdeinit5_kcminit.so
%{_kf5_libdir}/libkdeinit5_kcminit_startup.so
%{_kf5_libdir}/libkdeinit5_klipper.so
@ -308,6 +290,7 @@ workspace. Development files.
%dir %{_kf5_htmldir}/en
%dir %{_kf5_htmldir}
%doc %{_kf5_htmldir}/en/klipper/
%doc %{_kf5_htmldir}/de/klipper/
%doc %{_kf5_htmldir}/en/kcontrol/
%{_kf5_notifydir}/
%{_kf5_servicesdir}/
@ -320,6 +303,9 @@ workspace. Development files.
%{_kf5_sharedir}/kio_desktop/
%{_kf5_iconsdir}/hicolor/48x48/apps/klipper.svg
%{_kf5_appstreamdir}/
%dir %{_kf5_sharedir}/sddm
%dir %{_kf5_sharedir}/sddm/themes
%{_kf5_sharedir}/sddm/themes/breeze/
%files -n drkonqi5
%defattr(-,root,root)
@ -329,37 +315,25 @@ workspace. Development files.
%{_kf5_libdir}/libexec/drkonqi
%{_kf5_sharedir}/drkonqi/
%files branding-upstream
%defattr(-,root,root)
%doc COPYING*
%dir %{_kf5_sharedir}/sddm
%dir %{_kf5_sharedir}/sddm/themes
%{_kf5_sharedir}/sddm/themes/breeze/
%files devel
%defattr(-,root,root)
%doc COPYING*
%{_kf5_prefix}/include/kworkspace5/
%{_kf5_prefix}/include/plasma/
%{_kf5_prefix}/include/taskmanager/
%{_kf5_prefix}/include/legacytaskmanager/
%{_kf5_libdir}/cmake/KRunnerAppDBusInterface/
%{_kf5_libdir}/cmake/KSMServerDBusInterface/
%{_kf5_libdir}/cmake/LibKWorkspace/
%{_kf5_libdir}/cmake/LibTaskManager/
%{_kf5_libdir}/cmake/LibLegacyTaskManager/
%{_kf5_libdir}/libkworkspace5.so
%{_kf5_libdir}/libplasma-geolocation-interface.so
%{_kf5_libdir}/libtaskmanager.so
%{_kf5_libdir}/liblegacytaskmanager.so
%{_kf5_libdir}/libweather_ion.so
%{_kf5_sharedir}/kdevappwizard/
%{_kf5_sharedir}/dbus-1/interfaces/
%if %{with lang}
%files lang -f %{name}.lang
%doc %lang(ca) %{_kf5_htmldir}/ca/
%doc %lang(cs) %{_kf5_htmldir}/cs/
%endif
%changelog

13
require-qt56.diff
View File

@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 74e1518..b8c52a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ set(PROJECT_VERSION_MAJOR 5)
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
-set(QT_MIN_VERSION "5.6.1")
+set(QT_MIN_VERSION "5.6.0")
set(KF5_MIN_VERSION "5.18.0")
set(INSTALL_SDDM_THEME TRUE)
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick QuickWidgets Concurrent Test Script Network)