SHA256
1
0
forked from pool/breeze
Christophe Giboudeaux 2022-09-07 07:52:14 +00:00 committed by Git OBS Bridge
parent 986b09a18c
commit 24260ef3a6
7 changed files with 33 additions and 55 deletions

View File

@ -1,33 +0,0 @@
From 5647eaf512b61b96742dfece1146424978856f69 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Tue, 23 Aug 2022 14:31:53 +0200
Subject: [PATCH] Look at QStyleOptionProgressBar::orientation again
Some applications (KGet, DigiKam) use that and not QStyle::State_Horizontal.
For compatibility, keep looking at it as long as it's available.
(cherry picked from commit 5596fd9f2e014e59f3764023d6b1099ce1316028)
---
kstyle/breezestyle.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp
index 600d0164..57c502e5 100644
--- a/kstyle/breezestyle.cpp
+++ b/kstyle/breezestyle.cpp
@@ -162,7 +162,11 @@ private:
//_______________________________________________________________
bool isProgressBarHorizontal(const QStyleOptionProgressBar *option)
{
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
return option && (option->state & QStyle::State_Horizontal);
+#else
+ return option && ((option->state & QStyle::State_Horizontal) || option->orientation == Qt::Horizontal);
+#endif
}
enum class ToolButtonMenuArrowStyle {
--
2.37.2

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:77e914e9d87d1c8191a360ebd586ef115be56600a685f1c54e81a27f80dc8053
size 31155744

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmLpAFAACgkQ11dEg7tX
sY0kIA/6AqjEt5C1TyOraXL5em8GgXu8uFQbAIAbwdDmV6kFmpuz5DyW020ZX/Sj
Q+VPb4vKrcyxTRjJk2NTsg4t00fOdT0PP6vOfWVS0gUeyrzhn9zP270olTtNWg/H
Rtd9XPzzdMPXaIlEBJhpGIOXx/GVhX8Y6fC/7Vi92T6DbHSzMsaUdh5ZMWfPD5hv
jHmMcmIikVTuOwDoEbXHp6c+E+madCjwefSGkmawwpLnAv9anD5cHXX7/17qjhCj
DVxjOlJnlsWezM4CRvRui62cYOxLEPSBb6uh3XcSx/uOuEPN0liVOxs14hpKgOKu
Y9+Dy4loGOgQWGp+0DQe282GkalJAe+3ICXtw4K2yO9cBE41mOj7tkJut1M05mFx
/DQqWdGvlWjo4cUupijVi/tzdTsP1ftyFiOc+iRsik3RbQCd93RiTS5jzHOpKVOC
7MCN3QY4mop3m6is8LG3CLk2bG8UHiweK7aG/+/Uo3/WNszXrm+AtQAa9puOYI0C
tEKap6n9/Tuzd1xsE+6vvFgtytU5Lp/SjtElYJbFTwpzL3OyK+wvroj03GrP9Q/C
HCrKISd/kB8KcgNQqrWbNuxERDcwnkzvb74wn30YK5KNCCzw6CMlmYmuxT3LmJ5/
SQ6CCUeWGG64g7eU82UIW1NbbKBEHGn7/tlLWSicERYkM21yQI4=
=Y6Ca
-----END PGP SIGNATURE-----

3
breeze-5.25.5.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9dc2803f45122fbef34e5c9abd1b2cfb887a78d9873ea78ab8cc7dfbcb7e6f54
size 31155736

16
breeze-5.25.5.tar.xz.sig Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmMXNhIACgkQ11dEg7tX
sY3FmBAAo4BCYqS9dG51ux4mF4MEunaDgmcdG7QKZdljh/BEVQat8AdFopgB6q6E
XsBZoOEcQaCQyFhE9E6KKKR6eF53zAwWXwWkktUDOLHSHe64DL0IwYQfT9AmDM7i
zsy2NgpoOZrd2dDYVEbYJmiBaw8AufoXr95SkGEqaTQTFPGOXBO7Dq8mhqnoGkSe
9jCCmCOoxK0r06lZI6XEwAaZ8Ajctaj36oOu51krdocY8BX9VT69bMB2O6Py8Bhb
9AP7EWYFt8E5TcU7YHI3fmV9x1YAEFW0Ut0fq8UHRTDU0VcAbOZRSZEFr89di3EQ
gMhI1D88Ur+XccH4BNyskRRpyGfdKfsxXxQ6AyakRnKrfgYo3YhcWGK1jNthmz8L
YdCxLlmony35cJ06Nkhe1JAH/KElSgmQjLRw9srlJqp8JqhPn3XDWzOsBiDP92fN
Esu878u9wHpnoyq7apkeAAXWL6Gam195XEi5DgebOoguGbyHQsKSvH+UnNnCI/xK
3hS41yKMFQK8hX1v5737e1/5iSauJ8VSzPI43JAXMdJ4KwJYHQe49qNpdntPPGbk
DEP7dMJSx8cyWLXsBs0TB8QLmJ9Gwo/OYttT4IUs9hgiN3msf5c2PY40bafgEVgG
afORISUHQ6uxO9nN1HUG4elCu99ScrUestB6A/ExSQUFwl461uA=
=tQym
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Tue Sep 6 16:55:21 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.25.5
* New bugfix release
* For more details please see:
* https://kde.org/announcements/plasma/5/5.25.5
- Changes since 5.25.4:
* kstyle: Fix class name to fix indeterminate progress bars animations
* Look at QStyleOptionProgressBar::orientation again
- Drop patches, now upstream:
* 0001-Look-at-QStyleOptionProgressBar-orientation-again.patch
-------------------------------------------------------------------
Tue Aug 23 12:33:29 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@ -22,7 +22,7 @@
%{!?_plasma5_version: %define _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')}
%bcond_without released
Name: breeze
Version: 5.25.4
Version: 5.25.5
Release: 0
Summary: Plasma Desktop artwork, styles and assets
License: GPL-2.0-or-later
@ -33,8 +33,6 @@ Source: https://download.kde.org/stable/plasma/%{version}/breeze-%{versi
Source1: https://download.kde.org/stable/plasma/%{version}/breeze-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
# PATCH-FIX-UPSTREAM
Patch1: 0001-Look-at-QStyleOptionProgressBar-orientation-again.patch
BuildRequires: cmake >= 3.16
BuildRequires: extra-cmake-modules >= 0.0.13
BuildRequires: fdupes