Plasma 5.11 Beta - hopefully everything addressed now (if it builds fine)
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=349
This commit is contained in:
parent
e89e3b6551
commit
4e1176dff3
@ -1,55 +0,0 @@
|
||||
From a8b6358a74daeaf306d08e000f97500fd43507e1 Mon Sep 17 00:00:00 2001
|
||||
From: Antonio Rojas <arojas@archlinux.org>
|
||||
Date: Tue, 29 Aug 2017 08:24:30 +0200
|
||||
Subject: [PATCH] Don't search for and link to libcln when using
|
||||
libqalculate>=2.0
|
||||
|
||||
Plasma doesn't use any cln code directly, only via libqalculate. In version 2.0, libqalculate dropped cln in favor of gmp, so the cln dependency
|
||||
becomes unnecessary.
|
||||
|
||||
Differential Revision: https://phabricator.kde.org/D7590
|
||||
---
|
||||
cmake/FindQalculate.cmake | 20 ++++++++++++--------
|
||||
1 file changed, 12 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/cmake/FindQalculate.cmake b/cmake/FindQalculate.cmake
|
||||
index 53bd302e..b8e74f45 100644
|
||||
--- a/cmake/FindQalculate.cmake
|
||||
+++ b/cmake/FindQalculate.cmake
|
||||
@@ -51,7 +51,9 @@ else(QALCULATE_CFLAGS AND QALCULATE_LIBRARIES)
|
||||
pkg_check_modules(_pc_QALCULATE libqalculate)
|
||||
endif(QALCULATE_MIN_VERSION)
|
||||
|
||||
- pkg_check_modules(_pc_CLN cln)
|
||||
+ if(${_pc_QALCULATE_VERSION} VERSION_LESS 2.0.0)
|
||||
+ pkg_check_modules(_pc_CLN cln)
|
||||
+ endif()
|
||||
|
||||
if(_pc_QALCULATE_FOUND)
|
||||
set(QALCULATE_CFLAGS ${_pc_QALCULATE_CFLAGS})
|
||||
@@ -73,13 +75,15 @@ else(QALCULATE_CFLAGS AND QALCULATE_LIBRARIES)
|
||||
${INCLUDE_INSTALL_DIR}
|
||||
)
|
||||
|
||||
- find_library(CLN_LIBRARIES
|
||||
- NAMES
|
||||
- cln
|
||||
- PATHS
|
||||
- ${_pc_CLN_LIBRARY_DIRS}
|
||||
- ${LIB_INSTALL_DIR}
|
||||
- )
|
||||
+ if(${_pc_QALCULATE_VERSION} VERSION_LESS 2.0.0)
|
||||
+ find_library(CLN_LIBRARIES
|
||||
+ NAMES
|
||||
+ cln
|
||||
+ PATHS
|
||||
+ ${_pc_CLN_LIBRARY_DIRS}
|
||||
+ ${LIB_INSTALL_DIR}
|
||||
+ )
|
||||
+ endif()
|
||||
|
||||
else(NOT WIN32)
|
||||
# XXX: currently no libqalculate on windows
|
||||
--
|
||||
2.14.1
|
||||
|
@ -1,182 +0,0 @@
|
||||
From bdaaaedbfbbe72673c288a5acc8a8366d3f6bc1e Mon Sep 17 00:00:00 2001
|
||||
From: Kai Uwe Broulik <kde@privat.broulik.de>
|
||||
Date: Fri, 30 Jun 2017 10:43:38 +0200
|
||||
Subject: [AppLauncher Containment Action] Add option to "show apps by name"
|
||||
|
||||
This will have it show the actual application name instead of the description.
|
||||
|
||||
BUG: 358423
|
||||
FIXED-IN: 5.11.0
|
||||
|
||||
CHANGELOG: Application launcher mouse action can now be configured to show application names instead of their description
|
||||
|
||||
Differential Revision: https://phabricator.kde.org/D6441
|
||||
---
|
||||
containmentactions/applauncher/CMakeLists.txt | 5 +++-
|
||||
containmentactions/applauncher/Messages.sh | 2 ++
|
||||
containmentactions/applauncher/config.ui | 25 ++++++++++++++++
|
||||
containmentactions/applauncher/launch.cpp | 33 +++++++++++++++++++++-
|
||||
containmentactions/applauncher/launch.h | 11 ++++++++
|
||||
.../plasma-containmentactions-applauncher.desktop | 1 +
|
||||
6 files changed, 75 insertions(+), 2 deletions(-)
|
||||
create mode 100755 containmentactions/applauncher/Messages.sh
|
||||
create mode 100644 containmentactions/applauncher/config.ui
|
||||
|
||||
diff --git a/containmentactions/applauncher/CMakeLists.txt b/containmentactions/applauncher/CMakeLists.txt
|
||||
index ead6e81..084ec28 100644
|
||||
--- a/containmentactions/applauncher/CMakeLists.txt
|
||||
+++ b/containmentactions/applauncher/CMakeLists.txt
|
||||
@@ -1,12 +1,15 @@
|
||||
+add_definitions(-DTRANSLATION_DOMAIN=\"plasma_containmentactions_applauncher\")
|
||||
+
|
||||
set(applauncher_SRCS
|
||||
launch.cpp
|
||||
)
|
||||
+ki18n_wrap_ui(applauncher_SRCS config.ui)
|
||||
|
||||
add_library(plasma_containmentactions_applauncher MODULE ${applauncher_SRCS})
|
||||
|
||||
kcoreaddons_desktop_to_json(plasma_containmentactions_applauncher plasma-containmentactions-applauncher.desktop)
|
||||
|
||||
-target_link_libraries(plasma_containmentactions_applauncher KF5::Plasma KF5::KIOCore KF5::KIOWidgets)
|
||||
+target_link_libraries(plasma_containmentactions_applauncher KF5::Plasma KF5::KIOCore KF5::KIOWidgets KF5::I18n)
|
||||
|
||||
install(TARGETS plasma_containmentactions_applauncher DESTINATION ${KDE_INSTALL_PLUGINDIR})
|
||||
install(FILES plasma-containmentactions-applauncher.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
|
||||
diff --git a/containmentactions/applauncher/Messages.sh b/containmentactions/applauncher/Messages.sh
|
||||
new file mode 100755
|
||||
index 0000000..0083c51
|
||||
--- /dev/null
|
||||
+++ b/containmentactions/applauncher/Messages.sh
|
||||
@@ -0,0 +1,2 @@
|
||||
+#! /usr/bin/env bash
|
||||
+$XGETTEXT *.cpp -o $podir/plasma_containmentactions_applauncher.pot
|
||||
diff --git a/containmentactions/applauncher/config.ui b/containmentactions/applauncher/config.ui
|
||||
new file mode 100644
|
||||
index 0000000..d2389ae
|
||||
--- /dev/null
|
||||
+++ b/containmentactions/applauncher/config.ui
|
||||
@@ -0,0 +1,25 @@
|
||||
+<?xml version="1.0" encoding="UTF-8"?>
|
||||
+<ui version="4.0">
|
||||
+ <class>Config</class>
|
||||
+ <widget class="QWidget" name="Config">
|
||||
+ <property name="geometry">
|
||||
+ <rect>
|
||||
+ <x>0</x>
|
||||
+ <y>0</y>
|
||||
+ <width>397</width>
|
||||
+ <height>123</height>
|
||||
+ </rect>
|
||||
+ </property>
|
||||
+ <layout class="QVBoxLayout" name="verticalLayout">
|
||||
+ <item>
|
||||
+ <widget class="QCheckBox" name="showAppsByName">
|
||||
+ <property name="text">
|
||||
+ <string>Show applications by name</string>
|
||||
+ </property>
|
||||
+ </widget>
|
||||
+ </item>
|
||||
+ </layout>
|
||||
+ </widget>
|
||||
+ <resources/>
|
||||
+ <connections/>
|
||||
+</ui>
|
||||
diff --git a/containmentactions/applauncher/launch.cpp b/containmentactions/applauncher/launch.cpp
|
||||
index abda409..7ea8ae8 100644
|
||||
--- a/containmentactions/applauncher/launch.cpp
|
||||
+++ b/containmentactions/applauncher/launch.cpp
|
||||
@@ -52,7 +52,13 @@ void AppLauncher::makeMenu(QMenu *menu, const KServiceGroup::Ptr group)
|
||||
foreach (KSycocaEntry::Ptr p, group->entries(true, false, true)) {
|
||||
if (p->isType(KST_KService)) {
|
||||
const KService::Ptr service(static_cast<KService*>(p.data()));
|
||||
- QAction *action = new QAction(QIcon::fromTheme(service->icon()), service->genericName().isEmpty() ? service->name() : service->genericName(), this);
|
||||
+
|
||||
+ QString text = service->name();
|
||||
+ if (!m_showAppsByName && !service->genericName().isEmpty()) {
|
||||
+ text = service->genericName();
|
||||
+ }
|
||||
+
|
||||
+ QAction *action = new QAction(QIcon::fromTheme(service->icon()), text, this);
|
||||
connect(action, &QAction::triggered, [action](){
|
||||
KService::Ptr service = KService::serviceByStorageId(action->data().toString());
|
||||
new KRun(QUrl("file://"+service->entryPath()), 0);
|
||||
@@ -85,6 +91,31 @@ void AppLauncher::makeMenu(QMenu *menu, const KServiceGroup::Ptr group)
|
||||
}
|
||||
}
|
||||
|
||||
+QWidget *AppLauncher::createConfigurationInterface(QWidget *parent)
|
||||
+{
|
||||
+ QWidget *widget = new QWidget(parent);
|
||||
+ m_ui.setupUi(widget);
|
||||
+ widget->setWindowTitle(i18nc("plasma_containmentactions_applauncher", "Configure Application Launcher Plugin"));
|
||||
+
|
||||
+ m_ui.showAppsByName->setChecked(m_showAppsByName);
|
||||
+
|
||||
+ return widget;
|
||||
+}
|
||||
+
|
||||
+void AppLauncher::configurationAccepted()
|
||||
+{
|
||||
+ m_showAppsByName = m_ui.showAppsByName->isChecked();
|
||||
+}
|
||||
+
|
||||
+void AppLauncher::restore(const KConfigGroup &config)
|
||||
+{
|
||||
+ m_showAppsByName = config.readEntry(QStringLiteral("showAppsByName"), false);
|
||||
+}
|
||||
+
|
||||
+void AppLauncher::save(KConfigGroup &config)
|
||||
+{
|
||||
+ config.writeEntry(QStringLiteral("showAppsByName"), m_showAppsByName);
|
||||
+}
|
||||
|
||||
K_EXPORT_PLASMA_CONTAINMENTACTIONS_WITH_JSON(applauncher, AppLauncher, "plasma-containmentactions-applauncher.json")
|
||||
|
||||
diff --git a/containmentactions/applauncher/launch.h b/containmentactions/applauncher/launch.h
|
||||
index 4738c89..95b5123 100644
|
||||
--- a/containmentactions/applauncher/launch.h
|
||||
+++ b/containmentactions/applauncher/launch.h
|
||||
@@ -26,6 +26,8 @@
|
||||
|
||||
#include <plasma/containmentactions.h>
|
||||
|
||||
+#include "ui_config.h"
|
||||
+
|
||||
class QAction;
|
||||
class QMenu;
|
||||
|
||||
@@ -40,12 +42,21 @@ class AppLauncher : public Plasma::ContainmentActions
|
||||
|
||||
QList<QAction*> contextualActions() override;
|
||||
|
||||
+ QWidget *createConfigurationInterface(QWidget* parent) override;
|
||||
+ void configurationAccepted() override;
|
||||
+
|
||||
+ void restore(const KConfigGroup &config) override;
|
||||
+ void save(KConfigGroup &config) override;
|
||||
+
|
||||
protected:
|
||||
void makeMenu(QMenu *menu, const KServiceGroup::Ptr group);
|
||||
|
||||
private:
|
||||
KServiceGroup::Ptr m_group;
|
||||
QList<QAction *> m_actions;
|
||||
+
|
||||
+ Ui::Config m_ui;
|
||||
+ bool m_showAppsByName = false;
|
||||
};
|
||||
|
||||
|
||||
diff --git a/containmentactions/applauncher/plasma-containmentactions-applauncher.desktop b/containmentactions/applauncher/plasma-containmentactions-applauncher.desktop
|
||||
index b5112c8..5d955cf 100644
|
||||
--- a/containmentactions/applauncher/plasma-containmentactions-applauncher.desktop
|
||||
+++ b/containmentactions/applauncher/plasma-containmentactions-applauncher.desktop
|
||||
@@ -165,3 +165,4 @@ X-KDE-PluginInfo-Depends=
|
||||
X-KDE-PluginInfo-License=GPL
|
||||
X-KDE-PluginInfo-EnabledByDefault=true
|
||||
|
||||
+X-Plasma-HasConfigurationInterface=true
|
||||
--
|
||||
cgit v0.11.2
|
||||
|
@ -1,37 +0,0 @@
|
||||
From 913142c565ec7cb51f9d5406193d3c9a2562dbb0 Mon Sep 17 00:00:00 2001
|
||||
From: Kai Uwe Broulik <kde@privat.broulik.de>
|
||||
Date: Sat, 8 Jul 2017 16:29:01 +0200
|
||||
Subject: [Logout Dialog] Honor "Offer shutdown options"
|
||||
|
||||
"maysd" stands for "may shut down" apparently.
|
||||
Kickoff already removed the options in this case but clicking "Logout" yields the new dialog
|
||||
which offers them all again.
|
||||
|
||||
Differential Revision: https://phabricator.kde.org/D6574
|
||||
---
|
||||
lookandfeel/contents/logout/Logout.qml | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/lookandfeel/contents/logout/Logout.qml b/lookandfeel/contents/logout/Logout.qml
|
||||
index 460b802..251e1ee 100644
|
||||
--- a/lookandfeel/contents/logout/Logout.qml
|
||||
+++ b/lookandfeel/contents/logout/Logout.qml
|
||||
@@ -168,6 +168,7 @@ PlasmaCore.ColorScope {
|
||||
KeyNavigation.left: suspendButton
|
||||
KeyNavigation.right: shutdownButton
|
||||
focus: sdtype == ShutdownType.ShutdownTypeReboot
|
||||
+ visible: maysd
|
||||
}
|
||||
LogoutButton {
|
||||
id: shutdownButton
|
||||
@@ -177,6 +178,7 @@ PlasmaCore.ColorScope {
|
||||
KeyNavigation.left: rebootButton
|
||||
KeyNavigation.right: logoutButton
|
||||
focus: sdtype == ShutdownType.ShutdownTypeHalt
|
||||
+ visible: maysd
|
||||
}
|
||||
LogoutButton {
|
||||
id: logoutButton
|
||||
--
|
||||
cgit v0.11.2
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:54927297f46fbc9556d6027880712f94eeccf39f09b613e79fcdc26ce5df22d8
|
||||
size 6945244
|
3
plasma-workspace-5.10.95.tar.xz
Normal file
3
plasma-workspace-5.10.95.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f651d454564c880a8edb2bae1c034410df5e27e02f349b081cf666ea494e7131
|
||||
size 6386644
|
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 14 14:29:06 CEST 2017 - fabian@ritter-vogt.de
|
||||
|
||||
- Update to 5.10.95
|
||||
* New feature release
|
||||
* For more details please see:
|
||||
* https://www.kde.org/announcements/plasma-5.10.95.php
|
||||
- Too many changes to list here
|
||||
- Remove patches, now upstream:
|
||||
* plasma5-workspace/0001-Don-t-search-for-and-link-to-libcln-when-using-libqa.patch
|
||||
* plasma5-workspace/applauncher-allow-to-show-apps-by-name.patch
|
||||
* plasma5-workspace/logoutdialog-honor-Offer-shutdown-options.patch
|
||||
- Move plasma5-session into here
|
||||
- Convert kde-plasma.desktop session file to link to avoid duplicate
|
||||
entries in display managers
|
||||
- Add AppStreamQt BuildReq
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 30 11:52:53 UTC 2017 - fabian@ritter-vogt.de
|
||||
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
%bcond_without lang
|
||||
Name: plasma5-workspace
|
||||
Version: 5.10.5
|
||||
Version: 5.10.95
|
||||
Release: 0
|
||||
# Full Plasma 5 version (e.g. 5.9.1)
|
||||
%{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}}
|
||||
@ -30,7 +30,7 @@ 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
|
||||
@ -38,14 +38,12 @@ Patch0: 0001-Rename-qdbus-in-startkde.patch
|
||||
Patch1: 0001-Ignore-default-sddm-face-icons.patch
|
||||
# PATCHES 100-200 and above are from upstream 5.10 branch
|
||||
# PATCHES 201-300 and above are from upstream master/5.11 branch
|
||||
Patch201: applauncher-allow-to-show-apps-by-name.patch
|
||||
Patch202: logoutdialog-honor-Offer-shutdown-options.patch
|
||||
Patch203: 0001-Don-t-search-for-and-link-to-libcln-when-using-libqa.patch
|
||||
BuildRequires: breeze5-icons
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: kf5-filesystem
|
||||
BuildRequires: phonon4qt5-devel >= 4.6.60
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: cmake(AppStreamQt) >= 0.10.4
|
||||
BuildRequires: cmake(KF5Activities) >= %{kf5_version}
|
||||
BuildRequires: cmake(KF5Baloo)
|
||||
BuildRequires: cmake(KF5CoreAddons) >= %{kf5_version}
|
||||
@ -75,7 +73,7 @@ BuildRequires: cmake(KF5SysGuard) >= %{_plasma5_version}
|
||||
BuildRequires: cmake(KF5TextEditor)
|
||||
BuildRequires: cmake(KF5TextWidgets) >= %{kf5_version}
|
||||
BuildRequires: cmake(KF5Wallet) >= %{kf5_version}
|
||||
BuildRequires: cmake(KF5Wayland) >= %{_plasma5_version}
|
||||
BuildRequires: cmake(KF5Wayland) >= %{kf5_version}
|
||||
BuildRequires: cmake(KF5XmlRpcClient)
|
||||
BuildRequires: cmake(KScreenLocker) >= %{_plasma5_version}
|
||||
BuildRequires: cmake(KWinDBusInterface) >= %{_plasma5_version}
|
||||
@ -139,7 +137,7 @@ Requires: oxygen5-sounds >= %{_plasma5_version}
|
||||
# hardcode versions of plasma-framework-components and plasma-framework-private packages, as upstream doesn't keep backwards compability there
|
||||
%requires_ge plasma-framework-components
|
||||
%requires_ge plasma-framework-private
|
||||
Requires: kactivities5
|
||||
Requires: kactivitymanagerd
|
||||
Requires: kio-extras5
|
||||
# notifications...
|
||||
Recommends: phonon4qt5-backend
|
||||
@ -165,13 +163,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%description
|
||||
This package contains the basic packages for a Plasma workspace.
|
||||
|
||||
%package -n drkonqi5
|
||||
Summary: KDE crash handler
|
||||
Group: Development/Tools/Debuggers
|
||||
|
||||
%description -n drkonqi5
|
||||
The KDE Crash Handler gives the user feedback if a program has crashed.
|
||||
|
||||
%package libs
|
||||
Summary: The KDE Plasma Workspace Components
|
||||
Group: Development/Libraries/KDE
|
||||
@ -212,15 +203,54 @@ Conflicts: kapptemplate <= 16.03.80
|
||||
This package contains the basic packages for a K Desktop Environment
|
||||
workspace. Development files.
|
||||
|
||||
%package -n plasma5-session
|
||||
Summary: KDE Plasma 5 X11 Session
|
||||
Group: System/GUI/KDE
|
||||
BuildArch: noarch
|
||||
Requires: breeze >= %{_plasma5_bugfix}
|
||||
Requires: breeze5-decoration >= %{_plasma5_bugfix}
|
||||
Requires: khotkeys5 >= %{_plasma5_bugfix}
|
||||
Requires: kwin5 >= %{_plasma5_bugfix}
|
||||
Requires: libkscreen2-plugin >= %{_plasma5_bugfix}
|
||||
Requires: plasma-nm5 >= %{_plasma5_bugfix}
|
||||
Requires: plasma5-desktop >= %{_plasma5_bugfix}
|
||||
Requires: plasma5-workspace >= %{_plasma5_bugfix}
|
||||
Requires: polkit-kde-agent-5 >= %{_plasma5_bugfix}
|
||||
Requires: powerdevil5 >= %{_plasma5_bugfix}
|
||||
Requires: systemsettings5 >= %{_plasma5_bugfix}
|
||||
# needed for displaying the handbooks of KDE applications in a Plasma5 session (boo#980068)
|
||||
Recommends: khelpcenter5
|
||||
Provides: kdebase4-session = %{version}
|
||||
Obsoletes: kdebase4-session < %{version}
|
||||
Requires: update-desktop-files
|
||||
Requires(pre): /usr/bin/sed /usr/bin/grep /usr/bin/cut
|
||||
Requires(post): update-alternatives
|
||||
Requires(postun): update-alternatives
|
||||
|
||||
%description -n plasma5-session
|
||||
This package contains the startup scripts necessary to start a KDE
|
||||
Plasma 5 session with X11 from a display manager.
|
||||
|
||||
%package -n plasma5-session-wayland
|
||||
Summary: KDE Plasma 5 Wayland Session
|
||||
Group: System/GUI/KDE
|
||||
BuildArch: noarch
|
||||
Requires: kwayland-integration >= %{_plasma5_bugfix}
|
||||
Requires: libqt5-qtwayland
|
||||
Requires: plasma5-session >= %{version}
|
||||
Requires: xf86-input-libinput
|
||||
Requires: xorg-x11-server-wayland
|
||||
|
||||
%description -n plasma5-session-wayland
|
||||
This package contains the startup scripts necessary to start a KDE
|
||||
Plasma 5 session with Wayland from a display manager.
|
||||
|
||||
%lang_package
|
||||
|
||||
%prep
|
||||
%setup -q -n plasma-workspace-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%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}
|
||||
@ -228,21 +258,36 @@ workspace. Development files.
|
||||
|
||||
%install
|
||||
%kf5_makeinstall -C build
|
||||
%if %{with lang}
|
||||
%kf5_find_lang
|
||||
%kf5_find_htmldocs
|
||||
%endif
|
||||
install -p -D -m755 drkonqi/doc/examples/installdbgsymbols_suse.sh \
|
||||
%{buildroot}/usr/bin/installdbgsymbols.sh
|
||||
%suse_update_desktop_file -r %{buildroot}%{_kf5_applicationsdir}/org.kde.klipper.desktop System TrayIcon
|
||||
|
||||
%if %{with lang}
|
||||
%kf5_find_lang
|
||||
%kf5_find_htmldocs
|
||||
%endif
|
||||
|
||||
%suse_update_desktop_file -r %{buildroot}%{_kf5_applicationsdir}/org.kde.klipper.desktop System TrayIcon
|
||||
|
||||
mkdir -p %{buildroot}%{_kf5_iconsdir}/hicolor/48x48/apps/
|
||||
cp %{_kf5_iconsdir}/breeze/apps/48/klipper.svg %{buildroot}%{_kf5_iconsdir}/hicolor/48x48/apps/
|
||||
|
||||
# remove empty/invalid appstream xml files. kpackagetool5 generates invalid files sometimes...
|
||||
# remove this once kpackagetool5 is fixed
|
||||
find %{buildroot}%{_kf5_appstreamdir} -type f -size 0 -print -delete
|
||||
# we have a separate package for Plasma5 session
|
||||
rm -rfv %{buildroot}%{_kf5_sharedir}/xsessions
|
||||
rm -rfv %{buildroot}%{_kf5_sharedir}/wayland-sessions
|
||||
|
||||
# No wayland for Leap 42.x as no Xwayland available
|
||||
%if 0%{?suse_version} <= 1320
|
||||
rm -rfv %{buildroot}%{_kf5_sharedir}/wayland-sessions
|
||||
%endif
|
||||
|
||||
# Rename upstream session file to oS location
|
||||
mv %{buildroot}%{_kf5_sharedir}/xsessions/{plasma,plasma5}.desktop
|
||||
|
||||
# Install compatibility symlink
|
||||
ln -s %{_kf5_sharedir}/xsessions/plasma5.desktop %{buildroot}%{_kf5_sharedir}/xsessions/kde-plasma.desktop
|
||||
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
|
||||
touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop
|
||||
ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop
|
||||
|
||||
# this causes problem for KDE applications when they are being run on a different desktop or remotely via ssh (boo#1046458)
|
||||
# can be removed when https://bugs.kde.org/show_bug.cgi?id=380974 is resolved
|
||||
rm %{buildroot}%{_kf5_sharedir}/dbus-1/services/org.kde.plasma.Notifications.service
|
||||
@ -256,6 +301,30 @@ workspace. Development files.
|
||||
|
||||
%postun libs -p /sbin/ldconfig
|
||||
|
||||
%post -n plasma5-session
|
||||
# Reset the DEFAULT_WM value for KDE upgrade compatibility
|
||||
if [ -f /etc/sysconfig/windowmanager ]; then
|
||||
OLD_DEFAULTWM=`grep "DEFAULT_WM" /etc/sysconfig/windowmanager | cut -d '=' -f 2 | cut -d '"' -f 2`
|
||||
fi
|
||||
|
||||
if [ -f /var/adm/fillup-templates/sysconfig.windowmanager ]; then
|
||||
TEMPLATE_DEFAULTWM=`grep "DEFAULT_WM" /var/adm/fillup-templates/sysconfig.windowmanager | cut -d '=' -f 2 | cut -d '"' -f 2`
|
||||
fi
|
||||
|
||||
# Check the old DEFAULT_WM and whether current DEFAULT_WM exists
|
||||
if [ "$OLD_DEFAULTWM" = "startkde4" ] || [ "$OLD_DEFAULTWM" = "startkde" ] || [ "$OLD_DEFAULTWM" = "kde4" ]; then
|
||||
if [ -n "$TEMPLATE_DEFAULTWM" ] && [ "$OLD_DEFAULTWM" != "$TEMPLATE_DEFAULTWM" ]; then
|
||||
sed -i -e "s/^DEFAULT_WM=['\"]\?kde.*/DEFAULT_WM=\"${TEMPLATE_DEFAULTWM}\"/g" /etc/sysconfig/windowmanager
|
||||
fi
|
||||
fi
|
||||
|
||||
%{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \
|
||||
default-xsession.desktop %{_datadir}/xsessions/plasma5.desktop 25
|
||||
|
||||
%postun -n plasma5-session
|
||||
[ -f %{_datadir}/xsessions/plasma5.desktop ] || %{_sbindir}/update-alternatives \
|
||||
--remove default-xsession.desktop %{_datadir}/xsessions/plasma5.desktop
|
||||
|
||||
%files libs
|
||||
%defattr(-,root,root)
|
||||
%doc COPYING*
|
||||
@ -284,14 +353,14 @@ workspace. Development files.
|
||||
%{_kf5_bindir}/startplasmacompositor
|
||||
%{_kf5_bindir}/systemmonitor
|
||||
%{_kf5_bindir}/plasma_waitforname
|
||||
%{_kf5_configdir}/autostart/plasmashell.desktop
|
||||
%{_kf5_configdir}/autostart/org.kde.plasmashell.desktop
|
||||
%{_kf5_configdir}/autostart/klipper.desktop
|
||||
%{_kf5_configdir}/autostart/krunner.desktop
|
||||
%{_kf5_configdir}/autostart/xembedsniproxy.desktop
|
||||
%{_kf5_configdir}/kuiserver.categories
|
||||
%config %{_kf5_configdir}/plasmoids.knsrc
|
||||
%config %{_kf5_configdir}/wallpaper.knsrc
|
||||
%config %{_kf5_configdir}/taskmanagerrulesrc
|
||||
%config %{_kf5_configdir}/kuiserver.categories
|
||||
%dir %{_kf5_libdir}/libexec
|
||||
%{_kf5_libdir}/libexec/ksyncdbusenv
|
||||
%{_kf5_libdir}/libexec/startplasma
|
||||
@ -303,13 +372,16 @@ workspace. Development files.
|
||||
%{_kf5_libdir}/libkdeinit5_ksmserver.so
|
||||
%{_kf5_libdir}/libkdeinit5_kuiserver5.so
|
||||
%{_kf5_libdir}/kconf_update_bin/krunnerplugins
|
||||
%{_kf5_libdir}/libexec/baloorunner
|
||||
%{_kf5_plugindir}/
|
||||
%{_kf5_qmldir}/
|
||||
%{_kf5_applicationsdir}/org.kde.klipper.desktop
|
||||
%{_kf5_applicationsdir}/plasma-windowed.desktop
|
||||
%{_kf5_applicationsdir}/org.kde.plasmashell.desktop
|
||||
%{_kf5_configkcfgdir}/freespacenotifier.kcfg
|
||||
%{_kf5_sharedir}/dbus-1/services/kf5_org.kde.kuiserver.service
|
||||
%{_kf5_sharedir}/dbus-1/services/org.kde.krunner.service
|
||||
%{_kf5_sharedir}/dbus-1/services/org.kde.baloorunner.service
|
||||
#{_kf5_sharedir}/dbus-1/services/org.kde.plasma.Notifications.service
|
||||
%{_kf5_sharedir}/desktop-directories/
|
||||
%{_kf5_sharedir}/kconf_update/
|
||||
@ -317,6 +389,7 @@ workspace. Development files.
|
||||
%dir %lang(en) %{_kf5_htmldir}/en
|
||||
%doc %lang(en) %{_kf5_htmldir}/en/klipper/
|
||||
%doc %lang(en) %{_kf5_htmldir}/en/kcontrol/
|
||||
%doc %lang(en) %{_kf5_htmldir}/en/PolicyKit-kde/
|
||||
%{_kf5_notifydir}/
|
||||
%{_kf5_servicesdir}/
|
||||
%{_kf5_servicetypesdir}/
|
||||
@ -332,14 +405,6 @@ workspace. Development files.
|
||||
%dir %{_kf5_sharedir}/sddm/themes
|
||||
%{_kf5_sharedir}/sddm/themes/breeze/
|
||||
|
||||
%files -n drkonqi5
|
||||
%defattr(-,root,root)
|
||||
%doc COPYING*
|
||||
%{_kf5_bindir}/installdbgsymbols.sh
|
||||
%dir %{_kf5_libdir}/libexec
|
||||
%{_kf5_libdir}/libexec/drkonqi
|
||||
%{_kf5_sharedir}/drkonqi/
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%doc COPYING*
|
||||
@ -357,6 +422,22 @@ workspace. Development files.
|
||||
%{_kf5_sharedir}/kdevappwizard/
|
||||
%{_kf5_sharedir}/dbus-1/interfaces/
|
||||
|
||||
%files -n plasma5-session
|
||||
%defattr(-,root,root)
|
||||
%doc COPYING*
|
||||
%{_kf5_sharedir}/xsessions/plasma5.desktop
|
||||
%{_kf5_sharedir}/xsessions/kde-plasma.desktop
|
||||
%ghost %{_sysconfdir}/alternatives/default-xsession.desktop
|
||||
%{_kf5_sharedir}/xsessions/default.desktop
|
||||
|
||||
# No wayland for 42.x as no Xwayland available
|
||||
%if 0%{?suse_version} > 1320
|
||||
%files -n plasma5-session-wayland
|
||||
%doc COPYING*
|
||||
%dir %{_datadir}/wayland-sessions/
|
||||
%{_datadir}/wayland-sessions/plasmawayland.desktop
|
||||
%endif
|
||||
|
||||
%if %{with lang}
|
||||
%files lang -f %{name}.lang
|
||||
%endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user