diff --git a/.gitignore b/.gitignore index 441c49b..817147c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /plasma-workspace-5.8.6.tar.xz /breeze-fedora-0.2.tar.gz /plasma-workspace-5.9.5.1.tar.xz +/plasma-workspace-5.10.0.tar.xz diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 13de0bf..dc64711 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -6,8 +6,8 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.9.5.1 -Release: 2%{?dist} +Version: 5.10.0 +Release: 1%{?dist} License: GPLv2+ URL: https://cgit.kde.org/%{name}.git @@ -77,6 +77,7 @@ BuildRequires: libXrender-devel BuildRequires: libXfixes-devel BuildRequires: libXrandr-devel BuildRequires: libXcursor-devel +BuildRequires: libXtst-devel BuildRequires: libxcb-devel BuildRequires: xcb-util-keysyms-devel BuildRequires: xcb-util-image-devel @@ -550,7 +551,7 @@ install -p -D -m755 drkonqi/doc/examples/installdbgsymbols_fedora.sh \ %find_lang all --with-html --with-qt --all-name grep "%{_kf5_docdir}" all.lang > %{name}-doc.lang -grep drkonqi.mo all.lang > drkonqi.lang +grep drkonqi5.mo all.lang > drkonqi.lang grep libkworkspace.mo all.lang > libkworkspace5.lang # any translations not used elsewhere, include in main pkg cat *.lang | sort | uniq -u > %{name}.lang @@ -618,6 +619,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/{plasma-windowed,org. %{_datadir}/applications/org.kde.klipper.desktop %{_datadir}/applications/plasma-windowed.desktop %{_datadir}/xsessions/plasma.desktop +%{_kf5_bindir}/plasma_waitforname # PAM %config(noreplace) %{_sysconfdir}/pam.d/kde %exclude %{_kf5_datadir}/kservices5/plasma-dataengine-geolocation.desktop @@ -639,7 +641,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/{plasma-windowed,org. %files libs %{_sysconfdir}/xdg/taskmanagerrulesrc %{_libdir}/libtaskmanager.so.6 -%{_libdir}/libtaskmanager.so.%{majmin_ver}* +%{_libdir}/libtaskmanager.so.%{version}* %{_libdir}/libweather_ion.so.7* # multilib'able plugins %{_kf5_qtplugindir}/plasma/applets/ @@ -709,7 +711,7 @@ fi %files -n sddm-breeze %{_datadir}/sddm/themes/breeze/ %{_datadir}/sddm/themes/01-breeze-fedora/ -%config(noreplace) %{_datadir}/sddm/themes/01-breeze-fedora/theme.conf.user +#%config(noreplace) %{_datadir}/sddm/themes/01-breeze-fedora/theme.conf.user %files wayland %{_kf5_bindir}/startplasmacompositor @@ -728,6 +730,9 @@ fi %changelog +* Wed May 31 2017 Jan Grulich - 5.10.0-1 +- 5.10.0 + * Mon May 15 2017 Fedora Release Engineering - 5.9.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild diff --git a/sources b/sources index fa77897..4cee72d 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (plasma-workspace-5.9.5.1.tar.xz) = 064ac0e8ecdd6b8b6b1a125943dc1d1a196ff9ef108e88e71b9d5d2ac54e4f60a11535373d9f783080ac9e23fd20d0d902c7d155c65dfbcbdca036cc62c57aad +SHA512 (plasma-workspace-5.10.0.tar.xz) = 77dca04c822fbcb246ba60ebb1775fdf0fac9b8cfc148a3f047bacf27f967faf08fb69cac61539532e212673edb24024d7a738aaf6bc307ecf9dc016bde8b45d diff --git a/startkde.patch b/startkde.patch index abaeec6..445bc0a 100644 --- a/startkde.patch +++ b/startkde.patch @@ -1,23 +1,9 @@ -diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index 135ed1b..7062df2 100644 ---- a/startkde/startkde.cmake -+++ b/startkde/startkde.cmake -@@ -12,7 +12,7 @@ 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." -diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake -index 59dc7b7..f46515f 100644 ---- a/startkde/startplasma.cmake -+++ b/startkde/startplasma.cmake -@@ -49,48 +49,6 @@ if test -z "$dl"; then - esac - fi +diff -up plasma-workspace-5.8.1/startkde/startkde.cmake.startkde plasma-workspace-5.8.1/startkde/startkde.cmake +--- plasma-workspace-5.8.1/startkde/startkde.cmake.startkde 2016-10-11 07:46:00.000000000 -0500 ++++ plasma-workspace-5.8.1/startkde/startkde.cmake 2016-10-11 11:33:58.811705935 -0500 +@@ -215,48 +169,6 @@ for prefix in `echo $scriptpath`; do + done + done -# Activate the kde font directories. -# @@ -64,24 +50,14 @@ index 59dc7b7..f46515f 100644 # 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 -@@ -101,29 +59,18 @@ xset fp rehash - # - xsetroot -cursor_name left_ptr - --# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap --if test -n "$GS_LIB" ; then -- GS_LIB=$usr_fdir:$GS_LIB -- export GS_LIB --else -- GS_LIB=$usr_fdir -- export GS_LIB --fi -- - echo 'startplasma: Starting up...' 1>&2 - - # export our session variables to the Xwayland server - xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true - xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 +@@ -344,18 +238,16 @@ 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 +- 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. @@ -89,116 +65,10 @@ index 59dc7b7..f46515f 100644 +@CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup if test $? -ne 0; then # Startup error - echo 'startplasma: Could not start kdeinit5. Check your installation.' 1>&2 + 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 -@@ -147,7 +94,7 @@ if test $? -eq 255; then - # Startup error - echo 'startplasma: 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` -diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake -index 5bcf26a..f3885c9 100644 ---- a/startkde/startplasmacompositor.cmake -+++ b/startkde/startplasmacompositor.cmake -@@ -4,17 +4,15 @@ - # - - # 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 $? -+} - - # We need to create config folder so we can write startupconfigkeys - if [ ${XDG_CONFIG_HOME} ]; then -@@ -51,49 +49,6 @@ test -f $exportformatssettings && { - . $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. --# 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="@KDE_INSTALL_FULL_DATADIR@:/usr/share:/usr/local/share" --fi --export XDG_DATA_DIRS -- - # Make sure that D-Bus is running - if $qdbus >/dev/null 2>/dev/null; then - : # ok