From 07568656e75d26d387130152a5350d1b46951dc483a64daf6e80efe980ad282c Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 22 Aug 2014 17:50:28 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=13 --- plasma5-workspace.changes | 6 ++++++ plasma5-workspace.spec | 28 ++++++++++++++++++++++++---- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index 7336031..22b6784 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 22 17:48:45 UTC 2014 - hrvoje.senjan@gmail.com + +- Split out kglobalaccel to a kglobalaccel5 package (so default + shortcuts work outside Plasma session) + ------------------------------------------------------------------- Fri Aug 8 17:31:10 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index 3dab8c2..3d2e94c 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -92,9 +92,10 @@ Requires: milou5 # heavily used by plasma Requires: libqt5-qtquickcontrols # battery applet +Requires: drkonqi5 +Requires: kglobalaccel5 Requires: solid-imports # dialog/platformtheme/etc -Requires: drkonqi5 Requires: frameworkintegration-plugin # de-facto even required... Recommends: kactivities5 @@ -116,6 +117,15 @@ Group: Development/Tools/Debuggers %description -n drkonqi5 The KDE Crash Handler gives the user feedback if a program has crashed. +%package -n kglobalaccel5 +Summary: Configurable global shortcut support +Group: System/GUI/KDE + +%description -n kglobalaccel5 +KGlobalAccel allows you to have global accelerators that are independent +of the focused window. Unlike regular shortcuts, the application's window +does not need focus for them to be activated. + %package devel Summary: The KDE Plasma Workspace Components Group: Development/Libraries/KDE @@ -151,6 +161,10 @@ workspace. Development files. %postun -n drkonqi5 -p /sbin/ldconfig +%post -n kglobalaccel5 -p /sbin/ldconfig + +%postun -n kglobalaccel5 -p /sbin/ldconfig + %files %defattr(-,root,root) %doc COPYING* @@ -158,7 +172,6 @@ workspace. Development files. %{_kf5_bindir}/kcminit %{_kf5_bindir}/kcminit_startup %{_kf5_bindir}/kdostartupconfig5 -%{_kf5_bindir}/kglobalaccel5 %{_kf5_bindir}/klipper %{_kf5_bindir}/krunner %{_kf5_bindir}/ksmserver @@ -179,7 +192,6 @@ workspace. Development files. %{_kf5_libdir}/libexec/ksyncdbusenv %{_kf5_libdir}/libkdeinit5_kcminit.so %{_kf5_libdir}/libkdeinit5_kcminit_startup.so -%{_kf5_libdir}/libkdeinit5_kglobalaccel5.so %{_kf5_libdir}/libkdeinit5_klipper.so %{_kf5_libdir}/libkdeinit5_ksmserver.so %{_kf5_libdir}/libkdeinit5_kuiserver5.so @@ -192,7 +204,6 @@ workspace. Development files. %{_kf5_applicationsdir}/org.kde.klipper.desktop %{_kf5_configkcfgdir}/freespacenotifier.kcfg %{_kf5_sharedir}/dbus-1/services/kf5_org.kde.kuiserver.service -%{_kf5_sharedir}/dbus-1/services/org.kde.kglobalaccel.service %{_kf5_sharedir}/dbus-1/services/org.kde.krunner.service %{_kf5_sharedir}/desktop-directories/ %dir %{_kf5_htmldir}/en @@ -207,6 +218,7 @@ workspace. Development files. %{_kf5_plasmadir}/ %{_kf5_sharedir}/solid/ %{_kf5_sharedir}/sddm/ +%exclude %{_kf5_servicesdir}/kglobalaccel5.desktop %files -n drkonqi5 %defattr(-,root,root) @@ -217,6 +229,14 @@ workspace. Development files. %{_kf5_sharedir}/drkonqi/ %{_kf5_libdir}/libKF5XmlRpcClientPrivate.so.* +%files -n kglobalaccel5 +%defattr(-,root,root) +%doc COPYING* +%{_kf5_bindir}/kglobalaccel5 +%{_kf5_libdir}/libkdeinit5_kglobalaccel5.so +%{_kf5_sharedir}/dbus-1/services/org.kde.kglobalaccel.service +%{_kf5_servicesdir}/kglobalaccel5.desktop + %files devel %defattr(-,root,root) %doc COPYING* From 33769ccc2a81eb47806e1e227b401fd2772d86b62840b36859d9ad4e68d18ab3 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 23 Aug 2014 19:46:07 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=14 --- plasma5-workspace.changes | 1 + plasma5-workspace.spec | 1 + 2 files changed, 2 insertions(+) diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index 22b6784..173bb18 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -3,6 +3,7 @@ Fri Aug 22 17:48:45 UTC 2014 - hrvoje.senjan@gmail.com - Split out kglobalaccel to a kglobalaccel5 package (so default shortcuts work outside Plasma session) +- Require libkscreen2-plugin ------------------------------------------------------------------- Fri Aug 8 17:31:10 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index 3d2e94c..889fe2b 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -97,6 +97,7 @@ Requires: kglobalaccel5 Requires: solid-imports # dialog/platformtheme/etc Requires: frameworkintegration-plugin +Requires: libkscreen2-plugin # de-facto even required... Recommends: kactivities5 # we want wallpaper previews From 311b38d92d62b4007041ba5b7d68c7771a8f7c31b07b434145b452e5f372eed2 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Tue, 26 Aug 2014 08:46:46 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=15 --- create_kdehome.patch | 19 +++++++++++++++++++ plasma5-workspace.changes | 3 +++ plasma5-workspace.spec | 5 ++++- 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 create_kdehome.patch diff --git a/create_kdehome.patch b/create_kdehome.patch new file mode 100644 index 0000000..8df1020 --- /dev/null +++ b/create_kdehome.patch @@ -0,0 +1,19 @@ +diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake +index 48f7062..434455f 100644 +--- a/startkde/startkde.cmake ++++ b/startkde/startkde.cmake +@@ -64,6 +64,14 @@ fi + + mkdir -p $configDir + ++kdehome=$HOME/@KDE_DEFAULT_HOME@ ++test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"` ++ ++# see kstartupconfig source for usage ++mkdir -m 700 -p $kdehome ++mkdir -m 700 -p $kdehome/share ++mkdir -m 700 -p $kdehome/share/config ++ + #This is basically setting defaults so we can use them with kstartupconfig5 + cat >$configDir/startupconfigkeys <= 5.0.0 BuildRequires: kactivities5-devel >= 5.0.0 @@ -142,9 +144,10 @@ workspace. Development files. %prep %setup -q -n plasma-workspace-%{version} %patch0 -p1 +%patch1 -p1 %build - %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DBUILD_po=OFF + %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DBUILD_po=OFF -DKDE_DEFAULT_HOME=.kde4 %make_jobs %install