Hello community, here is the log from the commit of package plasma5-workspace for openSUSE:Factory checked in at 2014-09-01 16:59:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-workspace (Old) and /work/SRC/openSUSE:Factory/.plasma5-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-workspace" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-workspace/plasma5-workspace.changes 2014-08-16 15:43:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plasma5-workspace.new/plasma5-workspace.changes 2014-09-01 16:59:45.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Aug 22 17:48:45 UTC 2014 - [email protected] + +- Split out kglobalaccel to a kglobalaccel5 package (so default + shortcuts work outside Plasma session) +- Require libkscreen2-plugin +- Added create_kdehome.patch and pass -DKDE_DEFAULT_HOME=.kde4 so + kde4breeze kconf script can apply kde4 settings succesfully, + kde#338422 + +------------------------------------------------------------------- New: ---- create_kdehome.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-workspace.spec ++++++ --- /var/tmp/diff_new_pack.sOturH/_old 2014-09-01 16:59:47.000000000 +0200 +++ /var/tmp/diff_new_pack.sOturH/_new 2014-09-01 16:59:47.000000000 +0200 @@ -26,6 +26,8 @@ Source0: plasma-workspace-%{version}.tar.xz # PATCH-FIX_OPENSUSE 0001-Rename-qdbus-in-startkde.patch [email protected] -- Rename the qdbus executable in startkde Patch0: 0001-Rename-qdbus-in-startkde.patch +# PATCH-FIX_OPENSUSE create_kdehome.patch -- https://bugs.kde.org/show_bug.cgi?id=338422#c8 +Patch1: create_kdehome.patch BuildRequires: alsa-devel BuildRequires: baloo5-devel >= 5.0.0 BuildRequires: kactivities5-devel >= 5.0.0 @@ -92,10 +94,12 @@ # heavily used by plasma Requires: libqt5-qtquickcontrols # battery applet +Requires: drkonqi5 +Requires: kglobalaccel5 Requires: solid-imports # dialog/platformtheme/etc -Requires: drkonqi5 Requires: frameworkintegration-plugin +Requires: libkscreen2-plugin # de-facto even required... Recommends: kactivities5 # we want wallpaper previews @@ -116,6 +120,15 @@ %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 @@ -131,9 +144,10 @@ %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 @@ -151,6 +165,10 @@ %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 +176,6 @@ %{_kf5_bindir}/kcminit %{_kf5_bindir}/kcminit_startup %{_kf5_bindir}/kdostartupconfig5 -%{_kf5_bindir}/kglobalaccel5 %{_kf5_bindir}/klipper %{_kf5_bindir}/krunner %{_kf5_bindir}/ksmserver @@ -179,7 +196,6 @@ %{_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 +208,6 @@ %{_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 +222,7 @@ %{_kf5_plasmadir}/ %{_kf5_sharedir}/solid/ %{_kf5_sharedir}/sddm/ +%exclude %{_kf5_servicesdir}/kglobalaccel5.desktop %files -n drkonqi5 %defattr(-,root,root) @@ -217,6 +233,14 @@ %{_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* ++++++ create_kdehome.patch ++++++ 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 <<EOF kcminputrc Mouse cursorTheme 'breeze_cursors' -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
