From 012fee2fb5e0571faa1649c02a90c5c644e54126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Thu, 3 Dec 2015 16:15:32 +0100 Subject: [PATCH] Plasma 5.5.0 --- .gitignore | 1 + ...orkspace-5.5.0-plasmawayland_desktop.patch | 93 +++++++++++++++++++ plasma-workspace.spec | 23 ++++- sources | 2 +- 4 files changed, 114 insertions(+), 5 deletions(-) create mode 100644 plasma-workspace-5.5.0-plasmawayland_desktop.patch diff --git a/.gitignore b/.gitignore index adfbd92..df03fbe 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /plasma-workspace-5.4.2.tar.xz /plasma-workspace-5.4.3.tar.xz /plasma-workspace-5.4.95.tar.xz +/plasma-workspace-5.5.0.tar.xz diff --git a/plasma-workspace-5.5.0-plasmawayland_desktop.patch b/plasma-workspace-5.5.0-plasmawayland_desktop.patch new file mode 100644 index 0000000..d4d9075 --- /dev/null +++ b/plasma-workspace-5.5.0-plasmawayland_desktop.patch @@ -0,0 +1,93 @@ +diff --git a/plasmawayland.desktop.cmake b/plasmawayland.desktop.cmake +index c5d5757..b2b6f3f 100644 +--- a/plasmawayland.desktop.cmake ++++ b/plasmawayland.desktop.cmake +@@ -3,47 +3,47 @@ Encoding=UTF-8 + Exec=dbus-launch --exit-with-session ${CMAKE_INSTALL_FULL_BINDIR}/startplasmacompositor + TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasmacompositor + DesktopNames=KDE +-Name=Plasma +-Name[ar]=بلازما +-Name[ast]=Plasma +-Name[bs]=Plazma +-Name[ca]=Plasma +-Name[ca@valencia]=Plasma +-Name[cs]=Plasma +-Name[da]=Plasma +-Name[de]=Plasma +-Name[el]=Plasma +-Name[en_GB]=Plasma +-Name[es]=Plasma +-Name[fi]=Plasma +-Name[fr]=Plasma +-Name[gl]=Plasma +-Name[hu]=Plasma +-Name[id]=Plasma +-Name[it]=Plasma +-Name[ja]=プラズマ +-Name[ko]=Plasma +-Name[lt]=Plasma +-Name[nb]=Plasma +-Name[nds]=Plasma +-Name[nl]=Plasma +-Name[nn]=Plasma +-Name[pl]=Plazma +-Name[pt]=Plasma +-Name[pt_BR]=Plasma +-Name[ru]=Plasma +-Name[sk]=Plasma +-Name[sl]=Plasma +-Name[sr]=Плазма +-Name[sr@ijekavian]=Плазма +-Name[sr@ijekavianlatin]=Plasma +-Name[sr@latin]=Plasma +-Name[sv]=Plasma +-Name[tr]=Plazma +-Name[uk]=Плазма +-Name[x-test]=xxPlasmaxx +-Name[zh_CN]=Plasma +-Name[zh_TW]=Plasma ++Name=Plasma (Wayland) ++Name[ar]=بلازما (Wayland) ++Name[ast]=Plasma (Wayland) ++Name[bs]=Plazma (Wayland) ++Name[ca]=Plasma (Wayland) ++Name[ca@valencia]=Plasma (Wayland) ++Name[cs]=Plasma (Wayland) ++Name[da]=Plasma (Wayland) ++Name[de]=Plasma (Wayland) ++Name[el]=Plasma (Wayland) ++Name[en_GB]=Plasma (Wayland) ++Name[es]=Plasma (Wayland) ++Name[fi]=Plasma (Wayland) ++Name[fr]=Plasma (Wayland) ++Name[gl]=Plasma (Wayland) ++Name[hu]=Plasma (Wayland) ++Name[id]=Plasma (Wayland) ++Name[it]=Plasma (Wayland) ++Name[ja]=プラズマ (Wayland) ++Name[ko]=Plasma (Wayland) ++Name[lt]=Plasma (Wayland) ++Name[nb]=Plasma (Wayland) ++Name[nds]=Plasma (Wayland) ++Name[nl]=Plasma (Wayland) ++Name[nn]=Plasma (Wayland) ++Name[pl]=Plazma (Wayland) ++Name[pt]=Plasma (Wayland) ++Name[pt_BR]=Plasma (Wayland) ++Name[ru]=Plasma (Wayland) ++Name[sk]=Plasma (Wayland) ++Name[sl]=Plasma (Wayland) ++Name[sr]=Плазма (Wayland) ++Name[sr@ijekavian]=Плазма (Wayland) ++Name[sr@ijekavianlatin]=Plasma (Wayland) ++Name[sr@latin]=Plasma (Wayland) ++Name[sv]=Plasma (Wayland) ++Name[tr]=Plazma (Wayland) ++Name[uk]=Плазма (Wayland) ++Name[x-test]=xxPlasma (Wayland)xx ++Name[zh_CN]=Plasma (Wayland) ++Name[zh_TW]=Plasma (Wayland) + Comment=Plasma by KDE + Comment[ar]=بلازما كدي + Comment[bs]=Plazma od strane KDe diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 6f2b419..c0eab99 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -10,7 +10,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.4.95 +Version: 5.5.0 Release: 1%{?dist} License: GPLv2+ @@ -38,6 +38,7 @@ Patch11: plasma-workspace-5.3.0-set-fedora-default-look-and-feel.patch # remove stuff we don't want or need, plus a minor bit of customization --rex Patch12: startkde.patch Patch13: plasma-workspace-5.4.2-prison-qt5.patch +Patch14: plasma-workspace-5.5.0-plasmawayland_desktop.patch ## upstreamable Patches Patch1: kde-runtime-4.9.0-installdbgsymbols.patch @@ -333,6 +334,15 @@ BuildArch: noarch %description -n sddm-breeze %{summary}. +%package wayland +Summary: Wayland support for Plasma +Requires: kwin-wayland >= %{version} +Requires: plasma-workspace = %{version}-%{release} +Requires: kwayland-integration >= %{version} +Requires: qt5-qtwayland%{?_isa} +BuildArch: noarch +%description wayland +%{summary}. %prep %setup -q @@ -348,6 +358,7 @@ sed -i -e "s|@DEFAULT_LOOKANDFEEL@|%{?default_lookandfeel}%{!?default_lookandfee %if 0%{?prison} %patch13 -p1 -b .prison-qt5 %endif +%patch14 -p1 -b .plasmawayland %build mkdir %{_target_platform} @@ -426,7 +437,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/{plasma-windowed,org. %{_kf5_bindir}/plasmashell %{_kf5_bindir}/plasmawindowed %{_kf5_bindir}/startkde -%{_kf5_bindir}/startplasmacompositor %{_kf5_bindir}/systemmonitor %{_kf5_bindir}/xembedsniproxy %{_kf5_libdir}/libkdeinit5_*.so @@ -439,7 +449,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/{plasma-windowed,org. %{_kf5_plugindir}/kded/*.so %{_kf5_qmldir}/org/kde/* %{_libexecdir}/ksyncdbusenv -%{_libexecdir}/startplasma %{_kf5_datadir}/ksmserver/ %{_kf5_datadir}/ksplash/ %{_kf5_datadir}/plasma/plasmoids/ @@ -469,7 +478,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/{plasma-windowed,org. %{_datadir}/applications/org.kde.klipper.desktop %{_datadir}/applications/plasma-windowed.desktop %{_datadir}/xsessions/plasma.desktop -%{_datadir}/wayland-sessions/plasmawayland.desktop # PAM %config(noreplace) %{_sysconfdir}/pam.d/kde %exclude %{_kf5_qtplugindir}/plasma-geolocation-gps.so @@ -554,8 +562,15 @@ fi %{_datadir}/sddm/themes/breeze/ %{_datadir}/sddm/themes/01-breeze-fedora/ +%files wayland +%{_kf5_bindir}/startplasmacompositor +%{_libexecdir}/startplasma +%{_datadir}/wayland-sessions/plasmawayland.desktop %changelog +* Thu Dec 03 2015 Daniel Vrátil - 5.5.0-1 +- Plasma 5.5.0 + * Wed Nov 25 2015 Daniel Vrátil - 5.4.95-1 - Plasma 5.4.95 diff --git a/sources b/sources index 7d570e6..760c7a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -12a7126d8cb4bb1c451db079749bdf74 plasma-workspace-5.4.95.tar.xz +ac2d460f1e822df9da094c4e23d52bab plasma-workspace-5.5.0.tar.xz