From 5c928152d94ba59a8a1d8f661017dfae3bd456948c301328a81f21ae9aed8b7f Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 15 May 2021 16:16:58 +0000 Subject: [PATCH 1/3] Plasma 5.22 Beta, tested a bit more. Now with cmake >= 3.16 and duplicates in .changes removed (now using git log a..b instead of a...b) OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/breeze?expand=0&rev=335 --- breeze-5.21.5.tar.xz | 3 --- breeze-5.21.5.tar.xz.sig | 11 ----------- breeze-5.21.90.tar.xz | 3 +++ breeze-5.21.90.tar.xz.sig | 11 +++++++++++ breeze.changes | 9 +++++++++ breeze.spec | 8 ++++---- 6 files changed, 27 insertions(+), 18 deletions(-) delete mode 100644 breeze-5.21.5.tar.xz delete mode 100644 breeze-5.21.5.tar.xz.sig create mode 100644 breeze-5.21.90.tar.xz create mode 100644 breeze-5.21.90.tar.xz.sig diff --git a/breeze-5.21.5.tar.xz b/breeze-5.21.5.tar.xz deleted file mode 100644 index 02ad647..0000000 --- a/breeze-5.21.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9774c695da7d51c45116f85358e002663a1ccc5681b04c9afc7a57e8b075980c -size 26286020 diff --git a/breeze-5.21.5.tar.xz.sig b/breeze-5.21.5.tar.xz.sig deleted file mode 100644 index 3313512..0000000 --- a/breeze-5.21.5.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCAAdFiEEs8s2ZVJUC+Bu6a2XEZaMRJKMrvwFAmCRM7kACgkQEZaMRJKM -rvw1CAf/Ukp7a7V4ri9aqkhstWBYywrtz47YyktKpQUDr0srmv9tD8F54f1VFTk8 -FNQr7s2DebyYWhzZBUyoSWyOWu6bXDSBp+kEdufk605ZDNVZ/sHNFTCKZT9133Ps -A/bB6nwQX4GTdyCp7pXmi1DYG2MHPrSFEjdhSdWAMlB7K4rpe/8qyngG25Aqilud -HYoBowo6jJliG1tkeQew0tibsyCflL24/nFt3Gcqdn4IVE0u+pDuZm2CWnCGlUXB -LLcgPRG26LfBdAXw33w2s6Wf+0T2cqLIYWQHugBjdIY2dA8aervUZ2tKWQk2ruWb -usNUFP9Gp+Bgb11oZdSs8IDq3D9Fhg== -=uz8h ------END PGP SIGNATURE----- diff --git a/breeze-5.21.90.tar.xz b/breeze-5.21.90.tar.xz new file mode 100644 index 0000000..e62a787 --- /dev/null +++ b/breeze-5.21.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47994f7c578bbd2252780d315ffdf8c04ebacc343d78451378d63ef1ae2dc098 +size 26280028 diff --git a/breeze-5.21.90.tar.xz.sig b/breeze-5.21.90.tar.xz.sig new file mode 100644 index 0000000..b498204 --- /dev/null +++ b/breeze-5.21.90.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmCdI3kACgkQ7JTRj38F +mX4jYQf+NABpbisI0QDsO2jEa8EDwbhcOjBrCTXRMGqmlAt0AtnhfkIS6BFQDrOd +fonc0X3BHzTAuu2PwU7QoDf0EtbbF13QYoJLwU6HW5egWamKTMQFrPfTC9U1MJ0/ +t0jwCaoxlLlEnEf2xOR/ubbkrP9uvgZ9Ic1vd6wOTBfdVV2tGdg3gxZ7h0zRqBrx +0nw/kkNCZw8AJNcDYqkB38WzfRPv6ogGuzyw2FKjfCrEJM0L71y7mjtb+hjYmUMC +nGKW1A40kTxgATmIWDCbNk02xE/wTOuRupTwUgpo8Gr0J9QfvbZ/fCHoBI6rmgOG +/d1zG3jgTWsTdG/L3+RsMz2Olp2DvQ== +=MFMO +-----END PGP SIGNATURE----- diff --git a/breeze.changes b/breeze.changes index 9683186..f6802be 100644 --- a/breeze.changes +++ b/breeze.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu May 13 18:15:27 UTC 2021 - Fabian Vogt + +- Update to 5.21.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/plasma/5/5.21.90 +- Too many changes to list here + ------------------------------------------------------------------- Tue May 4 14:15:38 UTC 2021 - Fabian Vogt diff --git a/breeze.spec b/breeze.spec index 06119e4..686ec85 100644 --- a/breeze.spec +++ b/breeze.spec @@ -22,18 +22,18 @@ %{!?_plasma5_version: %define _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: breeze -Version: 5.21.5 +Version: 5.21.90 Release: 0 Summary: Plasma Desktop artwork, styles and assets License: GPL-2.0-or-later Group: System/GUI/KDE URL: http://www.kde.org -Source: https://download.kde.org/stable/plasma/%{version}/breeze-%{version}.tar.xz +Source: https://download.kde.org/unstable/plasma/%{version}/breeze-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/stable/plasma/%{version}/breeze-%{version}.tar.xz.sig +Source1: https://download.kde.org/unstable/plasma/%{version}/breeze-%{version}.tar.xz.sig Source2: plasma.keyring %endif -BuildRequires: cmake >= 2.8.12 +BuildRequires: cmake >= 3.16 BuildRequires: extra-cmake-modules >= 0.0.13 BuildRequires: fdupes BuildRequires: hicolor-icon-theme From 4aecc072dfec33a598681d5d9929c969d1fd2a1ed42e978c9a82c5b6f5fec16d Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 28 May 2021 12:31:01 +0000 Subject: [PATCH 2/3] Accepting request 895892 from home:Vogtinator:plasma5.22 - Add patch to fix misbehaving cursor after passing splitters (kde#436473): * 0001-Fix-informing-the-underlying-widget-when-leaving-Spl.patch OBS-URL: https://build.opensuse.org/request/show/895892 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/breeze?expand=0&rev=336 --- ...e-underlying-widget-when-leaving-Spl.patch | 51 +++++++++++++++++++ breeze.changes | 6 +++ breeze.spec | 2 + 3 files changed, 59 insertions(+) create mode 100644 0001-Fix-informing-the-underlying-widget-when-leaving-Spl.patch diff --git a/0001-Fix-informing-the-underlying-widget-when-leaving-Spl.patch b/0001-Fix-informing-the-underlying-widget-when-leaving-Spl.patch new file mode 100644 index 0000000..49c7bc8 --- /dev/null +++ b/0001-Fix-informing-the-underlying-widget-when-leaving-Spl.patch @@ -0,0 +1,51 @@ +From 96eecd246771bf9db425e9be758401494d4d2131 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Sat, 15 May 2021 17:45:54 +0200 +Subject: [PATCH] Fix informing the underlying widget when leaving + SplitterProxy + +While the SplitterProxy is active, it intercepts all relevant events, so that +the underlying widget still thinks it's in the same "on splitter" state. When +the SplitterProxy is left, the underlying widget is sent a HoverLeave/HoverMove +event to make it aware of the new current cursor position. Without this, it +doesn't know that it's not supposed to be in the "on splitter" state, and when +it regains focus it just re-activates the SplitterProxy at the current cursor +position. + +This was broken by accident in d201a1f187 ("Fix SplitterProxy not clearing +when above another QSplitterHandle"), which moved the hide() call past the +call to QCoreApplication::sendEvent. Previously that made isVisible() false, +which also prevented the interception of the HoverLeave/HoverMove events. + +BUG: 436473 +(cherry picked from commit f99b7ef621c9c69544158d245699fd8104db6753) +--- + kstyle/breezesplitterproxy.cpp | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/kstyle/breezesplitterproxy.cpp b/kstyle/breezesplitterproxy.cpp +index 0cf5685f..d4db407b 100644 +--- a/kstyle/breezesplitterproxy.cpp ++++ b/kstyle/breezesplitterproxy.cpp +@@ -341,11 +341,14 @@ namespace Breeze + // send hover event + if( _splitter ) + { +- QHoverEvent hoverEvent( +- qobject_cast(_splitter.data()) ? QEvent::HoverLeave : QEvent::HoverMove, +- _splitter.data()->mapFromGlobal(QCursor::pos()), _hook); +- QCoreApplication::sendEvent( _splitter.data(), &hoverEvent ); ++ // SplitterProxy intercepts HoverLeave/HoverMove events to _splitter, ++ // but this is meant to reach it directly. Unset _splitter to stop interception. ++ auto splitter = _splitter; + _splitter.clear(); ++ QHoverEvent hoverEvent( ++ qobject_cast(splitter.data()) ? QEvent::HoverLeave : QEvent::HoverMove, ++ splitter.data()->mapFromGlobal(QCursor::pos()), _hook); ++ QCoreApplication::sendEvent( splitter.data(), &hoverEvent ); + } + + // kill timer if any +-- +2.25.1 + diff --git a/breeze.changes b/breeze.changes index f6802be..8df9f64 100644 --- a/breeze.changes +++ b/breeze.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 28 06:47:58 UTC 2021 - Fabian Vogt + +- Add patch to fix misbehaving cursor after passing splitters (kde#436473): + * 0001-Fix-informing-the-underlying-widget-when-leaving-Spl.patch + ------------------------------------------------------------------- Thu May 13 18:15:27 UTC 2021 - Fabian Vogt diff --git a/breeze.spec b/breeze.spec index 686ec85..cf44613 100644 --- a/breeze.spec +++ b/breeze.spec @@ -33,6 +33,8 @@ Source: https://download.kde.org/unstable/plasma/%{version}/breeze-%{ver Source1: https://download.kde.org/unstable/plasma/%{version}/breeze-%{version}.tar.xz.sig Source2: plasma.keyring %endif +# PATCH-FIX-UPSTREAM +Patch1: 0001-Fix-informing-the-underlying-widget-when-leaving-Spl.patch BuildRequires: cmake >= 3.16 BuildRequires: extra-cmake-modules >= 0.0.13 BuildRequires: fdupes From e255f1186d4d81591ea7a3a8df7ae36eee124a7a20cadf14846d87e6251e1d5b Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Fri, 4 Jun 2021 12:42:04 +0000 Subject: [PATCH 3/3] Plasma 5.22.0, disable publishing before accepting. ksystemstats5 link fixed, cherry-picked revert removed from .changes OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/breeze?expand=0&rev=337 --- ...e-underlying-widget-when-leaving-Spl.patch | 51 ------------------- breeze-5.21.90.tar.xz | 3 -- breeze-5.21.90.tar.xz.sig | 11 ---- breeze-5.22.0.tar.xz | 3 ++ breeze-5.22.0.tar.xz.sig | 11 ++++ breeze.changes | 14 +++++ breeze.spec | 8 ++- 7 files changed, 31 insertions(+), 70 deletions(-) delete mode 100644 0001-Fix-informing-the-underlying-widget-when-leaving-Spl.patch delete mode 100644 breeze-5.21.90.tar.xz delete mode 100644 breeze-5.21.90.tar.xz.sig create mode 100644 breeze-5.22.0.tar.xz create mode 100644 breeze-5.22.0.tar.xz.sig diff --git a/0001-Fix-informing-the-underlying-widget-when-leaving-Spl.patch b/0001-Fix-informing-the-underlying-widget-when-leaving-Spl.patch deleted file mode 100644 index 49c7bc8..0000000 --- a/0001-Fix-informing-the-underlying-widget-when-leaving-Spl.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 96eecd246771bf9db425e9be758401494d4d2131 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Sat, 15 May 2021 17:45:54 +0200 -Subject: [PATCH] Fix informing the underlying widget when leaving - SplitterProxy - -While the SplitterProxy is active, it intercepts all relevant events, so that -the underlying widget still thinks it's in the same "on splitter" state. When -the SplitterProxy is left, the underlying widget is sent a HoverLeave/HoverMove -event to make it aware of the new current cursor position. Without this, it -doesn't know that it's not supposed to be in the "on splitter" state, and when -it regains focus it just re-activates the SplitterProxy at the current cursor -position. - -This was broken by accident in d201a1f187 ("Fix SplitterProxy not clearing -when above another QSplitterHandle"), which moved the hide() call past the -call to QCoreApplication::sendEvent. Previously that made isVisible() false, -which also prevented the interception of the HoverLeave/HoverMove events. - -BUG: 436473 -(cherry picked from commit f99b7ef621c9c69544158d245699fd8104db6753) ---- - kstyle/breezesplitterproxy.cpp | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/kstyle/breezesplitterproxy.cpp b/kstyle/breezesplitterproxy.cpp -index 0cf5685f..d4db407b 100644 ---- a/kstyle/breezesplitterproxy.cpp -+++ b/kstyle/breezesplitterproxy.cpp -@@ -341,11 +341,14 @@ namespace Breeze - // send hover event - if( _splitter ) - { -- QHoverEvent hoverEvent( -- qobject_cast(_splitter.data()) ? QEvent::HoverLeave : QEvent::HoverMove, -- _splitter.data()->mapFromGlobal(QCursor::pos()), _hook); -- QCoreApplication::sendEvent( _splitter.data(), &hoverEvent ); -+ // SplitterProxy intercepts HoverLeave/HoverMove events to _splitter, -+ // but this is meant to reach it directly. Unset _splitter to stop interception. -+ auto splitter = _splitter; - _splitter.clear(); -+ QHoverEvent hoverEvent( -+ qobject_cast(splitter.data()) ? QEvent::HoverLeave : QEvent::HoverMove, -+ splitter.data()->mapFromGlobal(QCursor::pos()), _hook); -+ QCoreApplication::sendEvent( splitter.data(), &hoverEvent ); - } - - // kill timer if any --- -2.25.1 - diff --git a/breeze-5.21.90.tar.xz b/breeze-5.21.90.tar.xz deleted file mode 100644 index e62a787..0000000 --- a/breeze-5.21.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:47994f7c578bbd2252780d315ffdf8c04ebacc343d78451378d63ef1ae2dc098 -size 26280028 diff --git a/breeze-5.21.90.tar.xz.sig b/breeze-5.21.90.tar.xz.sig deleted file mode 100644 index b498204..0000000 --- a/breeze-5.21.90.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmCdI3kACgkQ7JTRj38F -mX4jYQf+NABpbisI0QDsO2jEa8EDwbhcOjBrCTXRMGqmlAt0AtnhfkIS6BFQDrOd -fonc0X3BHzTAuu2PwU7QoDf0EtbbF13QYoJLwU6HW5egWamKTMQFrPfTC9U1MJ0/ -t0jwCaoxlLlEnEf2xOR/ubbkrP9uvgZ9Ic1vd6wOTBfdVV2tGdg3gxZ7h0zRqBrx -0nw/kkNCZw8AJNcDYqkB38WzfRPv6ogGuzyw2FKjfCrEJM0L71y7mjtb+hjYmUMC -nGKW1A40kTxgATmIWDCbNk02xE/wTOuRupTwUgpo8Gr0J9QfvbZ/fCHoBI6rmgOG -/d1zG3jgTWsTdG/L3+RsMz2Olp2DvQ== -=MFMO ------END PGP SIGNATURE----- diff --git a/breeze-5.22.0.tar.xz b/breeze-5.22.0.tar.xz new file mode 100644 index 0000000..1028dba --- /dev/null +++ b/breeze-5.22.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b3d2d00bfbafe7cfb6f540809cd89447a52e00c6c435bb671c944af0f2f96ef +size 34545996 diff --git a/breeze-5.22.0.tar.xz.sig b/breeze-5.22.0.tar.xz.sig new file mode 100644 index 0000000..6e03fdf --- /dev/null +++ b/breeze-5.22.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmC437AACgkQ7JTRj38F +mX4klwf9FPj09QZe6mTQZ53WxPaIyCElRlaT1GbCoDfTKfGGJ0hig8NnO0TsgjYM +rWqvwhBwy7i5G3yEBAT6IC2OMGfhbFSrqJaIdu329V8rvLeLxFEyYoLUFYPOCE6y +YuyLCi70YTG2PeDSyRCmPe/nyqVEWkChUx3YS96I2AYk+VUA4L3Db5CH59TuEL2s +REjV5b5I8bTbIXqyguK3/KpP1el64HKn/g48ovG/to3XohfAek9bPuf88L8aJyNg +YoDBP7wq7rRLwcbSDwdvqsxyS9KGrpFhTW0a2n2TR7iav1Rsd6bd1O3DqLtSG9pd +t9wCE7D5Ue+lxg/bg+1qY40cF9wiFQ== +=TOCh +-----END PGP SIGNATURE----- diff --git a/breeze.changes b/breeze.changes index 8df9f64..9e6ad92 100644 --- a/breeze.changes +++ b/breeze.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Jun 3 13:06:12 UTC 2021 - Fabian Vogt + +- Update to 5.22.0 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/plasma/5/5.22.0 +- Changes since 5.21.90: + * Update new wallpaper name and breeze dark and twilight previews + * Add new default wallpaper + * Fix informing the underlying widget when leaving SplitterProxy (kde#436473) +- Drop patches, now upstream: + * 0001-Fix-informing-the-underlying-widget-when-leaving-Spl.patch + ------------------------------------------------------------------- Fri May 28 06:47:58 UTC 2021 - Fabian Vogt diff --git a/breeze.spec b/breeze.spec index cf44613..527d843 100644 --- a/breeze.spec +++ b/breeze.spec @@ -22,19 +22,17 @@ %{!?_plasma5_version: %define _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: breeze -Version: 5.21.90 +Version: 5.22.0 Release: 0 Summary: Plasma Desktop artwork, styles and assets License: GPL-2.0-or-later Group: System/GUI/KDE URL: http://www.kde.org -Source: https://download.kde.org/unstable/plasma/%{version}/breeze-%{version}.tar.xz +Source: breeze-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/unstable/plasma/%{version}/breeze-%{version}.tar.xz.sig +Source1: breeze-%{version}.tar.xz.sig Source2: plasma.keyring %endif -# PATCH-FIX-UPSTREAM -Patch1: 0001-Fix-informing-the-underlying-widget-when-leaving-Spl.patch BuildRequires: cmake >= 3.16 BuildRequires: extra-cmake-modules >= 0.0.13 BuildRequires: fdupes