diff --git a/.gitignore b/.gitignore index f63a7ca..753f4a8 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,4 @@ /plasma-workspace-5.24.3.tar.xz /plasma-workspace-5.24.4.tar.xz /plasma-workspace-5.24.5.tar.xz +/plasma-workspace-5.24.6.tar.xz diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 8143004..ad6fdd4 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -27,8 +27,8 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.24.5 -Release: 1%{?dist}.1 +Version: 5.24.6 +Release: 1%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -802,6 +802,9 @@ fi %changelog +* Wed Jul 13 2022 Troy Dawson - 5.24.6-1 +- Update to 5.24.6 + * Thu Jun 16 2022 Troy Dawson - 5.24.5-1.1 - Enable selinuxuser_execmod (#2058657) diff --git a/sources b/sources index 57f0811..dd212b4 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 +SHA512 (plasma-workspace-5.24.6.tar.xz) = 4e49f59d565e0b84951122155158966a54c05a6999ff99503bfff667c780fac6cfc076326f0cac7d53629bfc1d81599b30e919848168f6beb79a4dc7cf7c5560 SHA512 (sddm-theme-5.24.80~pre.tar.gz) = 3b04c739d6054ecd9149178cafd3d7f53214a48fea834092707c5fd309018ea4986d4a955db7a2888a428c9b264e40403c36adae5f079d51979fe37912895344 -SHA512 (plasma-workspace-5.24.5.tar.xz) = ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996 diff --git a/sources.keep b/sources.keep deleted file mode 100644 index 20f7e0e..0000000 --- a/sources.keep +++ /dev/null @@ -1,2 +0,0 @@ -SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (sddm-theme-5.24.80~pre.tar.gz) = 3b04c739d6054ecd9149178cafd3d7f53214a48fea834092707c5fd309018ea4986d4a955db7a2888a428c9b264e40403c36adae5f079d51979fe37912895344 diff --git a/startkde.patch b/startkde.patch deleted file mode 100644 index e702c44..0000000 --- a/startkde.patch +++ /dev/null @@ -1,114 +0,0 @@ -diff -up plasma-workspace-5.12.5/startkde/startkde.cmake.startkde plasma-workspace-5.12.5/startkde/startkde.cmake ---- plasma-workspace-5.12.5/startkde/startkde.cmake.startkde 2018-05-01 08:03:40.000000000 -0500 -+++ plasma-workspace-5.12.5/startkde/startkde.cmake 2018-05-06 21:12:49.592504191 -0500 -@@ -279,22 +237,21 @@ 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." -+ xmessage "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." -+ xmessage "Could not start kdeinit5. Check your installation." - exit 1 - fi - --qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & -+qdbus=qdbus-qt5 -+$qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & - - # finally, give the session control to the session manager - # see kdebase/ksmserver for the description of the rest of the startup sequence -@@ -327,13 +284,13 @@ if test x"$wait_drkonqi"x = x"true"x ; t - # 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 -+ 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" -+ $qdbus | grep 'org.kde.drkonqi-' | while read address ; do -+ $qdbus "$address" "/MainApplication" "quit" - done - break - fi -diff -up plasma-workspace-5.12.5/startkde/startplasma.cmake.startkde plasma-workspace-5.12.5/startkde/startplasma.cmake ---- plasma-workspace-5.12.5/startkde/startplasma.cmake.startkde 2018-05-01 08:03:40.000000000 -0500 -+++ plasma-workspace-5.12.5/startkde/startplasma.cmake 2018-05-06 21:11:54.749023404 -0500 -@@ -140,7 +140,8 @@ if test $? -ne 0; then - exit 1 - fi - --qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & -+qdbus=qdbus-qt5 -+$qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & - - # finally, give the session control to the session manager - # see kdebase/ksmserver for the description of the rest of the startup sequence -@@ -169,13 +170,13 @@ if test x"$wait_drkonqi"x = x"true"x ; t - # 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 -+ 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" -+ $qdbus | grep 'org.kde.drkonqi-' | while read address ; do -+ $qdbus "$address" "/MainApplication" "quit" - done - break - fi -diff -up plasma-workspace-5.12.5/startkde/startplasmacompositor.cmake.startkde plasma-workspace-5.12.5/startkde/startplasmacompositor.cmake ---- plasma-workspace-5.12.5/startkde/startplasmacompositor.cmake.startkde 2018-05-01 08:03:40.000000000 -0500 -+++ plasma-workspace-5.12.5/startkde/startplasmacompositor.cmake 2018-05-06 21:11:54.749023404 -0500 -@@ -3,6 +3,8 @@ - # DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) - # - -+qdbus=qdbus-qt5 -+ - # We need to create config folder so we can write startupconfigkeys - if [ ${XDG_CONFIG_HOME} ]; then - configDir=$XDG_CONFIG_HOME; -@@ -120,12 +122,12 @@ fi - - # Get a property value from org.freedesktop.locale1 - queryLocale1() { -- qdbus --system org.freedesktop.locale1 /org/freedesktop/locale1 "$1" -+ $qdbus --system org.freedesktop.locale1 /org/freedesktop/locale1 "$1" - } - - # Query whether org.freedesktop.locale1 is available. If it is, try to - # set XKB_DEFAULT_{MODEL,LAYOUT,VARIANT,OPTIONS} accordingly. --if qdbus --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then -+if $qdbus --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then - # Do not overwrite existing values. There is no point in setting only some - # of them as then they would not match anymore. - if [ -z "${XKB_DEFAULT_MODEL}" -a -z "${XKB_DEFAULT_LAYOUT}" -a \ -@@ -175,7 +177,7 @@ fi - export XDG_DATA_DIRS - - # Make sure that D-Bus is running --if qdbus >/dev/null 2>/dev/null; then -+if $qdbus >/dev/null 2>/dev/null; then - : # ok - else - echo 'startplasmacompositor: Could not start D-Bus. Can you call qdbus?' 1>&2