diff --git a/.gitignore b/.gitignore index 99bbf10..15cb4e7 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /plasma-workspace-5.3.0.tar.xz /plasma-workspace-5.3.1.tar.xz /plasma-workspace-5.3.2.tar.xz +/plasma-workspace-5.4.0.tar.xz diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 4c31e77..a8a14af 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -1,10 +1,10 @@ # Enable bootstrap when building plasma-workspace on a new repo # or arch where there's no package that would provide plasmashell -#define bootstrap 1 +%define bootstrap 1 Name: plasma-workspace -Version: 5.3.2 -Release: 13%{?dist} +Version: 5.4.0 +Release: 1%{?dist} Summary: Plasma workspace, applications and applets License: GPLv2+ URL: https://projects.kde.org/projects/kde/workspace/plasma-workspace @@ -19,8 +19,6 @@ Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{ve # This goes to PAM Source10: kde -# upstream startkde.kde, minus stuff we don't want or need, plus a minor bit of customization --rex -Source11: startkde.cmake # Desktop file for Fedora Twenty Two/Three look-and-feel package Source12: twenty.two.desktop Source13: twenty.three.desktop @@ -28,6 +26,9 @@ Source13: twenty.three.desktop ## downstream Patches Patch10: plasma-workspace-5.3.0-konsole-in-contextmenu.patch 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 + ## upstreamable Patches @@ -61,6 +62,7 @@ BuildRequires: xcb-util-devel BuildRequires: glib2-devel BuildRequires: fontconfig-devel BuildRequires: python-devel +BuildRequires: boost-devel #BuildRequires: akonadi-qt5-devel #BuildRequires: kdepimlibs-devel BuildRequires: libusb-devel @@ -72,6 +74,7 @@ BuildRequires: pciutils-devel BuildRequires: libraw1394-devel %endif BuildRequires: gpsd-devel +BuildRequires: libqalculate-devel BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtx11extras-devel @@ -135,6 +138,13 @@ Requires: kf5-kglobalaccel >= 5.7 Requires: kf5-kxmlrpcclient >= 5.8 Requires: khotkeys +# The new volume control for PulseAudio +Requires: plasma-pa + +# TODO: This should go into -wayland subpackage alongside with other +# wayland integration stuff --dvratil +Requires: kwayland-integration + # Without the platformtheme plugins we get broken fonts Requires: kf5-frameworkintegration @@ -190,7 +200,7 @@ Requires: polkit-kde %if 0%{?bootstrap} Provides: plasmashell = %{version} %else -# Note: We should require >= %{version}, but that creates a circular dependency +# Note: We should require >= %%{version}, but that creates a circular dependency # at build time of plasma-desktop, because it provides the needed dependency, but # also needs plasma-workspace to build. So for now the dependency is unversioned. Requires: plasmashell @@ -244,14 +254,11 @@ BuildArch: noarch sed -i -e "s|@DEFAULT_LOOKANDFEEL@|%{?default_lookandfeel}%{!?default_lookandfeel:org.kde.breeze.desktop}|g" \ shell/packageplugins/lookandfeel/lookandfeel.cpp %endif - -mv startkde/startkde.cmake startkde/startkde.cmake.orig -install -m644 -p %{SOURCE11} startkde/startkde.cmake +%patch12 -p1 -b .startkde # omit conflicts with kf5-kxmlrpcclient-5.8 rm -fv po/*/libkxmlrpcclient5.po - %build mkdir %{_target_platform} pushd %{_target_platform} @@ -324,11 +331,13 @@ fi %{_kf5_qtplugindir}/*.so %{_kf5_qtplugindir}/phonon_platform/kde.so %{_kf5_qtplugindir}/kpackage/packagestructure/*.so +%{_kf5_plugindir}/kio/desktop.so %{_kf5_qmldir}/org/kde/* %{_libexecdir}/drkonqi %{_libexecdir}/kcheckpass %{_libexecdir}/kscreenlocker_greet %{_libexecdir}/ksyncdbusenv +%{_libexecdir}/startplasma %{_kf5_datadir}/ksmserver/ %{_kf5_datadir}/ksplash/ %{_kf5_datadir}/plasma/plasmoids/ @@ -361,6 +370,7 @@ fi %{_kf5_datadir}/kservicetypes5/*.desktop %{_kf5_datadir}/knotifications5/*.notifyrc %{_kf5_datadir}/config.kcfg/* +%{_kf5_datadir}/kio_desktop/ %{_datadir}/applications/org.kde.klipper.desktop %{_datadir}/applications/plasma-windowed.desktop %{_datadir}/xsessions/plasma.desktop @@ -370,6 +380,7 @@ fi %files doc %lang(en) %{_docdir}/HTML/en/klipper/ %lang(ca) %{_docdir}/HTML/ca/klipper/ +%lang(en) %{_docdir}/HTML/en/kcontrol/screenlocker %files devel %{_libdir}/libweather_ion.so @@ -395,11 +406,14 @@ fi %changelog -* Mon Aug 17 2015 Daniel Vrátil - 5.3.2-13 -- Fix broken F23 look'n'feel package +* Fri Aug 21 2015 Daniel Vrátil - 5.4.0-1 +- Plasma 5.4.0 + +* Thu Aug 20 2015 Daniel Vrátil - 5.3.95-4 +- use patch for startkde.cmake, remove redundant prison dependency -* Thu Aug 13 2015 Rex Dieter 5.3.2-12 -- drop BR: boost-devel (not used afaict) +* Thu Aug 13 2015 Daniel Vrátil - 5.3.95-1 +- Plasma 5.3.95 * Tue Aug 11 2015 Rex Dieter - 5.3.2-11 - Provides: f23-kde-theme-core (and f22-kde-theme-core) @@ -618,7 +632,7 @@ fi * Tue May 20 2014 Daniel Vrátil - 4.96.0-6.20140519gita85f5bc - Add LIBEXEC_PATH to kde5 profile to fix drkonqi lookup -- Fix install +- Fix install * Mon May 19 2014 Daniel Vrátil - 4.96.0-3.20140519gita85f5bc - Update to latest git snapshot diff --git a/sources b/sources index 9bbdc3b..35f5d51 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3d6a6e1ffcbf2d3e27668dc471523907 plasma-workspace-5.3.2.tar.xz +213feb78795eb4b46322b457f7d61b3f plasma-workspace-5.4.0.tar.xz diff --git a/startkde.cmake b/startkde.cmake deleted file mode 100644 index 6efb06c..0000000 --- a/startkde.cmake +++ /dev/null @@ -1,327 +0,0 @@ -#!/bin/sh -# -# DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ ) -# - -if test "x$1" = x--failsafe; then - KDE_FAILSAFE=1 # General failsafe flag - KWIN_COMPOSE=N # Disable KWin's compositing - export KWIN_COMPOSE KDE_FAILSAFE -fi - -# When the X server dies we get a HUP signal from xinit. We must ignore it -# because we still need to do some cleanup. -trap 'echo GOT SIGHUP' HUP - -# we have to unset this for Darwin since it will screw up KDE's dynamic-loading -unset DYLD_FORCE_FLAT_NAMESPACE - -qdbus=qdbus-qt5 - -# See http://bugzilla.redhat.com/537609 , a naive attempt to drop dep -# on xmessage and allow alternatives like zenity. -message() { - xmessage -geometry 500x100 "$1" > /dev/null 2>/dev/null || \ - zenity --info --text="$1" > /dev/null 2>/dev/null ||: - return $? -} - -# Check if a KDE session already is running and whether it's possible to connect to X -kcheckrunning -kcheckrunning_result=$? -if test $kcheckrunning_result -eq 0 ; then - echo "KDE seems to be already running on this display." - message "KDE seems to be already running on this display." > /dev/null 2>/dev/null - exit 1 -elif test $kcheckrunning_result -eq 2 ; then - echo "\$DISPLAY is not set or cannot connect to the X server." - exit 1 -fi - -# Boot sequence: -# -# kdeinit is used to fork off processes which improves memory usage -# and startup time. -# -# * kdeinit starts klauncher first. -# * Then kded is started. kded is responsible for keeping the sycoca -# database up to date. When an up to date database is present it goes -# into the background and the startup continues. -# * Then kdeinit starts kcminit. kcminit performs initialisation of -# certain devices according to the user's settings -# -# * Then ksmserver is started which takes control of the rest of the startup sequence - -# We need to create config folder so we can write startupconfigkeys -if [ ${XDG_CONFIG_HOME} ]; then - configDir=$XDG_CONFIG_HOME; -else - configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html -fi - -mkdir -p $configDir - -#This is basically setting defaults so we can use them with kstartupconfig5 -cat >$configDir/startupconfigkeys <$plasmalocalerc </plasma-workspace/env/*.sh -# (where correspond to the system and user's configuration -# directories, as identified by Qt's qtpaths, e.g. $HOME/.config -# and /etc/xdg/ on Linux) -# -# This is where you can define environment variables that will be available to -# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent` -# or eval `gpg-agent --daemon`. -# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script -# -# (see end of this file). -# For anything else (that doesn't set env vars, or that needs a window manager), -# better use the Autostart folder. - -# TODO: Use GenericConfigLocation once we depend on Qt 5.4 -scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'` - -# Add /env/ to the directory to locate the scripts to be sourced -for prefix in `echo $scriptpath`; do - for file in "$prefix"/env/*.sh; do - test -r "$file" && . "$file" - done -done - -# Set a left cursor instead of the standard X11 "X" cursor, since I've heard -# from some users that they're confused and don't know what to do. This is -# especially necessary on slow machines, where starting KDE takes one or two -# minutes until anything appears on the screen. -# -# If the user has overwritten fonts, the cursor font may be different now -# so don't move this up. -# -xsetroot -cursor_name left_ptr - -echo 'startkde: Starting up...' 1>&2 - -# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all. -# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend -# to set it to a list of paths *not* including the KDE prefix if it's not /usr or -# /usr/local. -if test -z "$XDG_DATA_DIRS"; then - XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share" -fi -export XDG_DATA_DIRS - -# Make sure that D-Bus is running -# D-Bus autolaunch is broken -if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then - eval `dbus-launch --sh-syntax --exit-with-session` -fi -if $qdbus >/dev/null 2>/dev/null; then - : # ok -else - echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - message "Could not start D-Bus. Can you call qdbus?" - exit 1 -fi - - -# Mark that full KDE session is running (e.g. Konqueror preloading works only -# with full KDE running). The KDE_FULL_SESSION property can be detected by -# any X client connected to the same X session, even if not launched -# directly from the KDE session but e.g. using "ssh -X", kdesu. $KDE_FULL_SESSION -# however guarantees that the application is launched in the same environment -# like the KDE session and that e.g. KDE utilities/libraries are available. -# KDE_FULL_SESSION property is also only available since KDE 3.5.5. -# The matching tests are: -# For $KDE_FULL_SESSION: -# if test -n "$KDE_FULL_SESSION"; then ... whatever -# For KDE_FULL_SESSION property: -# xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null -# if test $? -eq 0; then ... whatever -# -# Additionally there is (since KDE 3.5.7) $KDE_SESSION_UID with the uid -# of the user running the KDE session. It should be rarely needed (e.g. -# after sudo to prevent desktop-wide functionality in the new user's kded). -# -# Since KDE4 there is also KDE_SESSION_VERSION, containing the major version number. -# Note that this didn't exist in KDE3, which can be detected by its absense and -# the presence of KDE_FULL_SESSION. -# -KDE_FULL_SESSION=true -export KDE_FULL_SESSION -xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true - -KDE_SESSION_VERSION=5 -export KDE_SESSION_VERSION -xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 - -KDE_SESSION_UID=`id -ru` -export KDE_SESSION_UID - -XDG_CURRENT_DESKTOP=KDE -export XDG_CURRENT_DESKTOP - -# At this point all the environment is ready, let's send it to kwalletd if running -if test -n "$PAM_KWALLET_LOGIN" ; then - env | socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN -fi - -# At this point all environment variables are set, let's send it to the DBus session server to update the activation environment -@CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv -if test $? -ne 0; then - # Startup error - echo 'startkde: Could not sync environment to dbus.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - message "Could not sync environment to dbus." - exit 1 -fi - -@CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup -if test $? -ne 0; then - # Startup error - echo 'startkde: Could not start kdeinit5. Check your installation.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - message "Could not start kdeinit5. Check your installation." - exit 1 -fi - -# finally, give the session control to the session manager -# see kdebase/ksmserver for the description of the rest of the startup sequence -# if the KDEWM environment variable has been set, then it will be used as KDE's -# window manager instead of kwin. -# if KDEWM is not set, ksmserver will ensure kwin is started. -# kwrapper5 is used to reduce startup time and memory usage -# kwrapper5 does not return useful error codes such as the exit code of ksmserver. -# We only check for 255 which means that the ksmserver process could not be -# started, any problems thereafter, e.g. ksmserver failing to initialize, -# will remain undetected. -test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM" -# If the session should be locked from the start (locked autologin), -# lock now and do the rest of the KDE startup underneath the locker. -KSMSERVEROPTIONS="" -test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen" -kwrapper5 ksmserver $KDEWM $KSMSERVEROPTIONS -if test $? -eq 255; then - # Startup error - echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - message "Could not start ksmserver. Check your installation." -fi - -wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` - -if test x"$wait_drkonqi"x = x"true"x ; then - # wait for remaining drkonqi instances with timeout (in seconds) - wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` - wait_drkonqi_counter=0 - while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do - sleep 5 - wait_drkonqi_counter=$((wait_drkonqi_counter+5)) - if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then - # ask remaining drkonqis to die in a graceful way - $qdbus | grep 'org.kde.drkonqi-' | while read address ; do - $qdbus "$address" "/MainApplication" "quit" - done - break - fi - done -fi - -echo 'startkde: Shutting down...' 1>&2 -# just in case -test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - -# Clean up -kdeinit5_shutdown - -echo 'startkde: Running shutdown scripts...' 1>&2 - -# Run scripts found in /plasma-workspace/shutdown -for prefix in `echo "$scriptpath"`; do - for file in `ls "$prefix"/shutdown 2> /dev/null | egrep -v '(~|\.bak)$'`; do - test -x "$prefix/shutdown/$file" && "$prefix/shutdown/$file" - done -done - -unset KDE_FULL_SESSION -xprop -root -remove KDE_FULL_SESSION -unset KDE_SESSION_VERSION -xprop -root -remove KDE_SESSION_VERSION -unset KDE_SESSION_UID - -echo 'startkde: Done.' 1>&2 diff --git a/startkde.patch b/startkde.patch new file mode 100644 index 0000000..4e64870 --- /dev/null +++ b/startkde.patch @@ -0,0 +1,198 @@ +--- a/startkde/startkde.cmake 2015-08-20 07:14:44.485536130 -0500 ++++ b/startkde/startkde.cmake 2015-07-13 11:44:54.691600517 -0500 +@@ -16,25 +16,22 @@ + # we have to unset this for Darwin since it will screw up KDE's dynamic-loading + unset DYLD_FORCE_FLAT_NAMESPACE + +-# in case we have been started with full pathname spec without being in PATH +-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` +-if [ -n "$bindir" ]; then +- qbindir=`qtpaths --binaries-dir` +- qdbus=$qbindir/qdbus +- case $PATH in +- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; +- *) PATH=$bindir:$PATH; export PATH;; +- esac +-else +- qdbus=qdbus +-fi ++qdbus=qdbus-qt5 ++ ++# See http://bugzilla.redhat.com/537609 , a naive attempt to drop dep ++# on xmessage and allow alternatives like zenity. ++message() { ++ xmessage -geometry 500x100 "$1" > /dev/null 2>/dev/null || \ ++ zenity --info --text="$1" > /dev/null 2>/dev/null ||: ++ return $? ++} + + # Check if a KDE session already is running and whether it's possible to connect to X + kcheckrunning + kcheckrunning_result=$? + if test $kcheckrunning_result -eq 0 ; then + echo "KDE seems to be already running on this display." +- xmessage -geometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null ++ message "KDE seems to be already running on this display." > /dev/null 2>/dev/null + exit 1 + elif test $kcheckrunning_result -eq 2 ; then + echo "\$DISPLAY is not set or cannot connect to the X server." +@@ -90,53 +87,10 @@ + . $exportformatssettings + } + +-# Write a default kdeglobals file to set up the font +-kdeglobalsfile=$configDir/kdeglobals +-test -f $kdeglobalsfile || { +-cat >$kdeglobalsfile <&2 + + # Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all. +@@ -292,7 +195,7 @@ + else + echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2 + test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null +- xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?" ++ message "Could not start D-Bus. Can you call qdbus?" + exit 1 + fi + +@@ -348,18 +247,16 @@ + # Startup error + echo 'startkde: Could not sync environment to dbus.' 1>&2 + test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null +- xmessage -geometry 500x100 "Could not sync environment to dbus." ++ message "Could not sync environment to dbus." + exit 1 + fi + +-# We set LD_BIND_NOW to increase the efficiency of kdeinit. +-# kdeinit unsets this variable before loading applications. +-LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup ++@CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup + if test $? -ne 0; then + # Startup error + echo 'startkde: Could not start kdeinit5. Check your installation.' 1>&2 + test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null +- xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." ++ message "Could not start kdeinit5. Check your installation." + exit 1 + fi + +@@ -383,7 +280,7 @@ + # Startup error + echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2 + test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null +- xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." ++ message "Could not start ksmserver. Check your installation." + fi + + wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`