Accepting request 1192906 from KDE:Frameworks

KDE Frameworks 6.5.0 (forwarded request 1191717 from krop)

OBS-URL: https://build.opensuse.org/request/show/1192906
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kf6-kwidgetsaddons?expand=0&rev=9
This commit is contained in:
Dominique Leuenberger 2024-08-10 17:06:52 +00:00 committed by Git OBS Bridge
commit 2a41ba3aa9
7 changed files with 32 additions and 52 deletions

View File

@ -1,38 +0,0 @@
From c0e1e0010f6feb6532486135dd77a1a4cdc72831 Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
Date: Tue, 16 Jul 2024 12:43:16 +0300
Subject: [PATCH] Partially revert cccaa8f89897146043a535d45a276e3a57412815
The widget may not be properly integrated into the widget tree when
KJobWidgets::setWindow() is called.
(cherry picked from commit 185e946c8b918471ee5164815d3296bc06d8a2e7)
---
src/kjobwidgets.cpp | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/kjobwidgets.cpp b/src/kjobwidgets.cpp
index b092a2e0..a64a422e 100644
--- a/src/kjobwidgets.cpp
+++ b/src/kjobwidgets.cpp
@@ -14,15 +14,8 @@ void KJobWidgets::setWindow(QObject *job, QWidget *widget)
{
job->setProperty("widget", QVariant::fromValue(widget));
- QWindow *windowHandle = nullptr;
- if (widget) {
- QWidget *window = widget->window();
- if (window->winId()) {
- windowHandle = window->windowHandle();
- }
- }
-
- setWindowHandle(job, windowHandle);
+ QWindow *window = widget ? widget->windowHandle() : nullptr;
+ setWindowHandle(job, window);
}
void KJobWidgets::setWindowHandle(QObject *job, QWindow *window)
--
2.45.2

View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Mon Aug 5 10:47:57 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Update to 6.5.0
* New feature release
* For more details please see:
* https://kde.org/announcements/frameworks/6/6.5.0
- Changes since 6.4.0:
* Update dependency version to 6.5.0
* fix that last line in fonts list is only half visible (kde#488079)
* avoid the creation of toplevel widget (kde#490712)
* Remove unused license text
* Partially revert cccaa8f89897146043a535d45a276e3a57412815
* Deprecate KJobWidgets::setWindowHandle,windowHandle
* Fix tab not highlighted in some cases
* Fix multiple overlays being installed over tab (kde#490213)
* Update version to 6.5.0
- Drop patch, merged upstream:
* 0001-Partially-revert-cccaa8.patch
-------------------------------------------------------------------
Fri Jul 19 16:32:37 UTC 2024 - Christophe Marin <christophe@krop.fr>

View File

@ -19,13 +19,13 @@
%define qt6_version 6.6.0
%define rname kwidgetsaddons
# Full KF6 version (e.g. 6.4.0)
# Full KF6 version (e.g. 6.5.0)
%{!?_kf6_version: %global _kf6_version %{version}}
# Last major and minor KF6 version (e.g. 6.0)
%{!?_kf6_bugfix_version: %define _kf6_bugfix_version %(echo %{_kf6_version} | awk -F. '{print $1"."$2}')}
%bcond_without released
Name: kf6-kwidgetsaddons
Version: 6.4.0
Version: 6.5.0
Release: 0
Summary: Large set of desktop widgets
License: LGPL-2.1-or-later
@ -35,8 +35,6 @@ Source: %{rname}-%{version}.tar.xz
Source1: %{rname}-%{version}.tar.xz.sig
Source2: frameworks.keyring
%endif
#PATCH-FIX-UPSTREAM
Patch0: 0001-Partially-revert-cccaa8.patch
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: kf6-extra-cmake-modules >= %{_kf6_bugfix_version}

View File

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

View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iHUEABYKAB0WIQSQqWisqEU3zCe5nq8sjfWHptSqwQUCZohTBQAKCRAsjfWHptSq
wYHHAP9yM9EFB+Ta/MBGkzH3DEWeoG3Ash8Pzh3BvtfQi6Zb7QD9Eo6ZxyXnDkkb
xbkRuuSVvXfrtcFPHZ+G4dribkahqgs=
=RjXb
-----END PGP SIGNATURE-----

View File

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

View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
iHUEABYKAB0WIQSQqWisqEU3zCe5nq8sjfWHptSqwQUCZqzAAwAKCRAsjfWHptSq
wW27AQC9ONu3fS+/fxr0CsOeWA7jt5dPc3JDmDshqPN1RQxF+wD9GNc2s3huiWiw
4HkrJUtN/p8pcJNM62hNWeD+DetuQQI=
=q4ce
-----END PGP SIGNATURE-----